NullWanderer 74002a1c4e Merge remote-tracking branch 'refs/remotes/upstream/master' into 2024/04/21-loadouts ... # Conflicts: # Content.Server/IoC/ServerContentIoC.cs # Resources/Prototypes/Roles/Jobs/Medical/chemist.yml		2024-04-22 19:41:29 +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	Crime Assist pda program (#464)	2023-12-29 20:34:56 +01:00
Ghost/Roles	Readd character ghost role spawners (#60)	2023-09-30 01:24:40 +02:00
Harpy	Harpy Rebalance & Content Update 2 (#499)	2023-12-06 21:10:49 +01:00
Hologram	Add hologram shader (#68)	2023-10-03 17:23:09 -05:00
Implants	Possibly fix Syrinx	2024-04-07 14:51:51 +02:00
NPC/Roboisseur	Fix invalid entry	2024-02-08 13:37:51 +01:00
Nutrition	Various fixes I shouldn't need to be doing	2024-03-17 15:33:21 +01:00
Objectives	Update NotJobsRequirementSystem.cs	2023-11-12 21:05:57 +01:00
ParadoxAnomaly	Paradox Anomaly fix	2024-04-22 05:05:04 +02:00
RoundEnd	Fix current test fails	2024-02-08 13:05:23 +01:00
Speech	Scottish Trait (#608)	2023-12-29 20:44:43 +01:00
StationEvents	Fix pirate radio event	2024-04-21 22:53:34 +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