Morb0 d6403daf00 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml # Resources/Prototypes/StatusEffects/health.yml # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json		2024-05-11 01:41:28 +03:00
..
cargo_gifts.yml	Event frequency balance pass (#27721)	2024-05-06 03:10:12 -07:00
events.yml	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-11 01:41:28 +03:00
midround.yml	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-09 13:47:39 +03:00
roundstart.yml	Reduce selection of traitor max from 12 to 8 (#27415)	2024-04-28 12:25:19 +10:00
unknown_shuttles.yml	New event: Approaching unknown shuttle (#24490)	2024-05-10 04:35:59 -07:00
variation.yml	Reduce rusty wall occurrences (#27522)	2024-04-30 17:54:22 -04:00