Delta-v/Content.Server/DeltaV
null ed71a646e3
Merge remote-tracking branch 'refs/remotes/upstream/master' into 2024/07/05-upstream-merge
# Conflicts:
#	Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
2024-07-25 00:07:10 +02:00
..
Abilities/Borgs Randomized lollipop and gumball flavors (#1074) 2024-04-14 16:48:59 +00:00
Administration/Commands Hopefully fix Delta commands 2023-10-31 19:07:39 +01:00
Biscuit Spare ID safe (#671) 2024-01-15 00:48:30 +01:00
CartridgeLoader/Cartridges add secwatch pda app for current sussy baka 2024-05-23 14:58:06 +00:00
Ghost/Roles Readd character ghost role spawners (#60) 2023-09-30 01:24:40 +02:00
GlimmerWisp add glimmer wisp (#1383) 2024-07-01 22:05:56 +02:00
Harpy Move SleepingSystem to Shared & cleanup (#28672) 2024-07-05 20:31:59 +02:00
Hologram Add hologram shader (#68) 2023-10-03 17:23:09 -05:00
Implants Add Syndicate/generic radio implants, remove Syndicate encryption key from uplink (#1262) 2024-05-27 15:24:52 +00:00
NPC/Roboisseur Log giving items to the Oracle or Butlertrol (#1450) 2024-07-01 21:59:16 +00:00
Nutrition Various fixes I shouldn't need to be doing 2024-03-17 15:33:21 +01:00
Objectives add syndicate recruiter midround event (#1345) 2024-07-09 12:48:03 +02:00
Paper add syndicate recruiter midround event (#1345) 2024-07-09 12:48:03 +02:00
Recruiter add syndicate recruiter midround event (#1345) 2024-07-09 12:48:03 +02:00
RoundEnd Clean RES.Pacified a bit 2024-06-06 21:36:31 +02:00
Shipyard fix shipyard (#1458) 2024-07-03 15:34:06 +00:00
Speech Scottish Trait (#608) 2023-12-29 20:44:43 +01:00
Station glacier real (#1169) 2024-07-17 11:39:09 -05:00
StationEvents add glimmer wisp (#1383) 2024-07-01 22:05:56 +02:00
VoiceMask Possibly fix Syrinx 2024-04-07 14:51:51 +02:00
Weapons/Ranged Fix Delta stuff 2024-01-26 23:29:17 +01:00