Morb0 3e015c6f67 Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml # Resources/Prototypes/GameRules/midround.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Prototypes/StatusEffects/health.yml # Resources/Prototypes/StatusIcon/antag.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/ServerInfo/Guidebook/Engineering/AME.xml # Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml # Resources/ServerInfo/Guidebook/Engineering/Construction.xml # Resources/ServerInfo/Guidebook/Engineering/Engineering.xml # Resources/ServerInfo/Guidebook/Engineering/Fires.xml # Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/Networking.xml # Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml # Resources/ServerInfo/Guidebook/Engineering/Power.xml # Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml # Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml # Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml # Resources/ServerInfo/Guidebook/Security/Forensics.xml # Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png		2024-04-26 11:19:50 +03:00
..
Actions/Implants/implants.rsi
Clothing	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-18 12:04:58 +03:00
Corvax	Add new lobby art (#2024)	2024-04-08 11:14:23 +03:00
Decals	fixed white_box.png (#26714)	2024-04-04 07:23:37 +02:00
deprecated.rsi	Adds stair entities (with new sprites,) nukes stair decals (#20279)	2023-09-18 13:17:19 -06:00
Effects	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-04-02 11:32:48 +03:00
Fluids	Make puddle smoothing better (#26171)	2024-03-18 10:15:45 +11:00
Interface	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-26 11:19:50 +03:00
LobbyScreens	New lobby art: TerminalStation (#26505)	2024-04-04 07:28:30 +02:00
Logo
Markers	Adds Hellspawn (Nar'Sie demon mob) (#20291)	2024-01-04 05:53:15 -07:00
Mobs	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-26 11:19:50 +03:00
Objects	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-26 11:19:50 +03:00
Parallaxes	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00
Shaders	Blindness hotfix (content side) (#23465)	2024-01-04 11:17:06 +11:00
Structures	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-26 11:19:50 +03:00
Template	Fixes reptilian "full" sprite + adds reptilian template to the raw sprites folder (#22112)	2023-12-08 17:29:54 -05:00
Tiles	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-26 11:19:50 +03:00