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
..
Pools	Added Train station into map rotation (#27534)	2024-05-04 04:10:08 -07:00
arenas.yml	1v1 me first to 31 no powerups [Deathmatch Gamemode] (#19467)	2023-08-30 18:06:15 -07:00
atlas.yml	Increase minimum requirement for lowpop maps (#23718)	2024-01-07 23:23:08 -07:00
bagel.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-18 01:51:30 +03:00
box.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-12 11:00:46 +03:00
centcomm.yml
cluster.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-10 00:23:02 +03:00
core.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-18 02:28:34 +03:00
debug.yml	Adds the thermo-electric generator (#18840)	2023-08-12 15:41:55 -05:00
europa.yml	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-26 11:19:50 +03:00
fland.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-02-12 12:53:34 +03:00
marathon.yml	Merge remote-tracking branch 'upstream/master' into master-syndicate	2024-03-27 01:12:55 +03:00
meta.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-16 03:05:40 +03:00
oasis.yml	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-11 01:41:28 +03:00
omega.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-10 00:23:02 +03:00
origin.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-12 11:00:46 +03:00
packed.yml	Merge remote-tracking branch 'upstream/master' into master-syndicate	2024-03-27 01:12:55 +03:00
reach.yml	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00
saltern.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-03-21 01:15:13 +03:00
salvage.yml	Vegan Meatball (#24650)	2024-03-07 22:37:57 +03:00
syndicate.yml	Refactor antag rule code (#23445)	2024-02-29 17:25:10 +11:00
train.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-05-07 00:43:11 +03:00