Morb0 611bfea5ff Merge remote-tracking branch 'upstream/master' into update-sposnors ... # Conflicts: # .github/workflows/publish.yml # Content.Packaging/ContentPackaging.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/GameTicking/GameTicker.StatusShell.cs # Resources/Audio/Weapons/Guns/Gunshots/license.txt # Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png		2023-11-08 03:00:51 +03:00
..
Airlocks	Merge remote-tracking branch 'upstream/master' into update-sposnors	2023-11-08 03:00:51 +03:00
assembly.rsi	Reorganizes Resources/Constructible (#4252)	2021-07-15 18:30:50 +00:00
edge_door_hazard.rsi	Fix some more rsis (#13107)	2022-12-20 09:37:34 +01:00
effects.rsi	Reorganizes Resources/Constructible (#4252)	2021-07-15 18:30:50 +00:00
MineralDoors	Adds Bananium (#14663)	2023-04-29 15:38:09 +10:00
secret_door.rsi	[Resprite] Secret Door (#1342)	2023-08-17 08:50:58 +03:00
Shutters	Tweak Window Shutters to have a rectangular window. (#6564)	2022-02-08 15:38:19 -07:00
web_door.rsi	Arachnid RE-REWORK (#19138)	2023-09-04 13:02:54 -07:00
Windoors/windoor.rsi	Added bolt and emergency layer for opened windoor (#960)	2023-04-05 12:28:37 -07:00