NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-11-09 04:24:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
CatStation/Resources/Textures/Structures/Machines
History
Morb0 7d7c9e5f4c Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
#	Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/equipped-HAND.png
#	Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/icon.png
#	Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/meta.json
#	Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/equipped-BACKPACK.png
2023-11-09 01:09:14 +03:00
..
Anomaly Anomaly Generator Tweaks (#13856) 2023-02-06 15:53:59 -04:00
anomaly_sync.rsi Anomaly Synchronizer (#20945) 2023-11-05 21:02:02 -07:00
arcade.rsi Fix the remaining invalid RSIs (#13113) 2022-12-20 11:49:18 -06:00
artifact_analyzer.rsi RND Rework [Death to Techweb] (#16370) 2023-05-15 15:17:30 -05:00
autolathe.rsi Partial lathe ECS, fix cursed lathe visualizer, a bit more audiovisual feedback for lathes (#7238) 2022-04-17 17:34:14 +10:00
bomb.rsi Hardbombs & Defusables (#15380) 2023-09-11 18:42:38 -07:00
circuit_imprinter.rsi Partial lathe ECS, fix cursed lathe visualizer, a bit more audiovisual feedback for lathes (#7238) 2022-04-17 17:34:14 +10:00
cloning.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
computers.rsi Adds the thermo-electric generator (#18840) 2023-08-12 15:41:55 -05:00
cryogenics.rsi feat: Medbay cryo pods (#11349) 2022-12-25 22:35:51 +11:00
diagnoser.rsi replace incorrectly licensed sprites (#13463) 2023-01-14 14:56:11 +11:00
electric_grill.rsi Grill Resprite (#21524) 2023-11-08 13:24:36 -07: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 remote-tracking branch 'upstream/master' into upstream-sync 2023-04-15 19:12:31 +03:00
gasrecycler.rsi Add gas recyclers (#9934) 2022-09-11 18:02:01 -05:00
gateway.rsi add gateway for admeme (#17587) 2023-08-02 19:47:18 +10:00
genesplicer.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
gravity_generator.rsi Revert "Refactor Damage to use Protoypes (#4262)" 2021-08-24 01:06:32 -06:00
gravity_generator_core.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
gravity_generator_mini.rsi Mini Gravity Generator (#8449) 2022-05-26 20:08:05 -07:00
hotplate.rsi Goodbye Microwave, Hello Hot Plates! (#13061) 2022-12-24 19:59:51 -06:00
juicer.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
material_reclaimer.rsi Material Reclaimer (#14969) 2023-04-09 23:38:20 -05:00
Medical/biomass_reclaimer.rsi Biomass (#10313) 2022-08-29 21:31:27 -05:00
microwave.rsi Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-09-05 00:12:02 +03:00
mixer.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
ore_processor.rsi Remove trailing commas from RSIs. (#12865) 2022-12-04 22:47:23 +01:00
parts.rsi new machine frame sprites (#19211) 2023-08-16 22:16:12 -06:00
protolathe.rsi Partial lathe ECS, fix cursed lathe visualizer, a bit more audiovisual feedback for lathes (#7238) 2022-04-17 17:34:14 +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 Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
seed_extractor.rsi Hydroponics Sprite Changes (#14649) 2023-03-23 11:10:18 -04:00
server.rsi RND server boards (#17057) 2023-06-08 17:39:29 +10:00
sheetifier.rsi Sheet-meister 2000 (#16686) 2023-06-15 10:49:23 +10:00
stasis_bed.rsi Beds, Medical Beds, Stasis Beds (#6695) 2022-04-15 15:53:52 -07:00
station_map.rsi Station Map console Fixes and Resprite (#16697) 2023-05-28 16:42:41 +10:00
tech_disk_printer.rsi RND Rework [Death to Techweb] (#16370) 2023-05-15 15:17:30 -05: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 Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
traversal_distorter.rsi RND Rework [Death to Techweb] (#16370) 2023-05-15 15:17:30 -05:00
uniform_printer.rsi Partial lathe ECS, fix cursed lathe visualizer, a bit more audiovisual feedback for lathes (#7238) 2022-04-17 17:34:14 +10:00
vaccinator.rsi replace incorrectly licensed sprites (#13463) 2023-01-14 14:56:11 +11:00
VendingMachines Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-10-11 16:56:19 +03:00