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
..
Atmos/gasanalyzer.rsi
Chapel	Added urn (#22488)	2023-12-16 03:31:12 -07:00
Chemistry	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-31 00:23:19 +03:00
Detective/evidence_marker.rsi	Added Evidence Markers for the Detective! (#25255)	2024-02-17 15:49:16 -05:00
Hydroponics	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-26 11:19:50 +03:00
Janitorial	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-02-17 12:43:04 +03:00
Kitchen/food_carts.rsi	Add food carts (#19177)	2023-08-15 15:26:49 -07:00
Library/Equipment/books_bag.rsi	[Sprite] inhand sprites for bags (#16005)	2023-05-02 18:24:37 +10:00
Mech	Add broken sprites for Vim (#24458)	2024-01-23 17:26:30 -05:00
Medical	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-17 11:57:44 +03:00
Mining	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-21 03:03:30 +03:00
Research	Wide anomaly locator (#20581)	2023-10-01 12:41:32 -04:00
Robotics	Gun cyborg module (#19629)	2024-01-08 00:03:18 +03:00
Security	LockVisualizer (#25224)	2024-02-16 16:52:31 -07:00
Service/vending_machine_restock.rsi	Adds vending restocks for ChefVend and Condiment Stations (#19305)	2023-10-01 16:49:10 -04:00
Syndicate/telecrystal.rsi	add saturation to TC inhand sprites (#22870)	2023-12-22 20:26:01 -07:00
Xenoarchaeology	node scanner resprite (#17609)	2023-06-24 14:20:26 +10:00