Morb0 918f543c2c Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml # Resources/Textures/Objects/Devices/nuke.rsi/meta.json # Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json		2023-12-25 21:03:49 +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	Decrease doorjack count for ninja (#1439)	2023-09-22 17:49:19 +03:00
objectiveGroups.yml	New Thief minor antagonist (#21520)	2023-12-24 02:58:28 -07:00
stealTargetGroups.yml	New Thief minor antagonist (#21520)	2023-12-24 02:58:28 -07:00
terminator.yml	exterminator midround minor antag (#19946)	2023-12-24 20:16:56 -07:00
thief.yml	New Thief minor antagonist (#21520)	2023-12-24 02:58:28 -07:00
traitor.yml	add limits to steal objectives (#22672)	2023-12-24 17:20:55 -08:00