Morb0 721f7bfecf Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # Content.Server/Connection/ConnectionManager.cs # Resources/Prototypes/Datasets/Names/ai.yml # Resources/Prototypes/Datasets/adjectives.yml # Resources/Prototypes/Datasets/verbs.yml # Resources/Prototypes/Entities/Clothing/Shoes/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml # Resources/Prototypes/Entities/Mobs/base.yml # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png # Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png # SpaceStation14.sln		2024-08-28 16:40:36 +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-08-16 14:29:08 +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	Station AI (#30944)	2024-08-28 10:57:12 +10:00
AdminVerbSystem.Smites.cs	Log enrichment: Explosion damage to players (#29762)	2024-08-09 16:24:05 +10:00
AdminVerbSystem.Tools.cs	fix the admin verbs trying to kill players by filling their lungs with plasma (#30991)	2024-08-14 12:56:38 +03: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