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
..
Anomaly	Experimental Anomaly Vessel (#22233)	2023-12-08 12:50:41 -06:00
anomaly_sync.rsi	Anomaly Synchronizer (#20945)	2023-11-05 21:02:02 -07:00
arcade.rsi	Arcade machine improvements (#24200)	2024-03-28 17:28:45 +11:00
artifact_analyzer.rsi
artifact_crusher.rsi	SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545)	2024-04-21 12:09:26 -04:00
autolathe.rsi
autolathe_hypercon.rsi	Hyper convection lathes and industrial ore processor (#23202)	2023-12-31 03:18:58 +11:00
biofabricator.rsi	biofabricator (#23319)	2024-01-02 13:53:35 -05:00
bomb.rsi	Hardbombs & Defusables (#15380)	2023-09-11 18:42:38 -07:00
circuit_imprinter.rsi
cloning.rsi
computers.rsi	fix solar computer sprite (#25548)	2024-02-25 12:23:22 -08:00
cryogenics.rsi
diagnoser.rsi
electric_grill.rsi	[Resprite] Electric grill (#1882)	2024-02-21 12:46:45 +03:00
exosuit_fabricator.rsi
fat_sucker.rsi
fax_machine.rsi
flatpacker.rsi	Flatpacks and the Flatpacker 1001 (#23338)	2024-01-03 17:16:02 +11:00
gasrecycler.rsi
gateway.rsi	add gateway for admeme (#17587)	2023-08-02 19:47:18 +10:00
genesplicer.rsi
gravity_generator.rsi
gravity_generator_core.rsi
gravity_generator_mini.rsi
hotplate.rsi	adjust sprite offsets for paper bins and hotplates (#22075)	2023-12-02 18:14:17 -05:00
juicer.rsi
jukebox.rsi	Added Jukebox (#26736)	2024-04-17 19:27:00 +10:00
material_reclaimer.rsi
Medical	Electrolysis and Centrifuge (#22517)	2023-12-15 02:52:46 -07:00
microwave.rsi	Microwave sprite offset (#1883)	2024-02-21 12:53:53 +03:00
mixer.rsi
ore_processor.rsi
ore_processor_industrial.rsi	Hyper convection lathes and industrial ore processor (#23202)	2023-12-31 03:18:58 +11:00
parts.rsi	new machine frame sprites (#19211)	2023-08-16 22:16:12 -06:00
protolathe.rsi
protolathe_hypercon.rsi	Hyper convection lathes and industrial ore processor (#23202)	2023-12-31 03:18:58 +11:00
recycling.rsi
rndpointsource.rsi
salvage.rsi
scanner.rsi
seed_extractor.rsi
server.rsi	Research Server Texture (#22092)	2023-12-02 11:50:09 -05:00
sheetifier.rsi	Sheet-meister 2000 (#16686)	2023-06-15 10:49:23 +10:00
smartfridge.rsi	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-14 00:57:14 +03:00
stasis_bed.rsi
station_map.rsi
tech_disk_printer.rsi	Little disk printer sprite tweaks (#26711)	2024-04-03 20:58:17 -04:00
techfab.rsi	Techfab resprite + department fab sprites (#21136)	2023-10-26 22:21:14 -04:00
telecomms.rsi
traitordm.rsi
traversal_distorter.rsi
uniform_printer.rsi
vaccinator.rsi
VendingMachines	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-14 00:57:14 +03:00