Morb0 1b513f0c1a Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/workflows/publish.yml # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Content.Server/Zombies/ZombieSystem.Transform.cs # Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Maps/box.yml # Resources/Prototypes/Maps/fland.yml # Resources/Prototypes/Maps/marathon.yml # Resources/Prototypes/Maps/meta.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Textures/Tiles/attributions.yml		2023-08-29 05:58:14 +03:00
..
ame.rsi	Reorganizes Resources/Constructible (#4252)	2021-07-15 18:30:50 +00:00
PA	PA Fixes (#18116)	2023-07-17 23:57:59 -06:00
portable_generator.rsi	Portable Generator Rework (#19302)	2023-08-25 11:40:42 -07:00
rtg.rsi	New generators and wallmount substation (Shuttle power PR) (#6795)	2022-03-15 12:27:39 +11:00
Singularity	[Resprite] Singularity stuff (#320)	2022-07-26 20:56:02 +03:00
solar_panel.rsi	Reorganizes Resources/Constructible (#4252)	2021-07-15 18:30:50 +00:00
teg.rsi	Adds the thermo-electric generator (#18840)	2023-08-12 15:41:55 -05:00
wallmount_generator.rsi	New generators and wallmount substation (Shuttle power PR) (#6795)	2022-03-15 12:27:39 +11:00