rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/Textures/Structures/Machines
History
VigersRay c0ee7e3cc9 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Client/Lobby/LobbyUIController.cs
#	Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
#	Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
#	Content.Server/Administration/Systems/BwoinkSystem.cs
#	Content.Server/IoC/ServerContentIoC.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Server/Shuttles/Systems/ArrivalsSystem.cs
#	Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs
#	Content.Shared/Roles/JobRequirements.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
#	Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
#	Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml
#	Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml
#	Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
#	Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml
#	Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
#	Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml
#	Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml
#	Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml
#	Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
#	Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
#	Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
#	Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml
#	Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
#	Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
#	Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml
#	Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
#	Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
#	Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
#	Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml
#	Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
#	Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
#	Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
#	Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
#	Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml
#	Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
#	Resources/Prototypes/Loadouts/Jobs/Security/warden.yml
#	Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
#	Resources/Prototypes/Recipes/Lathes/medical.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Command/captain.yml
#	Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
#	Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
#	Resources/Textures/Structures/Power/apc.rsi/base.png
#	Resources/Textures/Structures/Power/apc.rsi/broken.png
#	Resources/Textures/Structures/Power/apc.rsi/display-charging.png
#	Resources/Textures/Structures/Power/apc.rsi/display-full.png
#	Resources/Textures/Structures/Power/apc.rsi/display-lack.png
#	Resources/Textures/Structures/Power/apc.rsi/display-remote.png
#	Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
#	Resources/Textures/Structures/Power/apc.rsi/frame.png
#	Resources/Textures/Structures/Power/apc.rsi/static.png
2024-08-05 17:22:05 +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 fix solar computer sprite (#25548) 2024-02-25 12:23:22 -08:00
cryogenics.rsi feat: Medbay cryo pods (#11349) 2022-12-25 22:35:51 +11:00
cuttermachine.rsi Cutter machine & steel mozaic item tiles (#30431) 2024-08-01 13:26:32 +03:00
diagnoser.rsi replace incorrectly licensed sprites (#13463) 2023-01-14 14:56:11 +11:00
electric_grill.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
exosuit_fabricator.rsi Exosuit Fabricator (#12760) 2022-11-27 14:36:27 +11:00
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
material_reclaimer.rsi Material Reclaimer (#14969) 2023-04-09 23:38:20 -05: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 Remove trailing commas from RSIs. (#12865) 2022-12-04 22:47:23 +01:00
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 Remove trailing commas from RSIs. (#12865) 2022-12-04 22:47:23 +01:00
rndpointsource.rsi Remove trailing commas from RSIs. (#12865) 2022-12-04 22:47:23 +01:00
salvage.rsi salvage magnet status indicator (#12585) 2022-11-14 01:45:45 -06:00
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_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 replace incorrectly licensed sprites (#13463) 2023-01-14 14:56:11 +11:00
VendingMachines Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00