Morb0 e3f6082c58 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/RoundEnd/RoundEndSystem.cs # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png # Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json # Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png # Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png # Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json # Resources/Textures/Interface/Alerts/human_alive.rsi/health4.png # Tools/actions_changelogs_since_last_run.py		2023-12-21 03:03:30 +03:00
..
cabinets.rsi	Filing Cabinet Resprites (#8043)	2022-05-09 17:46:23 -07:00
canister.rsi	Frezon Canister Tweaks (#14442)	2023-03-13 23:42:07 -04:00
closet.rsi	Craftable Steel Closet (#21987)	2023-12-18 14:46:16 -05:00
Crates	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-05 00:12:02 +03:00
morgue.rsi	Reorganizes Resources/Constructible (#4252)	2021-07-15 18:30:50 +00:00
orebox.rsi	Ore boxes (#19838)	2023-09-16 21:49:54 +10:00
suit_storage.rsi	Lockable Suit Storages (#20950)	2023-10-17 18:33:02 -07:00
tanks.rsi	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-14 16:35:33 +03:00
wall_locker.rsi	wall mounted lockers (#11382)	2022-09-17 13:05:39 -07:00