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
..
AdminSystem.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-08 13:54:31 +03:00
AdminTestArenaSystem.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
AdminVerbSystem.Antags.cs	Add verb to spawn players on the spot (#22000)	2023-11-30 16:40:07 -05:00
AdminVerbSystem.cs	Fix entity logs verb (#22231)	2023-12-08 22:39:00 -06:00
AdminVerbSystem.Smites.cs	Super Bonk Smite (#22413)	2023-12-18 14:39:23 -05:00
AdminVerbSystem.Tools.cs	Remove uses of TransformComponent.ChildEntities (#22442)	2023-12-17 03:09:50 +11:00
BufferingSystem.cs	Remove 700 usages of Component.Owner (#21100)	2023-10-19 12:34:31 -07:00
BwoinkSystem.cs	CVar for custom name in client-side ahelp menu. (#22069)	2023-12-19 17:40:37 -06:00
RejuvenateSystem.cs	Toolshed (#17895)	2023-08-02 16:09:08 -05:00
SuperBonkSystem.cs	Super Bonk Smite (#22413)	2023-12-18 14:39:23 -05:00