Morb0 acf1ff4ec0 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Chat/Systems/ChatSystem.cs # Resources/Prototypes/AlertLevels/alert_levels.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Datasets/Names/fortunes.yml # Resources/Prototypes/Datasets/ion_storm.yml # Resources/Prototypes/Entities/Clothing/Neck/mantles.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml # Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Recipes/Lathes/clothing.yml # Resources/Prototypes/StatusIcon/faction.yml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json # Resources/Textures/Clothing/Mask/joy.rsi/meta.json # Resources/Textures/Clothing/Mask/squadron.rsi/meta.json # Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png # Resources/Textures/Objects/Tools/crowbar.rsi/meta.json # Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png # Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json		2024-08-12 13:18:43 +03:00
..
AdminFrozenSystem.cs	Prevent admin-frozen players from ghosting or suiciding, add "Freeze And Mute" verb (#27813)	2024-05-12 10:35:30 -04:00
AdminGunSystem.cs	Add events for GunComponent values, muzzle flashes and cartridge spread (#24077)	2024-01-29 10:32:42 +11:00
AdminSystem.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-07-14 12:15:16 +03:00
AdminTestArenaSystem.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
AdminVerbSystem.Antags.cs	fix initial infected icons and add a briefing to the character menu (#29259)	2024-06-21 15:42:17 +10:00
AdminVerbSystem.cs	UI to edit silicon laws from admin verb (#28483)	2024-08-09 16:16:22 +10:00
AdminVerbSystem.Smites.cs	Log enrichment: Explosion damage to players (#29762)	2024-08-09 16:24:05 +10:00
AdminVerbSystem.Tools.cs	Add access to gun components (#30688)	2024-08-09 17:39:27 +10:00
BufferingSystem.cs	Remove 700 usages of Component.Owner (#21100)	2023-10-19 12:34:31 -07:00
BwoinkSystem.cs	Display the administrator's title in ahelp and ahelp relay (#30075)	2024-08-02 22:59:20 -05: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