Ed 7d26a26547 Merge remote-tracking branch 'upstream/stable' into ed-22-01-2025-double-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	LICENSE.TXT
#	Resources/Locale/ru-RU/administration/commands/babyjail.ftl
#	Resources/Maps/Shuttles/emergency_elkridge.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Maps/Pools/default.yml

2025-01-22 13:46:46 +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

HOTFIX Admin playerlist character update fix (#34560)

2025-01-21 23:48:07 +01:00

AdminTestArenaSystem.cs

Un-revert IPlayerManager refactor (#21244)

2023-10-28 09:59:53 +11:00

AdminVerbSystem.Antags.cs

Clean up, increase build stability (#583)

2024-11-13 17:56:07 +03:00

AdminVerbSystem.cs

Allow for the ai's laws to be changed from its core and eye (#32461)

2024-11-02 14:21:10 +01:00

AdminVerbSystem.Smites.cs

Merge remote-tracking branch 'upstream/master' into ed-20-11-2024-upstream-sync

2024-11-23 01:48:24 +03:00

AdminVerbSystem.Tools.cs

Rework the HoS's Energy Shotgun (Varying energy consumption depending on fire-mode + re-adds a toned down self recharge.) (#32104)

2024-12-11 17:21:04 +01:00

BufferingSystem.cs

Remove 700 usages of Component.Owner (#21100)

2023-10-19 12:34:31 -07:00

BwoinkSystem.cs

Integrate Modern HWID into content

2024-11-12 01:51:54 +01:00

RejuvenateSystem.cs

Toolshed (#17895)

2023-08-02 16:09:08 -05:00

SuperBonkSystem.cs

Clumsy system refactor (#31147)

2024-11-16 00:46:01 +01:00