fish-station/Resources/Textures/Structures/Machines
VigersRay 0a91b468b4 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.Client/Voting/UI/VotePopup.xaml.cs
#	Content.Client/Voting/VoteManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Power/EntitySystems/BatterySystem.cs
#	Content.Server/Radio/EntitySystems/RadioSystem.cs
#	Content.Server/VoiceMask/VoiceMaskComponent.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Content.Server/VoiceMask/VoiceMaskerComponent.cs
#	Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
#	Content.Server/Voting/Managers/VoteManager.cs
#	Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
#	Content.Shared/Voting/MsgVoteData.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Recipes/Crafting/crates.yml
#	Resources/Prototypes/Recipes/Crafting/improvised.yml
2024-09-26 20:17:14 +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 RND Rework [Death to Techweb] (#16370) 2023-05-15 15:17:30 -05:00
artifact_crusher.rsi SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545) 2024-04-21 12:09:26 -04:00
autolathe.rsi fix lathe screen animations (#30479) 2024-07-30 14:03:46 +10:00
autolathe_hypercon.rsi fix lathe screen animations (#30479) 2024-07-30 14:03:46 +10: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
circuit_imprinter_hypercon.rsi Hyperconvection Circuit Imprinter (#27283) 2024-04-28 15:49:03 +10:00
cloning.rsi
computers.rsi Computer wirepanel (#32273) 2024-09-23 12:51:48 +02:00
cryogenics.rsi
cuttermachine.rsi Cutter machine & steel mozaic item tiles (#30431) 2024-08-01 13:26:32 +03:00
diagnoser.rsi
electric_grill.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
exosuit_fabricator.rsi
fat_sucker.rsi RND Rework [Death to Techweb] (#16370) 2023-05-15 15:17:30 -05:00
fax_machine.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
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
Medical Electrolysis and Centrifuge (#22517) 2023-12-15 02:52:46 -07:00
microwave.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
microwave_syndie.rsi [Resprite] Syndie's microwave (#2358) 2024-07-01 18:11:35 +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 fix lathe screen animations (#30479) 2024-07-30 14:03:46 +10:00
protolathe_hypercon.rsi fix lathe screen animations (#30479) 2024-07-30 14:03:46 +10:00
recycling.rsi Recycler Overhaul (#30802) 2024-08-18 21:39:00 -06:00
rndpointsource.rsi
salvage.rsi
scanner.rsi
seed_extractor.rsi Hydroponics Sprite Changes (#14649) 2023-03-23 11:10:18 -04:00
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 sunrise build (#2) 2024-05-31 02:16:18 +03:00
stasis_bed.rsi
station_anchor.rsi Station Anchor (#26098) 2024-08-31 10:40:28 -04:00
station_map.rsi Station Map console Fixes and Resprite (#16697) 2023-05-28 16:42:41 +10:00
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 Add telecommunication server (#14415) 2023-03-06 17:11:36 -04:00
traitordm.rsi
traversal_distorter.rsi RND Rework [Death to Techweb] (#16370) 2023-05-15 15:17:30 -05:00
uniform_printer.rsi
vaccinator.rsi
VendingMachines upstream 2024-09-16 12:40:23 +03:00