Morb0 32a8d1a21e Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml # Content.Server/Power/Generator/GeneratorSystem.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Objects/Misc/paper.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png		2024-02-03 03:38:29 +03:00
..
base_objectives.yml	New Thief minor antagonist (#21520)	2023-12-24 02:58:28 -07:00
dragon.yml	dragon refactor, objectives and use GenericAntag (#20201)	2023-09-30 13:18:01 -07:00
ninja.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-31 00:23:19 +03:00
objectiveGroups.yml	more objective logging + maybe fix the no objective bug (#24139)	2024-01-15 16:09:14 -07:00
stealTargetGroups.yml	Remove vehicles (#24681)	2024-02-01 11:33:10 +11:00
terminator.yml	exterminator midround minor antag (#19946)	2023-12-24 20:16:56 -07:00
thief.yml	Remove vehicles (#24681)	2024-02-01 11:33:10 +11:00
traitor.yml	Steal cleanup (#24428)	2024-01-28 12:10:39 +11:00