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
..
Consumable	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-18 12:04:58 +03:00
Decoration	Stalagmite Changes (#25646)	2024-02-27 22:24:17 +03:00
Devices	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-26 11:19:50 +03:00
Economy/cash.rsi	Plates & Cash gridinv visuals (#24075)	2024-01-14 11:44:17 -05:00
Fun	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-04-02 11:32:48 +03:00
Magic/magicactions.rsi	Infinity books (#25840)	2024-04-01 14:00:10 -07:00
Materials	Add plasma stack sprites (#2011)	2024-04-04 10:34:52 +03:00
Misc	New role - Pilot (#1978)	2024-04-08 11:31:11 +03:00
Power	Little rework of existing yaml flatpacks (#24814)	2024-02-21 21:44:22 -05:00
Specific	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-26 11:19:50 +03:00
Storage	Fix meta.json	2024-03-27 01:31:18 +03:00
Tanks	Make air tanks appear on the back in suitstorage (#26353)	2024-03-23 14:46:40 +11:00
Tiles	Clockwork structures and furniture (#24673)	2024-03-06 03:25:59 +03:00
Tools	Resprite network configurator (#1922)	2024-03-08 12:50:34 +03:00
Vehicles	ATV resprite (#25885)	2024-03-07 08:36:00 +03:00
Weapons	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-04-12 02:17:14 +03:00