From 8a370088c12444999311ac4af75d0ddc1976e73c Mon Sep 17 00:00:00 2001 From: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Date: Sun, 17 May 2026 12:35:29 +0100 Subject: [PATCH] Updates Pre-Loaded & Upgraded Machines (#31952) * upgraded machines and pre-loading * agghhhh! * stovetop of failure * Update cerestation.dmm --------- Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> --- .../SpaceRuins/syndie_space_base.dmm | 154 +++--- _maps/map_files/generic/centcomm.dmm | 455 ++++++++++-------- _maps/map_files/shuttles/admin_admin.dmm | 53 +- _maps/map_files/shuttles/admin_armory.dmm | 46 +- _maps/map_files/shuttles/admin_hospital.dmm | 88 ++-- _maps/map_files/shuttles/admin_skipjack.dmm | 9 +- .../gamma_armory/gamma_armory_base.dmm | 2 +- .../gamma_armory/gamma_armory_clown.dmm | 2 +- _maps/map_files/stations/boxstation.dmm | 78 +-- _maps/map_files/stations/cerestation.dmm | 103 ++-- _maps/map_files/stations/deltastation.dmm | 101 +--- _maps/map_files/stations/emeraldstation.dmm | 101 +--- _maps/map_files/stations/metastation.dmm | 87 +--- _maps/map_files/test_tiny/test_tgui.dmm | 4 +- code/game/dna/dna_modifier.dm | 6 +- code/game/machinery/Sleeper.dm | 4 +- code/game/machinery/adv_med.dm | 13 +- code/game/machinery/ai_resource.dm | 23 + code/game/machinery/autolathe.dm | 35 +- code/game/machinery/cell_charger.dm | 7 + code/game/machinery/clonescanner.dm | 13 +- code/game/machinery/recharger.dm | 9 +- code/game/machinery/rechargestation.dm | 8 +- code/game/machinery/recycler.dm | 13 +- code/game/mecha/mech_bay.dm | 10 +- code/game/mecha/mech_fabricator.dm | 41 +- .../components/unary_devices/cryo.dm | 13 +- .../components/unary_devices/thermomachine.dm | 13 + code/modules/cooking/machines/deep_fryer.dm | 8 +- code/modules/cooking/machines/grill.dm | 10 +- .../cooking/machines/ice_cream_mixer.dm | 8 +- code/modules/cooking/machines/oven.dm | 21 +- code/modules/cooking/machines/stovetop.dm | 17 +- .../kitchen_machinery/microwave.dm | 2 +- .../kitchen_machinery/processor.dm | 8 + code/modules/hydroponics/biogenerator.dm | 18 +- code/modules/hydroponics/gene_modder.dm | 17 +- code/modules/hydroponics/hydroponics_tray.dm | 10 + code/modules/hydroponics/seed_extractor.dm | 8 + code/modules/mining/machine_redemption.dm | 20 +- .../power/engines/fission/reactor_machines.dm | 33 +- code/modules/power/smes.dm | 37 +- .../chemistry/machinery/chem_dispenser.dm | 77 ++- .../reagents/chemistry/machinery/pandemic.dm | 20 +- .../chemistry/machinery/reagentgrinder.dm | 12 +- code/modules/research/circuitprinter.dm | 22 +- code/modules/research/protolathe.dm | 37 +- code/modules/research/scientific_analyzer.dm | 6 +- 48 files changed, 952 insertions(+), 930 deletions(-) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm index 89458722596..ef6da0c717e 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm @@ -248,10 +248,10 @@ /turf/simulated/floor/plating/airless, /area/ruin/unpowered/syndicate_space_base/atmos) "bM" = ( -/obj/machinery/hydroponics/constructable, /obj/machinery/light{ dir = 1 }, +/obj/machinery/hydroponics/constructable/upgraded, /turf/simulated/floor/grass, /area/ruin/unpowered/syndicate_space_base/service) "bO" = ( @@ -261,12 +261,12 @@ /turf/simulated/floor/wood, /area/ruin/unpowered/syndicate_space_base/service) "bS" = ( -/obj/machinery/processor, /obj/structure/extinguisher_cabinet{ name = "south bump"; pixel_y = -30 }, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/processor/upgraded, /turf/simulated/floor/plasteel/white, /area/ruin/unpowered/syndicate_space_base/service) "bT" = ( @@ -895,12 +895,12 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/dormitories) "fD" = ( -/obj/machinery/sleeper{ - dir = 4 - }, /obj/effect/turf_decal/tiles/department/medical/side{ dir = 8 }, +/obj/machinery/sleeper/upgraded{ + dir = 4 + }, /turf/simulated/floor/plasteel/white, /area/ruin/unpowered/syndicate_space_base/medbay) "fE" = ( @@ -912,22 +912,18 @@ /area/ruin/unpowered/syndicate_space_base/engineering) "fF" = ( /obj/structure/table/reinforced, -/obj/item/retractor, -/obj/item/hemostat, -/obj/item/cautery, /obj/machinery/light{ dir = 1 }, /obj/effect/turf_decal/tiles/department/medical/side{ dir = 5 }, +/obj/item/storage/surgical_tray, /turf/simulated/floor/plasteel/white, /area/ruin/unpowered/syndicate_space_base/medbay) "fH" = ( -/obj/machinery/power/port_gen/pacman{ - anchored = 1 - }, /obj/effect/turf_decal/delivery/hollow, +/obj/machinery/power/port_gen/pacman/upgraded, /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_space_base/engineering) "fI" = ( @@ -935,7 +931,8 @@ dir = 8 }, /obj/machinery/atmospherics/meter, -/turf/simulated/floor/plating, +/obj/effect/turf_decal/tiles/department/security, +/turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/engineering) "fJ" = ( /obj/machinery/light{ @@ -995,8 +992,8 @@ /turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/genetics) "fY" = ( -/obj/machinery/cooking/deepfryer, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/deepfryer/loaded/upgraded, /turf/simulated/floor/plasteel/white, /area/ruin/unpowered/syndicate_space_base/service) "ga" = ( @@ -1129,10 +1126,10 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/arrivals) "gO" = ( -/obj/machinery/dna_scannernew, /obj/effect/turf_decal/tiles/department/virology/side{ dir = 5 }, +/obj/machinery/dna_scannernew/upgraded, /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/genetics) "gQ" = ( @@ -1162,7 +1159,11 @@ dir = 1 }, /obj/structure/table/wood, -/obj/machinery/computer/library/syndie, +/obj/machinery/computer/library/syndie{ + dir = 4; + pixel_x = -1; + pixel_y = 6 + }, /turf/simulated/floor/wood, /area/ruin/unpowered/syndicate_space_base/arrivals) "gW" = ( @@ -1369,8 +1370,8 @@ /turf/simulated/floor/plating/asteroid/airless, /area/ruin/unpowered/syndicate_space_base/inner) "ig" = ( -/obj/machinery/cooking/ice_cream_mixer, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/ice_cream_mixer/loaded/upgraded, /turf/simulated/floor/plasteel/white, /area/ruin/unpowered/syndicate_space_base/service) "ij" = ( @@ -1439,7 +1440,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/arrivals) "iv" = ( -/obj/machinery/recharge_station, +/obj/machinery/recharge_station/upgraded, /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_space_base/engineering) "iw" = ( @@ -1705,7 +1706,8 @@ dir = 4; initialize_directions = 11 }, -/turf/simulated/floor/plating, +/obj/effect/turf_decal/tiles/department/command, +/turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/engineering) "jX" = ( /obj/machinery/economy/vending/medical/syndicate_access, @@ -1922,7 +1924,7 @@ /obj/machinery/conveyor/east{ id = "syndiegarbage" }, -/obj/machinery/recycler, +/obj/machinery/recycler/upgraded, /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/arrivals) "lF" = ( @@ -2161,10 +2163,10 @@ /turf/simulated/floor/wood, /area/ruin/unpowered/syndicate_space_base/service) "nn" = ( -/obj/machinery/atmospherics/unary/thermomachine/heater{ +/obj/machinery/firealarm/directional/south, +/obj/machinery/atmospherics/unary/thermomachine/upgraded{ dir = 1 }, -/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_space_base/atmos) "no" = ( @@ -2521,12 +2523,12 @@ /turf/simulated/floor/catwalk, /area/ruin/unpowered/syndicate_space_base/toxtest) "pl" = ( -/obj/machinery/bodyscanner{ - dir = 4 - }, /obj/effect/turf_decal/tiles/department/medical/side{ dir = 8 }, +/obj/machinery/bodyscanner/upgraded{ + dir = 4 + }, /turf/simulated/floor/plasteel/white, /area/ruin/unpowered/syndicate_space_base/medbay) "pn" = ( @@ -2881,14 +2883,15 @@ /area/ruin/unpowered/syndicate_space_base/dormitories) "rr" = ( /obj/machinery/atmospherics/binary/volume_pump, -/turf/simulated/floor/plating, +/obj/effect/turf_decal/tiles/department/command, +/turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/engineering) "rs" = ( -/obj/machinery/hydroponics/constructable, /obj/machinery/light_switch{ pixel_y = 24; name = "north bump" }, +/obj/machinery/hydroponics/constructable/upgraded, /turf/simulated/floor/grass, /area/ruin/unpowered/syndicate_space_base/service) "rt" = ( @@ -2896,8 +2899,8 @@ /area/ruin/unpowered/syndicate_space_base/atmos) "rv" = ( /obj/structure/table, -/obj/machinery/kitchen_machine/microwave, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/kitchen_machine/microwave/upgraded, /turf/simulated/floor/plasteel/white, /area/ruin/unpowered/syndicate_space_base/service) "rw" = ( @@ -2930,7 +2933,7 @@ /turf/simulated/floor/plasteel/white, /area/ruin/unpowered/syndicate_space_base/service) "rF" = ( -/obj/machinery/atmospherics/unary/thermomachine/freezer{ +/obj/machinery/atmospherics/unary/thermomachine/upgraded{ dir = 1 }, /turf/simulated/floor/plating, @@ -3478,11 +3481,11 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/telecomms) "vf" = ( -/obj/machinery/seed_extractor, /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/seed_extractor/upgraded, /turf/simulated/floor/wood, /area/ruin/unpowered/syndicate_space_base/service) "vh" = ( @@ -3609,7 +3612,8 @@ initialize_directions = 11 }, /obj/machinery/atmospherics/meter, -/turf/simulated/floor/plating, +/obj/effect/turf_decal/tiles/department/command, +/turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/engineering) "vG" = ( /obj/effect/turf_decal/tiles/department/security/side{ @@ -3763,7 +3767,8 @@ /area/ruin/unpowered/syndicate_space_base/genetics) "wz" = ( /obj/machinery/atmospherics/binary/circulator, -/turf/simulated/floor/plating, +/obj/effect/turf_decal/tiles/department/command, +/turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/engineering) "wA" = ( /obj/machinery/light/small, @@ -3818,10 +3823,6 @@ /area/ruin/unpowered/syndicate_space_base/arrivals) "wP" = ( /obj/structure/table/reinforced, -/obj/item/scalpel, -/obj/item/circular_saw{ - pixel_y = 9 - }, /obj/effect/turf_decal/tiles/department/medical/side{ dir = 4 }, @@ -4066,8 +4067,9 @@ /turf/simulated/floor/plasteel/white, /area/ruin/unpowered/syndicate_space_base/service) "yE" = ( -/obj/machinery/atmospherics/unary/thermomachine/freezer, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/unary/thermomachine/upgraded, +/obj/effect/turf_decal/tiles/department/command, +/turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/engineering) "yL" = ( /obj/machinery/light_switch{ @@ -4097,11 +4099,11 @@ /turf/simulated/floor/plasteel/white, /area/ruin/unpowered/syndicate_space_base/virology) "zd" = ( -/obj/machinery/dna_scannernew, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tiles/department/virology/side{ dir = 6 }, +/obj/machinery/dna_scannernew/upgraded, /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/genetics) "ze" = ( @@ -4168,7 +4170,8 @@ /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 8 }, -/turf/simulated/floor/plating, +/obj/effect/turf_decal/tiles/department/security, +/turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/engineering) "zz" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -4337,13 +4340,11 @@ /area/ruin/unpowered/syndicate_space_base/toxlaunch) "Aq" = ( /obj/structure/table/reinforced, -/obj/item/surgicaldrill, -/obj/item/bonegel, -/obj/item/bonesetter, -/obj/item/fix_o_vein, /obj/effect/turf_decal/tiles/department/medical/side{ dir = 4 }, +/obj/item/stock_parts/cell/high/plus, +/obj/machinery/cell_charger/upgraded, /turf/simulated/floor/plasteel/white, /area/ruin/unpowered/syndicate_space_base/medbay) "AB" = ( @@ -4356,7 +4357,7 @@ /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/unpowered/syndicate_space_base/cave) "AJ" = ( -/obj/machinery/hydroponics/constructable, +/obj/machinery/hydroponics/constructable/upgraded, /turf/simulated/floor/grass, /area/ruin/unpowered/syndicate_space_base/service) "AM" = ( @@ -4526,14 +4527,14 @@ /area/ruin/unpowered/syndicate_space_base/dormitories) "BJ" = ( /obj/machinery/light, -/obj/machinery/cooking/oven, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/oven/loaded/upgraded, /turf/simulated/floor/plasteel/white, /area/ruin/unpowered/syndicate_space_base/service) "BL" = ( -/obj/structure/table, -/obj/machinery/cooking/grill, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/grill/loaded/upgraded, +/obj/structure/table/reinforced, /turf/simulated/floor/plasteel/white, /area/ruin/unpowered/syndicate_space_base/service) "BQ" = ( @@ -4702,7 +4703,6 @@ /obj/structure/table, /obj/item/storage/box/syringes, /obj/item/gun/syringe/syndicate, -/obj/item/stock_parts/cell/high/plus, /obj/structure/extinguisher_cabinet{ name = "south bump"; pixel_y = -30 @@ -4784,6 +4784,11 @@ }, /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_space_base/engineering) +"DR" = ( +/obj/machinery/atmospherics/binary/volume_pump, +/obj/effect/turf_decal/tiles/department/security, +/turf/simulated/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_space_base/engineering) "DT" = ( /obj/structure/window/reinforced, /turf/simulated/floor/grass, @@ -5145,12 +5150,11 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/arrivals) "Fw" = ( -/obj/machinery/biogenerator, /obj/structure/window/reinforced, -/obj/item/reagent_containers/glass/bucket, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/biogenerator/loaded/upgraded, /turf/simulated/floor/wood, /area/ruin/unpowered/syndicate_space_base/service) "Fz" = ( @@ -5344,15 +5348,15 @@ /area/ruin/unpowered/syndicate_space_base/main) "GB" = ( /obj/structure/table/glass, -/obj/machinery/reagentgrinder{ - pixel_y = 5 - }, /obj/machinery/light{ dir = 8 }, /obj/effect/turf_decal/tiles/department/science/side{ dir = 9 }, +/obj/machinery/reagentgrinder/upgraded{ + pixel_y = 6 + }, /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/chemistry) "GC" = ( @@ -5412,11 +5416,11 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/toxlaunch) "Hd" = ( -/obj/machinery/hydroponics/constructable, /obj/structure/extinguisher_cabinet{ name = "north bump"; pixel_y = 30 }, +/obj/machinery/hydroponics/constructable/upgraded, /turf/simulated/floor/grass, /area/ruin/unpowered/syndicate_space_base/service) "Hm" = ( @@ -5438,7 +5442,7 @@ /turf/simulated/floor/plasteel/white, /area/ruin/unpowered/syndicate_space_base/medbay) "Ho" = ( -/obj/machinery/recharge_station, +/obj/machinery/recharge_station/upgraded, /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/main) "Hr" = ( @@ -5574,7 +5578,8 @@ /obj/machinery/atmospherics/binary/circulator{ side = 4 }, -/turf/simulated/floor/plating, +/obj/effect/turf_decal/tiles/department/security, +/turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/engineering) "In" = ( /obj/machinery/firealarm/directional/east, @@ -6036,11 +6041,11 @@ /area/ruin/unpowered/syndicate_space_base/main) "Lh" = ( /obj/structure/table, -/obj/machinery/cell_charger, /obj/item/stock_parts/cell/high/plus, /obj/machinery/light{ dir = 8 }, +/obj/machinery/cell_charger/upgraded, /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_space_base/engineering) "Lj" = ( @@ -6205,7 +6210,8 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, -/turf/simulated/floor/plating, +/obj/effect/turf_decal/tiles/department/command, +/turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/engineering) "Mo" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -6268,11 +6274,11 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/main) "MF" = ( -/obj/machinery/plantgenes, /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/plantgenes/upgraded, /turf/simulated/floor/wood, /area/ruin/unpowered/syndicate_space_base/service) "MK" = ( @@ -6740,8 +6746,9 @@ /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/unpowered/syndicate_space_base/cave) "Qy" = ( -/obj/machinery/atmospherics/unary/thermomachine/heater, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/unary/thermomachine/upgraded, +/obj/effect/turf_decal/tiles/department/security, +/turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/engineering) "Qz" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -6816,10 +6823,10 @@ /turf/simulated/floor/plating/asteroid/airless, /area/ruin/unpowered/syndicate_space_base/inner) "QU" = ( -/obj/machinery/recharge_station, /obj/effect/turf_decal/tiles/department/engineering/side{ dir = 6 }, +/obj/machinery/recharge_station/upgraded, /turf/simulated/floor/plasteel, /area/ruin/unpowered/syndicate_space_base/storage) "QY" = ( @@ -6898,15 +6905,15 @@ /area/ruin/unpowered/syndicate_space_base/atmos) "Rw" = ( /obj/structure/table/glass, -/obj/machinery/reagentgrinder{ - pixel_y = 5 - }, /obj/machinery/light{ dir = 8 }, /obj/effect/turf_decal/tiles/department/science/side{ dir = 10 }, +/obj/machinery/reagentgrinder/upgraded{ + pixel_y = 6 + }, /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/chemistry) "RM" = ( @@ -6920,7 +6927,6 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/arrivals) "RN" = ( -/obj/machinery/reagentgrinder, /obj/item/stack/sheet/mineral/plasma{ amount = 5 }, @@ -6931,6 +6937,9 @@ amount = 10 }, /obj/structure/table/glass, +/obj/machinery/reagentgrinder/upgraded{ + pixel_y = 6 + }, /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/virology) "RR" = ( @@ -7290,7 +7299,8 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, -/turf/simulated/floor/plating, +/obj/effect/turf_decal/tiles/department/security, +/turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/engineering) "TW" = ( /obj/structure/table, @@ -7875,8 +7885,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/cooking/stovetop, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/stovetop/loaded, /turf/simulated/floor/plasteel/white, /area/ruin/unpowered/syndicate_space_base/service) "Xv" = ( @@ -7957,7 +7967,8 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, -/turf/simulated/floor/plating, +/obj/effect/turf_decal/tiles/department/security, +/turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/engineering) "Ye" = ( /obj/structure/chair/stool{ @@ -8157,7 +8168,8 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 }, -/turf/simulated/floor/plating, +/obj/effect/turf_decal/tiles/department/command, +/turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/engineering) "Zr" = ( /obj/machinery/computer/monitor/secret{ @@ -9783,7 +9795,7 @@ Kb zb cM TN -rr +DR Yd qF tu diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index 7ae0e9133e8..8d1e52169a2 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -222,10 +222,21 @@ /area/holodeck/source_desert) "aM" = ( /obj/structure/table/reinforced, -/obj/item/clothing/suit/chef/classic, -/obj/item/kitchen/rollingpin, -/obj/item/clothing/head/chefhat, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = -8 + }, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_y = 8; + pixel_x = 10 + }, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/reagentgrinder/upgraded{ + pixel_y = 6 + }, /turf/simulated/floor/plasteel/white, /area/tdome/tdomeobserve) "aN" = ( @@ -804,6 +815,11 @@ /obj/structure/chair/office/dark, /turf/simulated/floor/plasteel/dark, /area/ghost_bar) +"df" = ( +/obj/effect/turf_decal/tiles/dark/checker, +/obj/structure/sink/kitchen/directional/north, +/turf/simulated/floor/plasteel/white, +/area/ghost_bar) "dj" = ( /obj/effect/turf_decal/tiles/department/security/side{ dir = 8 @@ -865,7 +881,7 @@ /turf/simulated/floor/plasteel/dark, /area/ninja/holding) "dv" = ( -/obj/machinery/atmospherics/unary/cryo_cell/upgraded, +/obj/machinery/atmospherics/unary/cryo_cell/loaded/upgraded, /obj/effect/turf_decal/tiles/department/medical/side{ dir = 1 }, @@ -932,14 +948,6 @@ }, /turf/simulated/floor/holofloor, /area/holodeck/source_boxingcourt) -"dM" = ( -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/airlock/centcom{ - dir = 4 - }, -/obj/effect/turf_decal/tiles/dark/checker, -/turf/simulated/floor/plasteel/white, -/area/ghost_bar) "dN" = ( /obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/airlock/external_no_weld{ @@ -987,11 +995,13 @@ /turf/simulated/floor/wood, /area/wizard_station) "ef" = ( -/obj/machinery/chem_dispenser/beer, /obj/structure/table/reinforced, /obj/machinery/barsign/ghost_bar{ pixel_y = 32 }, +/obj/machinery/chem_dispenser/beer/upgraded{ + pixel_y = 5 + }, /turf/simulated/floor/wood, /area/ghost_bar) "eg" = ( @@ -1144,14 +1154,6 @@ }, /turf/simulated/floor/wood, /area/wizard_station) -"eP" = ( -/obj/effect/mapping_helpers/turfs/damage, -/obj/structure/closet/crate/can, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/ghost_bar) "eQ" = ( /turf/simulated/floor/holofloor, /area/holodeck/source_boxingcourt) @@ -1670,6 +1672,13 @@ /obj/structure/window/reinforced, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate_sit) +"gS" = ( +/obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/icemachine{ + dir = 8 + }, +/turf/simulated/floor/plasteel/white, +/area/ghost_bar) "gT" = ( /obj/machinery/light/spot{ dir = 8 @@ -2063,14 +2072,27 @@ /turf/simulated/floor/plating/abductor, /area/abductor_ship) "ia" = ( -/obj/machinery/cooking/deepfryer/upgraded, +/obj/structure/table/reinforced, /obj/effect/turf_decal/tiles/dark/checker, +/obj/item/reagent_containers/cooking/board, +/obj/item/kitchen/rollingpin{ + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/clothing/head/chefhat{ + pixel_x = 8; + pixel_y = 13 + }, +/obj/item/kitchen/knife{ + pixel_x = -6; + pixel_y = 3 + }, /turf/simulated/floor/plasteel/white, /area/tdome/tdomeobserve) "ib" = ( /obj/structure/table/wood, /obj/effect/turf_decal/tiles/jobs/bar/checker, -/obj/machinery/chem_dispenser/soda{ +/obj/machinery/chem_dispenser/soda/upgraded{ dir = 8 }, /turf/simulated/floor/plasteel, @@ -3412,7 +3434,7 @@ /turf/simulated/floor/mech_bay_recharge_floor, /area/admin) "mv" = ( -/obj/machinery/bodyscanner, +/obj/machinery/bodyscanner/upgraded, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "mw" = ( @@ -3830,7 +3852,7 @@ /area/shuttle/supply) "nF" = ( /obj/structure/table/wood, -/obj/machinery/recharger, +/obj/machinery/recharger/upgraded, /turf/simulated/floor/wood, /area/centcom/specops) "nG" = ( @@ -3876,8 +3898,10 @@ /turf/simulated/floor/plasteel/freezer, /area/syndicate_mothership) "nM" = ( -/obj/machinery/kitchen_machine/microwave, /obj/structure/table/glass/reinforced/plastitanium, +/obj/machinery/kitchen_machine/microwave/upgraded{ + pixel_y = 5 + }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) "nN" = ( @@ -3897,6 +3921,7 @@ /turf/simulated/floor/plasteel, /area/centcom/evac) "nQ" = ( +/obj/item/storage/fancy/cigarettes/dromedaryco, /obj/item/lighter/zippo{ pixel_x = 5 }, @@ -3980,7 +4005,9 @@ /area/ghost_bar) "oa" = ( /obj/structure/table, -/obj/machinery/reagentgrinder, +/obj/machinery/reagentgrinder/upgraded{ + pixel_y = 6 + }, /turf/simulated/floor/plasteel/freezer, /area/admin) "ob" = ( @@ -4065,7 +4092,6 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "op" = ( -/obj/item/surgical_drapes, /obj/machinery/optable, /obj/effect/turf_decal/tiles/department/medical/side{ dir = 8 @@ -4089,10 +4115,7 @@ /turf/simulated/floor/grass/jungle, /area/centcom/evac) "ox" = ( -/obj/machinery/chem_dispenser{ - desc = "It appears Fox is doing more fruit chemistry today!"; - hackedcheck = 1 - }, +/obj/machinery/chem_dispenser/upgraded, /turf/simulated/floor/plasteel/freezer, /area/admin) "oy" = ( @@ -4152,32 +4175,17 @@ /turf/simulated/floor/plasteel/freezer, /area/syndicate_mothership) "oJ" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -8; - pixel_y = 5 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = -8 - }, -/obj/item/kitchen/knife, -/obj/machinery/newscaster/directional/west, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_y = 5 - }, -/obj/machinery/reagentgrinder{ - desc = "Used to grind things up into raw materials and liquids."; - pixel_y = 5 - }, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/newscaster/directional/west, +/obj/machinery/cooking/deepfryer/loaded/upgraded, /turf/simulated/floor/plasteel/white, /area/tdome/tdomeobserve) "oM" = ( /obj/structure/table/wood, -/obj/machinery/chem_dispenser/beer{ +/obj/effect/turf_decal/tiles/jobs/bar/checker, +/obj/machinery/chem_dispenser/beer/upgraded{ dir = 8 }, -/obj/effect/turf_decal/tiles/jobs/bar/checker, /turf/simulated/floor/plasteel, /area/tdome/tdomeobserve) "oN" = ( @@ -4227,9 +4235,13 @@ /turf/simulated/floor/mineral/plastitanium, /area/shuttle/supply) "oX" = ( -/obj/structure/table, -/obj/machinery/cooking/grill/upgraded, /obj/effect/turf_decal/tiles/dark/checker, +/obj/structure/table/reinforced, +/obj/machinery/kitchen_machine/microwave/upgraded{ + desc = "Cooks and boils stuff, somehow."; + pixel_x = -3; + pixel_y = 5 + }, /turf/simulated/floor/plasteel/white, /area/tdome/tdomeobserve) "oZ" = ( @@ -4509,16 +4521,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/obj/item/reagent_containers/iv_bag/blood/a_minus, -/obj/item/reagent_containers/iv_bag/blood/a_plus, -/obj/item/reagent_containers/iv_bag/blood/b_minus, -/obj/item/reagent_containers/iv_bag/blood/b_plus, -/obj/item/reagent_containers/iv_bag/blood/o_minus, -/obj/item/reagent_containers/iv_bag/blood/o_plus, -/obj/structure/closet/crate/freezer, /obj/effect/turf_decal/tiles/department/medical/side{ dir = 8 }, +/obj/structure/closet/crate/freezer/iv_storage, /turf/simulated/floor/plasteel/white, /area/centcom/control) "qd" = ( @@ -4547,6 +4553,35 @@ }, /turf/simulated/floor/holofloor, /area/holodeck/source_thunderdomecourt) +"qi" = ( +/obj/effect/mapping_helpers/turfs/damage, +/obj/structure/sign/poster/official/random/directional/north, +/turf/simulated/floor/wood, +/area/ghost_bar) +"qk" = ( +/obj/structure/closet/secure_closet/freezer/fridge/open, +/obj/item/food/grown/potato, +/obj/item/food/grown/potato, +/obj/item/food/grown/whitebeet, +/obj/item/food/grown/whitebeet, +/obj/item/food/grown/tomato, +/obj/item/food/grown/tomato, +/obj/item/food/grown/rice, +/obj/item/food/grown/rice, +/obj/item/food/grown/icepepper, +/obj/item/food/grown/icepepper, +/obj/item/food/grown/citrus/lemon, +/obj/item/food/grown/citrus/lime, +/obj/item/food/grown/citrus/orange, +/obj/item/food/grown/cherries, +/obj/item/food/grown/apple, +/obj/item/food/grown/ambrosia/deus, +/obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plasteel/white, +/area/ghost_bar) "qm" = ( /obj/structure/table/wood/fancy/royalblack, /obj/item/storage/fancy/matches, @@ -4816,7 +4851,7 @@ /turf/simulated/floor/wood, /area/ghost_bar) "rg" = ( -/obj/machinery/clonescanner, +/obj/machinery/clonescanner/upgraded, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "rh" = ( @@ -5332,11 +5367,10 @@ /area/syndicate_mothership) "sT" = ( /obj/structure/table/wood, -/obj/machinery/reagentgrinder{ - desc = "Used to grind things up into raw materials and liquids."; - pixel_y = 5 - }, /obj/effect/turf_decal/tiles/jobs/bar/checker, +/obj/machinery/reagentgrinder/upgraded{ + pixel_y = 6 + }, /turf/simulated/floor/plasteel, /area/tdome/tdomeobserve) "sU" = ( @@ -5437,8 +5471,10 @@ /turf/simulated/floor/carpet/black, /area/centcom/specops) "to" = ( -/obj/machinery/chem_dispenser/soda, /obj/structure/table/reinforced, +/obj/machinery/chem_dispenser/soda/upgraded{ + pixel_y = 5 + }, /turf/simulated/floor/wood, /area/ghost_bar) "tp" = ( @@ -6172,7 +6208,7 @@ /turf/simulated/floor/carpet, /area/admin) "vV" = ( -/obj/machinery/cooking/ice_cream_mixer/upgraded, +/obj/machinery/cooking/ice_cream_mixer/loaded/upgraded, /obj/effect/turf_decal/tiles/dark/checker, /turf/simulated/floor/plasteel/white, /area/tdome/tdomeobserve) @@ -6183,7 +6219,7 @@ "vX" = ( /obj/structure/table, /obj/structure/window/reinforced, -/obj/machinery/recharger, +/obj/machinery/recharger/upgraded, /turf/simulated/floor/carpet, /area/admin) "vY" = ( @@ -6407,24 +6443,9 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/ghost_bar) "wN" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -8; - pixel_y = 5 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = -8 - }, -/obj/item/kitchen/knife, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_y = 5 - }, -/obj/machinery/reagentgrinder{ - desc = "Used to grind things up into raw materials and liquids."; - pixel_y = 5 - }, -/obj/item/reagent_containers/glass/beaker/large, /obj/effect/turf_decal/tiles/dark/checker, +/obj/structure/table/reinforced, +/obj/machinery/cooking/grill/loaded/upgraded, /turf/simulated/floor/plasteel/white, /area/ghost_bar) "wP" = ( @@ -6473,8 +6494,8 @@ /area/admin) "wV" = ( /obj/structure/table, -/obj/machinery/recharger, /obj/item/deck/cards/syndicate/black, +/obj/machinery/recharger/upgraded, /turf/simulated/floor/plasteel/dark, /area/admin) "wW" = ( @@ -6570,10 +6591,6 @@ }, /turf/simulated/floor/carpet/arcade, /area/syndicate_mothership) -"xi" = ( -/obj/structure/sign/poster/official/random/directional/north, -/turf/simulated/floor/wood, -/area/ghost_bar) "xj" = ( /obj/structure/flora/tree/pine{ pixel_x = 1 @@ -6656,6 +6673,11 @@ /obj/structure/flora/rock/pile/largejungle, /turf/simulated/floor/grass/jungle, /area/centcom/evac) +"xA" = ( +/obj/structure/railing, +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/wood, +/area/ghost_bar) "xB" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ autolink_id = "syndishuttle_vent" @@ -6769,9 +6791,10 @@ /turf/simulated/floor/plasteel/white, /area/centcom/control) "xU" = ( -/obj/structure/table/reinforced, -/obj/machinery/kitchen_machine/microwave/upgraded, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/processor/upgraded{ + dir = 8 + }, /turf/simulated/floor/plasteel/white, /area/ghost_bar) "xV" = ( @@ -6983,9 +7006,8 @@ /turf/simulated/floor/grass, /area/centcom/control) "yR" = ( -/obj/structure/table/reinforced, -/obj/machinery/cooking/stovetop, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/oven/loaded/upgraded, /turf/simulated/floor/plasteel/white, /area/tdome/tdomeobserve) "yT" = ( @@ -7072,7 +7094,7 @@ /area/ghost_bar) "zl" = ( /obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/beer{ +/obj/machinery/chem_dispenser/beer/upgraded{ dir = 8 }, /turf/simulated/floor/wood, @@ -7152,14 +7174,14 @@ /turf/simulated/floor/plasteel/freezer, /area/trader_station/sol) "zB" = ( -/obj/machinery/cooking/oven/upgraded, /obj/effect/turf_decal/tiles/dark/checker, +/obj/structure/table/reinforced, +/obj/machinery/cooking/stovetop/loaded/upgraded, /turf/simulated/floor/plasteel/white, /area/tdome/tdomeobserve) "zC" = ( /obj/machinery/door/window/classic/reversed{ - name = "bar"; - dir = 1 + name = "bar" }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) @@ -7209,15 +7231,19 @@ /turf/simulated/wall/indestructible/riveted, /area/centcom/specops) "zP" = ( -/obj/machinery/light/small, -/obj/machinery/economy/vending/dinnerware, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/ice_cream_mixer/loaded/upgraded, /turf/simulated/floor/plasteel/white, /area/ghost_bar) "zQ" = ( /obj/machinery/light/small, /turf/simulated/floor/plasteel/freezer, /area/ghost_bar) +"zR" = ( +/obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/economy/vending/dinnerware, +/turf/simulated/floor/plasteel/white, +/area/ghost_bar) "zS" = ( /obj/item/flag/syndi, /turf/simulated/floor/mineral/plastitanium/red, @@ -7245,8 +7271,8 @@ /area/ninja/outpost) "zY" = ( /obj/structure/table/reinforced, -/obj/machinery/cooking/stovetop, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/stovetop/loaded/upgraded, /turf/simulated/floor/plasteel/white, /area/ghost_bar) "Aa" = ( @@ -7322,19 +7348,18 @@ /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "An" = ( -/obj/item/circular_saw, -/obj/item/hemostat{ - pixel_x = -4 - }, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/mask/surgical, /obj/structure/table/reinforced, -/obj/item/scalpel/laser/manager, -/obj/item/surgicaldrill, -/obj/item/bonegel, -/obj/item/fix_o_vein, -/obj/item/stack/medical/ointment/advanced, /obj/effect/turf_decal/tiles/department/medical/side, +/obj/item/storage/surgical_tray, +/obj/item/scalpel/laser/manager{ + pixel_y = -1 + }, +/obj/item/clothing/mask/surgical{ + pixel_y = 7 + }, +/obj/item/clothing/gloves/color/latex/nitrile{ + pixel_y = 9 + }, /turf/simulated/floor/plasteel/white, /area/centcom/control) "Ao" = ( @@ -7895,8 +7920,8 @@ /turf/simulated/floor/holofloor, /area/holodeck/source_thunderdomecourt) "Cp" = ( -/obj/structure/sink/directional/east, /obj/effect/turf_decal/tiles/dark/checker, +/obj/structure/sink/kitchen/directional/east, /turf/simulated/floor/plasteel/white, /area/tdome/tdomeobserve) "Cq" = ( @@ -7923,8 +7948,9 @@ /obj/machinery/barsign{ pixel_y = -32 }, -/obj/machinery/cooking/oven/upgraded, /obj/effect/turf_decal/tiles/dark/checker, +/obj/structure/table/reinforced, +/obj/machinery/cooking/grill/loaded/upgraded, /turf/simulated/floor/plasteel/white, /area/tdome/tdomeobserve) "Cw" = ( @@ -8142,8 +8168,9 @@ /turf/simulated/floor/plasteel/dark, /area/centcom/suppy) "Dk" = ( -/obj/machinery/cooking/oven/upgraded, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/stovetop/loaded/upgraded, +/obj/structure/table/reinforced, /turf/simulated/floor/plasteel/white, /area/ghost_bar) "Dl" = ( @@ -8501,10 +8528,8 @@ /turf/simulated/floor/wood, /area/ghost_bar) "EK" = ( -/obj/machinery/smartfridge/foodcart{ - dir = 4 - }, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/oven/loaded/upgraded, /turf/simulated/floor/plasteel/white, /area/ghost_bar) "EL" = ( @@ -8576,10 +8601,16 @@ /area/centcom/control) "Fb" = ( /obj/structure/table/reinforced, -/obj/machinery/light/small{ - dir = 1 - }, /obj/effect/turf_decal/tiles/dark/checker, +/obj/item/reagent_containers/cooking/board, +/obj/item/kitchen/knife{ + pixel_x = 9; + pixel_y = 6 + }, +/obj/item/reagent_containers/glass/beaker/large{ + pixel_x = -10; + pixel_y = 12 + }, /turf/simulated/floor/plasteel/white, /area/ghost_bar) "Fc" = ( @@ -9011,7 +9042,7 @@ /turf/simulated/floor/plasteel/white, /area/centcom/control) "GE" = ( -/obj/machinery/chem_dispenser, +/obj/machinery/chem_dispenser/upgraded, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "GF" = ( @@ -9166,6 +9197,11 @@ /obj/structure/flora/tree/jungle/small, /turf/simulated/floor/grass/jungle, /area/wizard_station) +"Hk" = ( +/obj/effect/turf_decal/tiles/dark/checker, +/obj/item/clothing/suit/chef/classic, +/turf/simulated/floor/plasteel/white, +/area/tdome/tdomeobserve) "Hm" = ( /obj/effect/spawner/window, /obj/structure/sign/public/doors, @@ -9271,11 +9307,11 @@ /turf/simulated/floor/plasteel/dark, /area/ghost_bar) "HE" = ( -/obj/machinery/recharge_station, /obj/effect/turf_decal/tiles/department/security/corner, /obj/effect/turf_decal/tiles/department/security/corner{ dir = 1 }, +/obj/machinery/recharge_station/upgraded, /turf/simulated/floor/plasteel/freezer, /area/ghost_bar) "HF" = ( @@ -9849,7 +9885,8 @@ "JT" = ( /obj/structure/table/wood, /obj/machinery/computer/library/syndie{ - req_one_access = list() + req_one_access = list(); + dir = 1 }, /turf/simulated/floor/wood, /area/ghost_bar) @@ -9946,11 +9983,18 @@ /obj/structure/table/reinforced, /obj/item/reagent_containers/cooking/board, /obj/effect/turf_decal/tiles/dark/checker, +/obj/item/kitchen/knife, /turf/simulated/floor/plasteel/white, /area/ghost_bar) "Km" = ( -/obj/machinery/kitchen_machine/microwave/upgraded, -/obj/structure/table, +/obj/machinery/kitchen_machine/microwave/upgraded{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/table/reinforced, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Kn" = ( @@ -10103,17 +10147,17 @@ /turf/simulated/floor/plasteel/dark, /area/centcom/suppy) "KN" = ( -/obj/structure/table, /obj/machinery/chem_dispenser/beer/upgraded{ pixel_y = 5 }, +/obj/structure/table/reinforced, /turf/simulated/floor/wood, /area/centcom/evac) "KO" = ( -/obj/structure/table, -/obj/machinery/chem_dispenser/soda{ +/obj/machinery/chem_dispenser/soda/upgraded{ pixel_y = 5 }, +/obj/structure/table/reinforced, /turf/simulated/floor/wood, /area/centcom/evac) "KP" = ( @@ -10207,16 +10251,6 @@ icon_state = "asteroid8" }, /area/holodeck/source_desert) -"Lg" = ( -/obj/structure/table/reinforced, -/obj/machinery/kitchen_machine/microwave/upgraded{ - desc = "Cooks and boils stuff, somehow."; - pixel_x = -3; - pixel_y = 5 - }, -/obj/effect/turf_decal/tiles/dark/checker, -/turf/simulated/floor/plasteel/white, -/area/tdome/tdomeobserve) "Li" = ( /obj/structure/bookcase/random, /obj/machinery/light/small{ @@ -10261,7 +10295,7 @@ /turf/simulated/floor/carpet/arcade, /area/syndicate_mothership) "Lq" = ( -/obj/machinery/recharge_station, +/obj/machinery/recharge_station/upgraded, /turf/simulated/floor/plasteel/freezer, /area/ghost_bar) "Lr" = ( @@ -10318,6 +10352,12 @@ dir = 8 }, /area/ghost_bar) +"LB" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tiles/dark/checker, +/obj/item/reagent_containers/glass/beaker/large, +/turf/simulated/floor/plasteel/white, +/area/ghost_bar) "LC" = ( /obj/structure/chair/comfy/green{ dir = 1 @@ -10340,8 +10380,26 @@ /turf/simulated/floor/plasteel/dark, /area/ghost_bar) "LG" = ( -/obj/structure/sink/directional/north, /obj/effect/turf_decal/tiles/dark/checker, +/obj/structure/table/reinforced, +/obj/machinery/reagentgrinder{ + desc = "Used to grind things up into raw materials and liquids."; + pixel_y = 5 + }, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_y = 7; + pixel_x = 12 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -11; + pixel_y = 8 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = -11 + }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plasteel/white, /area/ghost_bar) "LH" = ( @@ -10500,9 +10558,9 @@ /turf/simulated/floor/plasteel/dark, /area/ghost_bar) "Ms" = ( -/obj/machinery/processor, /obj/effect/turf_decal/stripes/end, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/processor/upgraded, /turf/simulated/floor/plasteel/white, /area/tdome/tdomeobserve) "Mt" = ( @@ -10917,7 +10975,7 @@ /turf/simulated/floor/plasteel, /area/centcom/evac) "Oc" = ( -/obj/machinery/mecha_part_fabricator/upgraded, +/obj/machinery/mecha_part_fabricator/loaded/upgraded, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Og" = ( @@ -11365,7 +11423,7 @@ /area/centcom/specops) "PC" = ( /obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/soda{ +/obj/machinery/chem_dispenser/soda/upgraded{ pixel_y = 5 }, /turf/simulated/floor/mineral/plastitanium/red, @@ -11537,8 +11595,8 @@ /turf/simulated/floor/wood, /area/centcom/evac) "Qd" = ( -/obj/machinery/cell_charger, /obj/structure/table, +/obj/machinery/cell_charger/upgraded, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Qe" = ( @@ -11615,6 +11673,11 @@ /obj/structure/table/glass/reinforced/plastitanium, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) +"Qp" = ( +/obj/effect/turf_decal/tiles/dark/checker, +/obj/structure/sink/kitchen/directional/west, +/turf/simulated/floor/plasteel/white, +/area/ghost_bar) "Qr" = ( /obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/glass/fifty, @@ -11918,8 +11981,12 @@ /area/centcom/specops) "Rz" = ( /obj/structure/table, +/obj/structure/window/reinforced{ + dir = 8 + }, /obj/item/storage/fancy/cigars{ - pixel_y = 8 + pixel_y = 8; + pixel_x = 3 }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) @@ -11986,6 +12053,11 @@ /obj/item/storage/fancy/donut_box, /turf/simulated/floor/wood, /area/centcom/control) +"RJ" = ( +/obj/machinery/cooking/oven/loaded/upgraded, +/obj/effect/turf_decal/tiles/dark/checker, +/turf/simulated/floor/plasteel/white, +/area/ghost_bar) "RK" = ( /turf/simulated/floor/carpet/arcade, /area/ghost_bar) @@ -12005,7 +12077,7 @@ /area/ghost_bar) "RN" = ( /obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/soda{ +/obj/machinery/chem_dispenser/soda/upgraded{ dir = 8 }, /turf/simulated/floor/wood, @@ -12254,9 +12326,7 @@ /area/admin) "SD" = ( /obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 4 - }, +/obj/machinery/recharger/upgraded, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "SE" = ( @@ -12277,7 +12347,7 @@ /turf/simulated/floor/plasteel/freezer, /area/ghost_bar) "SG" = ( -/obj/machinery/autolathe/upgraded{ +/obj/machinery/autolathe/loaded/upgraded{ hacked = 1 }, /turf/simulated/floor/mineral/plastitanium/red, @@ -12327,10 +12397,10 @@ /area/ruin/space/bubblegum_arena) "SR" = ( /obj/structure/table/reinforced, -/obj/machinery/reagentgrinder, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/kitchen/knife, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/reagentgrinder/upgraded{ + pixel_y = 6 + }, /turf/simulated/floor/plasteel/white, /area/ghost_bar) "SS" = ( @@ -12354,8 +12424,8 @@ /area/ghost_bar) "SX" = ( /obj/structure/table/reinforced, -/obj/machinery/cooking/grill, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/grill/loaded/upgraded, /turf/simulated/floor/plasteel/white, /area/ghost_bar) "SY" = ( @@ -12530,8 +12600,8 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/specops) "TG" = ( -/obj/machinery/bodyscanner, /obj/effect/turf_decal/tiles/department/medical/side, +/obj/machinery/bodyscanner/upgraded, /turf/simulated/floor/plasteel/white, /area/centcom/control) "TH" = ( @@ -12608,6 +12678,13 @@ "TU" = ( /turf/simulated/floor/plasteel/dark, /area/centcom/evac) +"TV" = ( +/obj/structure/closet/crate/can, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/ghost_bar) "TW" = ( /obj/effect/turf_decal/tiles/department/security/side{ dir = 1 @@ -12627,15 +12704,7 @@ /area/centcom/control) "TZ" = ( /obj/structure/table, -/obj/item/bonegel, -/obj/item/bonesetter, -/obj/item/hemostat, -/obj/item/cautery, -/obj/item/surgicaldrill, -/obj/item/circular_saw, -/obj/item/scalpel, -/obj/item/retractor, -/obj/item/fix_o_vein, +/obj/item/storage/surgical_tray, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "Ua" = ( @@ -13118,8 +13187,8 @@ /turf/simulated/floor/plating, /area/centcom/evac) "VR" = ( -/obj/machinery/processor, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/processor/upgraded, /turf/simulated/floor/plasteel/white, /area/ghost_bar) "VS" = ( @@ -13186,6 +13255,13 @@ /obj/effect/landmark/spawner/bubblegum, /turf/simulated/floor/lava/lava_land_surface, /area/ruin/space/bubblegum_arena) +"Wh" = ( +/obj/machinery/door/airlock/centcom{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/autoname, +/turf/simulated/floor/wood, +/area/ghost_bar) "Wi" = ( /obj/structure/table/wood/fancy/royalblack, /obj/item/deck/cards/black, @@ -13682,9 +13758,12 @@ /turf/simulated/floor/plating/airless, /area/shuttle/specops) "XR" = ( -/obj/machinery/processor, -/obj/structure/sign/poster/official/fruit_bowl/directional/north, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/kitchen_machine/microwave/upgraded{ + pixel_y = 5 + }, +/obj/structure/table/reinforced, +/obj/structure/sign/poster/official/fruit_bowl/directional/north, /turf/simulated/floor/plasteel/white, /area/ghost_bar) "XS" = ( @@ -13703,7 +13782,7 @@ /area/centcom/specops) "XX" = ( /obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/beer{ +/obj/machinery/chem_dispenser/beer/upgraded{ pixel_y = 5 }, /turf/simulated/floor/mineral/plastitanium/red, @@ -13883,7 +13962,7 @@ /area/wizard_station) "YC" = ( /obj/structure/table/reinforced, -/obj/machinery/recharger, +/obj/machinery/recharger/upgraded, /turf/simulated/floor/wood, /area/centcom/control) "YD" = ( @@ -14035,7 +14114,7 @@ /area/centcom/specops) "Zm" = ( /obj/structure/table/wood, -/obj/machinery/recharger, +/obj/machinery/recharger/upgraded, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) "Zn" = ( @@ -36281,7 +36360,7 @@ ia aM oX iJ -Lg +yR Ta rQ rQ @@ -36535,7 +36614,7 @@ Jl iJ iJ iJ -iJ +Hk iJ iJ Cv @@ -66623,8 +66702,8 @@ fB Me Me Me +Me tr -Jy qH Nm cg @@ -66875,13 +66954,13 @@ Dm Me Fb es +Qp Oj -zj +qk fF -rq +zR Me -xi -ip +qi Jy Hz rU @@ -67136,11 +67215,11 @@ es es es es -dM +es +Wh Jy Jy -Jy -Hz +xA eU zE Gp @@ -67393,9 +67472,9 @@ Dk EK xU zP +gS Me -eP -Jy +TV Jy nZ Me @@ -72518,7 +72597,7 @@ Jy Jy yO Im -go +zP es eV es @@ -72775,7 +72854,7 @@ Jy Jy CV Im -Dk +RJ es zY YP @@ -73289,7 +73368,7 @@ Im Im Im Im -YP +LB es Kl YP @@ -74060,7 +74139,7 @@ ps ps ps Im -LG +df es es es @@ -74321,7 +74400,7 @@ Im Oj zj fF -es +gS VR YP Im diff --git a/_maps/map_files/shuttles/admin_admin.dmm b/_maps/map_files/shuttles/admin_admin.dmm index a484d1d6712..b9f7955280c 100644 --- a/_maps/map_files/shuttles/admin_admin.dmm +++ b/_maps/map_files/shuttles/admin_admin.dmm @@ -8,8 +8,8 @@ /area/shuttle/administration) "ah" = ( /obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/beer{ - pixel_y = 6 +/obj/machinery/chem_dispenser/beer/upgraded{ + pixel_y = 5 }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) @@ -20,8 +20,8 @@ /area/shuttle/administration) "aj" = ( /obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/soda{ - pixel_y = 6 +/obj/machinery/chem_dispenser/soda/upgraded{ + pixel_y = 5 }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) @@ -41,8 +41,8 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "an" = ( -/obj/machinery/cell_charger, /obj/structure/table, +/obj/machinery/cell_charger/upgraded, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "ao" = ( @@ -53,7 +53,7 @@ /area/shuttle/administration) "ap" = ( /obj/structure/table, -/obj/machinery/recharger{ +/obj/machinery/recharger/upgraded{ pixel_y = 4 }, /turf/simulated/floor/mineral/plastitanium/red, @@ -80,7 +80,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "au" = ( -/obj/machinery/mecha_part_fabricator/upgraded, +/obj/machinery/mecha_part_fabricator/loaded/upgraded, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "av" = ( @@ -88,16 +88,15 @@ pixel_x = -4; pixel_y = 4 }, -/obj/structure/table, /obj/structure/window/reinforced{ dir = 4 }, +/obj/structure/table/reinforced, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aw" = ( /obj/machinery/door/window/classic/reversed{ - name = "bar"; - dir = 2 + name = "bar" }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) @@ -106,6 +105,10 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/item/storage/fancy/cigars{ + pixel_y = 8; + pixel_x = 3 + }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "ay" = ( @@ -174,7 +177,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aI" = ( -/obj/machinery/autolathe/upgraded{ +/obj/machinery/autolathe/loaded/upgraded{ hacked = 1 }, /turf/simulated/floor/mineral/plastitanium/red, @@ -322,7 +325,7 @@ /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bi" = ( -/obj/machinery/bodyscanner, +/obj/machinery/bodyscanner/upgraded, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bk" = ( @@ -352,7 +355,7 @@ /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bo" = ( -/obj/machinery/chem_dispenser, +/obj/machinery/chem_dispenser/upgraded, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bp" = ( @@ -413,15 +416,7 @@ /area/shuttle/administration) "bx" = ( /obj/structure/table, -/obj/item/bonegel, -/obj/item/bonesetter, -/obj/item/hemostat, -/obj/item/cautery, -/obj/item/surgicaldrill, -/obj/item/circular_saw, -/obj/item/scalpel, -/obj/item/retractor, -/obj/item/fix_o_vein, +/obj/item/storage/surgical_tray, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "by" = ( @@ -471,17 +466,15 @@ dir = 4 }, /obj/docking_port/mobile/admin{ - dir = 2; - dwidth = 8; - height = 15; - id = "admin"; - name = "admin"; - timid = 1; - width = 18 + name = "admin" }, /obj/structure/fans/tiny, /turf/simulated/floor/plating, /area/shuttle/administration) +"Te" = ( +/obj/machinery/clonescanner/upgraded, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/administration) "Yl" = ( /obj/machinery/door/poddoor/preopen{ id_tag = "adminshuttleblast"; @@ -546,7 +539,7 @@ am am aO vg -aZ +Te bg bg bm diff --git a/_maps/map_files/shuttles/admin_armory.dmm b/_maps/map_files/shuttles/admin_armory.dmm index 14995c5e53f..0d05a051ffc 100644 --- a/_maps/map_files/shuttles/admin_armory.dmm +++ b/_maps/map_files/shuttles/admin_armory.dmm @@ -18,7 +18,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/recharger, +/obj/machinery/recharger/upgraded, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aP" = ( @@ -37,7 +37,7 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "ce" = ( -/obj/machinery/autolathe/upgraded{ +/obj/machinery/autolathe/loaded/upgraded{ hacked = 1 }, /turf/simulated/floor/mineral/plastitanium/red, @@ -217,12 +217,6 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "qQ" = ( -/obj/machinery/recharger/wallcharger{ - pixel_y = 25 - }, -/obj/machinery/recharger/wallcharger{ - pixel_y = 35 - }, /obj/machinery/light/spot{ dir = 1 }, @@ -232,6 +226,12 @@ pixel_x = 25; req_access = list(19) }, +/obj/machinery/recharger/wallcharger/upgraded{ + pixel_y = 35 + }, +/obj/machinery/recharger/wallcharger/upgraded{ + pixel_y = 25 + }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "rb" = ( @@ -321,8 +321,7 @@ /area/shuttle/administration) "vy" = ( /obj/structure/table/reinforced, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/glass/fifty, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "vA" = ( @@ -398,12 +397,6 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) -"xU" = ( -/obj/structure/table/reinforced, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/glass/fifty, -/turf/simulated/floor/mineral/plastitanium/red, -/area/shuttle/administration) "xZ" = ( /turf/space, /area/shuttle/administration) @@ -426,16 +419,6 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) -"yu" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger{ - pixel_x = -5 - }, -/obj/machinery/recharger{ - pixel_x = 8 - }, -/turf/simulated/floor/mineral/plastitanium/red, -/area/shuttle/administration) "yF" = ( /obj/machinery/status_display, /turf/simulated/wall/mineral/titanium, @@ -515,7 +498,6 @@ pixel_x = -3; pixel_y = 3 }, -/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "Du" = ( @@ -668,7 +650,7 @@ /area/shuttle/administration) "Mi" = ( /obj/structure/table/reinforced, -/obj/machinery/recharger, +/obj/machinery/recharger/upgraded, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Mj" = ( @@ -705,7 +687,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Ns" = ( -/obj/machinery/recharger/wallcharger{ +/obj/machinery/recharger/wallcharger/upgraded{ pixel_y = 25 }, /turf/simulated/floor/mineral/titanium/blue, @@ -720,7 +702,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Ou" = ( -/obj/machinery/autolathe/upgraded{ +/obj/machinery/autolathe/loaded/upgraded{ hacked = 1 }, /turf/simulated/floor/mineral/titanium/blue, @@ -1247,10 +1229,10 @@ Kh Kh fF iz -yu +Mi sq WV -xU +Mi ce jB jU diff --git a/_maps/map_files/shuttles/admin_hospital.dmm b/_maps/map_files/shuttles/admin_hospital.dmm index 8533798dd4e..593db886df9 100644 --- a/_maps/map_files/shuttles/admin_hospital.dmm +++ b/_maps/map_files/shuttles/admin_hospital.dmm @@ -28,7 +28,7 @@ /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aq" = ( -/obj/machinery/chem_dispenser, +/obj/machinery/chem_dispenser/upgraded, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "ar" = ( @@ -59,15 +59,15 @@ /area/shuttle/administration) "ay" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aB" = ( -/obj/machinery/clonescanner, +/obj/machinery/clonescanner/upgraded, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aC" = ( -/obj/machinery/atmospherics/unary/cryo_cell, +/obj/machinery/atmospherics/unary/cryo_cell/loaded/upgraded, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aF" = ( @@ -136,12 +136,12 @@ /obj/structure/table/reinforced, /obj/item/storage/box/syringes, /obj/item/storage/box/beakers, -/obj/machinery/reagentgrinder, /obj/machinery/camera{ dir = 4; name = "NHV Asclepius Chemistry"; network = list("NHV Asclepius") }, +/obj/machinery/reagentgrinder/upgraded, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aT" = ( @@ -186,7 +186,6 @@ /area/shuttle/administration) "be" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/spray/cleaner, /obj/item/storage/box/gloves, /obj/item/storage/box/masks, /turf/simulated/floor/mineral/titanium, @@ -211,7 +210,7 @@ /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bi" = ( -/obj/machinery/atmospherics/unary/thermomachine/freezer{ +/obj/machinery/atmospherics/unary/thermomachine/upgraded{ dir = 1 }, /turf/simulated/floor/mineral/titanium, @@ -237,10 +236,10 @@ /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "br" = ( -/obj/machinery/recharger/wallcharger{ +/obj/machinery/recharger/wallcharger/upgraded{ pixel_y = 25 }, -/obj/machinery/recharger/wallcharger{ +/obj/machinery/recharger/wallcharger/upgraded{ pixel_x = 32; pixel_y = -3 }, @@ -296,12 +295,12 @@ /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bE" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/iv_bag/blood/o_minus, -/obj/item/reagent_containers/iv_bag/blood/o_minus, -/obj/item/reagent_containers/iv_bag/blood/o_minus, -/obj/item/reagent_containers/iv_bag/blood/o_minus, /obj/structure/closet/walllocker/emerglocker/directional/east, +/obj/structure/closet/crate/freezer/iv_storage, +/obj/item/reagent_containers/iv_bag/blood/o_minus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bG" = ( @@ -351,10 +350,11 @@ /obj/structure/bed{ name = "Triage: High Priority" }, +/obj/item/bedsheet/medical, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bR" = ( -/obj/machinery/bodyscanner{ +/obj/machinery/bodyscanner/upgraded{ dir = 1 }, /turf/simulated/floor/mineral/titanium, @@ -405,7 +405,7 @@ /obj/structure/bed{ name = "Triage: High Priority" }, -/obj/machinery/iv_drip, +/obj/item/bedsheet/medical, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "ce" = ( @@ -434,22 +434,12 @@ /area/shuttle/administration) "ch" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/spray/cleaner{ - desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; - name = "Surgery Cleaner" - }, -/obj/machinery/cell_charger, -/turf/simulated/floor/mineral/titanium, -/area/shuttle/administration) -"ci" = ( -/obj/structure/bed{ - name = "Triage: High Priority" - }, -/obj/machinery/iv_drip, +/obj/machinery/cell_charger/upgraded, +/obj/item/stock_parts/cell/high/plus, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "cj" = ( -/obj/machinery/atmospherics/unary/thermomachine/freezer, +/obj/machinery/atmospherics/unary/thermomachine/upgraded, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "ck" = ( @@ -534,6 +524,10 @@ }, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) +"ge" = ( +/obj/machinery/iv_drip, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/administration) "hM" = ( /obj/structure/fans/tiny, /obj/machinery/door/airlock/external{ @@ -564,7 +558,7 @@ /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "kY" = ( -/obj/machinery/recharge_station, +/obj/machinery/recharge_station/upgraded, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "qa" = ( @@ -585,13 +579,15 @@ name = "NHV Asclepius Lobby"; network = list("NHV Asclepius") }, -/obj/machinery/recharge_station, +/obj/machinery/recharge_station/upgraded, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "rn" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/beaker/cryoxadone, -/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner" + }, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "rx" = ( @@ -700,9 +696,8 @@ /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "RB" = ( -/obj/machinery/sleeper{ - dir = 1; - icon_state = "sleeper" +/obj/machinery/sleeper/upgraded{ + dir = 1 }, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) @@ -711,11 +706,18 @@ /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "TT" = ( -/obj/machinery/bodyscanner{ +/obj/machinery/bodyscanner/upgraded{ dir = 4 }, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) +"UU" = ( +/obj/machinery/iv_drip, +/obj/structure/closet/crate/freezer/iv_storage, +/obj/item/reagent_containers/iv_bag/blood/o_minus, +/obj/item/reagent_containers/iv_bag/blood/o_minus, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/administration) (1,1,1) = {" ab @@ -909,10 +911,10 @@ fz aw aw aw -aw -aw -aw -aw +ge +ge +ge +ge aw RB ab @@ -931,7 +933,7 @@ bE aw bQ cb -ci +bQ bQ aw cs @@ -1049,7 +1051,7 @@ ab bA aw bJ -bV +UU ab bA aw diff --git a/_maps/map_files/shuttles/admin_skipjack.dmm b/_maps/map_files/shuttles/admin_skipjack.dmm index a509f633647..1c3dee696b4 100644 --- a/_maps/map_files/shuttles/admin_skipjack.dmm +++ b/_maps/map_files/shuttles/admin_skipjack.dmm @@ -292,7 +292,7 @@ dir = 1 }, /obj/structure/table, -/obj/machinery/recharger, +/obj/machinery/recharger/upgraded, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/shuttle/administration) "eP" = ( @@ -334,8 +334,8 @@ dir = 1 }, /obj/structure/table, -/obj/machinery/cell_charger, /obj/item/weed_extract, +/obj/machinery/cell_charger/upgraded, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/shuttle/administration) "sd" = ( @@ -345,13 +345,10 @@ /area/shuttle/administration) "tn" = ( /obj/docking_port/mobile/admin{ - dir = 2; dwidth = 9; height = 18; - id = "admin"; name = "skipjack"; roundstart_move = "cc_bay_1"; - timid = 1; width = 19 }, /obj/machinery/door/airlock/external{ @@ -533,8 +530,8 @@ /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/shuttle/administration) "Vl" = ( -/obj/machinery/bodyscanner, /obj/machinery/light, +/obj/machinery/bodyscanner/upgraded, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/shuttle/administration) "XB" = ( diff --git a/_maps/map_files/shuttles/gamma_armory/gamma_armory_base.dmm b/_maps/map_files/shuttles/gamma_armory/gamma_armory_base.dmm index cab85886d75..2355fb2437d 100644 --- a/_maps/map_files/shuttles/gamma_armory/gamma_armory_base.dmm +++ b/_maps/map_files/shuttles/gamma_armory/gamma_armory_base.dmm @@ -31,7 +31,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma) "i" = ( -/obj/machinery/autolathe/upgraded/gamma, +/obj/machinery/autolathe/loaded/upgraded/gamma, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/metal/fifty, diff --git a/_maps/map_files/shuttles/gamma_armory/gamma_armory_clown.dmm b/_maps/map_files/shuttles/gamma_armory/gamma_armory_clown.dmm index d0091d4d52d..661aecdef48 100644 --- a/_maps/map_files/shuttles/gamma_armory/gamma_armory_clown.dmm +++ b/_maps/map_files/shuttles/gamma_armory/gamma_armory_clown.dmm @@ -128,7 +128,7 @@ }, /area/shuttle/gamma) "K" = ( -/obj/machinery/autolathe/upgraded/gamma, +/obj/machinery/autolathe/loaded/upgraded/gamma, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/metal/fifty, diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 8c673728418..649298705bd 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -12678,7 +12678,7 @@ /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "aWj" = ( -/obj/machinery/biogenerator, +/obj/machinery/biogenerator/loaded, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/garden) "aWk" = ( @@ -13487,7 +13487,6 @@ /obj/item/hatchet, /obj/item/crowbar, /obj/item/plant_analyzer, -/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/garden) "aZk" = ( @@ -16948,8 +16947,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/chapel) "ble" = ( -/obj/machinery/biogenerator, -/obj/item/reagent_containers/glass/bucket, +/obj/machinery/biogenerator/loaded, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "blf" = ( @@ -23266,10 +23264,6 @@ /obj/machinery/computer/guestpass{ pixel_y = 30 }, -/obj/machinery/r_n_d/circuit_imprinter{ - pixel_x = 3; - pixel_y = 5 - }, /obj/machinery/button/windowtint{ id = "rnd"; pixel_x = -24; @@ -23279,6 +23273,7 @@ /obj/effect/turf_decal/tiles/department/science/side{ dir = 9 }, +/obj/machinery/r_n_d/circuit_imprinter/loaded, /turf/simulated/floor/plasteel, /area/station/science/rnd) "bJs" = ( @@ -24019,7 +24014,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/science/robotics/chargebay) "bNj" = ( -/obj/machinery/mecha_part_fabricator/station, +/obj/machinery/mecha_part_fabricator/loaded/station, /obj/effect/turf_decal/tiles/department/science/side{ dir = 1 }, @@ -24034,7 +24029,7 @@ dir = 5 }, /obj/item/stack/sheet/plasteel{ - amount = 10 + amount = 20 }, /obj/item/stack/cable_coil, /turf/simulated/floor/plasteel/dark, @@ -24085,10 +24080,10 @@ /turf/simulated/floor/plasteel/white, /area/station/science/hallway) "bNt" = ( -/obj/machinery/r_n_d/protolathe, /obj/effect/turf_decal/tiles/department/science/side{ dir = 10 }, +/obj/machinery/r_n_d/protolathe/loaded, /turf/simulated/floor/plasteel, /area/station/science/rnd) "bNu" = ( @@ -24648,11 +24643,10 @@ /turf/simulated/floor/plasteel/dark, /area/station/science/server) "bPy" = ( -/obj/machinery/mecha_part_fabricator/station, +/obj/machinery/mecha_part_fabricator/loaded/station, /turf/simulated/floor/plasteel/dark, /area/station/science/robotics) "bPz" = ( -/obj/machinery/r_n_d/circuit_imprinter, /obj/machinery/light_switch{ name = "north bump"; pixel_y = 24 @@ -24664,6 +24658,7 @@ /obj/effect/turf_decal/tiles/department/science/corner{ dir = 4 }, +/obj/machinery/r_n_d/circuit_imprinter/loaded, /turf/simulated/floor/plasteel, /area/station/science/robotics) "bPA" = ( @@ -25074,12 +25069,12 @@ /turf/simulated/floor/plating, /area/station/supply/storage) "bRM" = ( -/obj/machinery/autolathe, /obj/machinery/light_switch{ dir = 4; name = "west bump"; pixel_x = -24 }, +/obj/machinery/autolathe/loaded, /turf/simulated/floor/plasteel, /area/station/supply/office) "bRN" = ( @@ -25292,7 +25287,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/port) "bSB" = ( -/obj/machinery/atmospherics/unary/cryo_cell, +/obj/machinery/atmospherics/unary/cryo_cell/loaded, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -25554,14 +25549,6 @@ c_tag = "Cargo Office"; dir = 4 }, -/obj/item/stack/sheet/glass{ - amount = 50; - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/stack/sheet/metal{ - amount = 50 - }, /obj/item/multitool, /turf/simulated/floor/plasteel, /area/station/supply/office) @@ -26409,10 +26396,6 @@ pixel_x = -2; pixel_y = 10 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 1 - }, /obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -26428,7 +26411,7 @@ }, /area/station/medical/cloning) "bXM" = ( -/obj/machinery/atmospherics/unary/cryo_cell, +/obj/machinery/atmospherics/unary/cryo_cell/loaded, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -29076,18 +29059,11 @@ "ciE" = ( /obj/machinery/alarm/directional/south, /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -3; - pixel_y = 1 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 1 - }, /obj/machinery/camera{ c_tag = "Medbay Cryogenics"; dir = 1 }, +/obj/item/soap/nanotrasen, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -30625,7 +30601,6 @@ pixel_x = -2; pixel_y = 10 }, -/obj/item/soap/nanotrasen, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -36422,7 +36397,7 @@ /area/station/engineering/break_room) "cMX" = ( /obj/machinery/alarm/directional/east, -/obj/machinery/autolathe, +/obj/machinery/autolathe/loaded, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "cNb" = ( @@ -67412,18 +67387,6 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) "nLa" = ( -/obj/structure/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/stack/sheet/metal/fifty{ - pixel_x = -2; - pixel_y = -2 - }, /obj/machinery/ai_status_display{ pixel_y = 32 }, @@ -79080,7 +79043,6 @@ /area/station/science/hallway) "sSX" = ( /obj/structure/sink/kitchen/old/directional/west, -/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/grass, /area/station/security/permabrig) "sTc" = ( @@ -80148,18 +80110,6 @@ /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/glass{ - amount = 10; - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/stack/sheet/glass{ - amount = 10; - pixel_x = -3; - pixel_y = 6 - }, /obj/item/robotanalyzer, /obj/item/robotanalyzer, /turf/simulated/floor/plasteel/dark, @@ -89817,8 +89767,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft2) "xNV" = ( -/obj/machinery/biogenerator, /obj/machinery/light, +/obj/machinery/biogenerator/loaded, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "xOh" = ( diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index d208b9e3e26..5c1d779f0a2 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -6697,15 +6697,8 @@ /area/station/maintenance/storage) "beo" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 1 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -3; - pixel_y = 1 - }, /obj/machinery/alarm/directional/east, +/obj/item/wrench/medical, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -10959,8 +10952,8 @@ }, /area/station/maintenance/security/starboard) "bKq" = ( -/obj/machinery/r_n_d/protolathe, /obj/effect/turf_decal/stripes/line, +/obj/machinery/r_n_d/protolathe/loaded, /turf/simulated/floor/plasteel/dark, /area/station/science/rnd) "bKv" = ( @@ -23004,7 +22997,6 @@ /obj/effect/turf_decal/tiles/department/science/corner{ dir = 8 }, -/obj/item/storage/belt/utility, /turf/simulated/floor/plasteel/white, /area/station/science/rnd) "dHN" = ( @@ -34197,9 +34189,6 @@ /area/station/hallway/primary/aft/west) "giI" = ( /obj/structure/table, -/obj/item/clipboard{ - pixel_y = 4 - }, /obj/item/storage/belt/utility, /obj/effect/turf_decal/tiles/department/cargo/side{ dir = 1 @@ -34384,7 +34373,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/wrench/medical, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -40151,7 +40139,6 @@ /turf/simulated/floor/carpet, /area/station/service/bar) "hyB" = ( -/obj/machinery/autolathe, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-4" @@ -40159,6 +40146,7 @@ /obj/effect/turf_decal/tiles/department/engineering/side{ dir = 8 }, +/obj/machinery/autolathe/loaded, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "hyT" = ( @@ -44841,7 +44829,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/hallway/secondary/entry) "ixW" = ( -/obj/machinery/biogenerator, +/obj/machinery/biogenerator/loaded, /turf/simulated/floor/grass/jungle, /area/station/hallway/secondary/garden) "ixY" = ( @@ -49643,6 +49631,15 @@ }, /turf/simulated/floor/plasteel, /area/station/security/prison/cell_block/a) +"jvU" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tiles/department/science/side, +/obj/structure/table/reinforced, +/obj/item/storage/belt/utility, +/turf/simulated/floor/plasteel/white, +/area/station/science/rnd) "jvX" = ( /obj/structure/closet/crate/trashcart{ desc = "A heavy, metal laundrycart with wheels."; @@ -61348,7 +61345,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/mecha_part_fabricator/station, +/obj/machinery/mecha_part_fabricator/loaded/station, /turf/simulated/floor/plasteel/white, /area/station/science/robotics) "lRL" = ( @@ -65889,20 +65886,6 @@ }, /turf/simulated/floor/wood/nitrogen, /area/station/maintenance/abandonedbar) -"mUu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tiles/department/science/side, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/structure/table/reinforced, -/obj/item/storage/belt/utility, -/turf/simulated/floor/plasteel/white, -/area/station/science/rnd) "mUw" = ( /obj/effect/turf_decal/tiles/department/engineering/side{ dir = 8 @@ -66839,16 +66822,12 @@ /area/station/maintenance/starboard) "ngz" = ( /obj/structure/table, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -2; - pixel_y = 3 - }, -/obj/item/stack/sheet/metal/fifty{ - pixel_x = 4 - }, /obj/effect/turf_decal/tiles/department/cargo/side{ dir = 1 }, +/obj/item/clipboard{ + pixel_y = 4 + }, /turf/simulated/floor/plasteel/dark, /area/station/supply/office) "ngA" = ( @@ -68520,7 +68499,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/mecha_part_fabricator/station, +/obj/machinery/mecha_part_fabricator/loaded/station, /turf/simulated/floor/plasteel/white, /area/station/science/robotics) "nzX" = ( @@ -85345,11 +85324,10 @@ dir = 10; initialize_directions = 10 }, -/obj/machinery/biogenerator, -/obj/item/reagent_containers/glass/bucket, /obj/effect/turf_decal/tiles/department/virology/side{ dir = 1 }, +/obj/machinery/biogenerator/loaded, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "rjM" = ( @@ -85365,8 +85343,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) "rkb" = ( -/obj/machinery/biogenerator, /obj/effect/turf_decal/tiles/department/virology, +/obj/machinery/biogenerator/loaded, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "rkc" = ( @@ -95745,12 +95723,12 @@ /turf/simulated/floor/plating, /area/station/public/quantum/engineering) "tyF" = ( -/obj/machinery/r_n_d/circuit_imprinter, /obj/effect/turf_decal/stripes/line, /obj/machinery/requests_console/directional/west, /obj/effect/turf_decal/tiles/department/science/side{ dir = 8 }, +/obj/machinery/r_n_d/circuit_imprinter/loaded, /turf/simulated/floor/plasteel/dark, /area/station/science/rnd) "tyK" = ( @@ -97218,7 +97196,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) "tPB" = ( -/obj/machinery/atmospherics/unary/cryo_cell, +/obj/machinery/atmospherics/unary/cryo_cell/loaded, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -99983,10 +99961,12 @@ /area/station/supply/sorting) "utp" = ( /obj/structure/rack, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, /obj/effect/turf_decal/delivery/hollow, +/obj/machinery/alarm/directional/north, +/obj/effect/turf_decal/tiles/department/science/side{ + dir = 9 + }, +/obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/metal{ amount = 50 }, @@ -99997,14 +99977,9 @@ amount = 50 }, /obj/item/stack/sheet/plasteel{ - amount = 10 - }, -/obj/item/stack/sheet/glass{ - amount = 20 - }, -/obj/machinery/alarm/directional/north, -/obj/effect/turf_decal/tiles/department/science/side{ - dir = 9 + amount = 20; + pixel_x = 6; + pixel_y = 3 }, /turf/simulated/floor/plasteel/dark, /area/station/science/robotics) @@ -100749,10 +100724,10 @@ /turf/simulated/wall, /area/station/maintenance/electrical/fore_port) "uAb" = ( -/obj/machinery/atmospherics/unary/cryo_cell, /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/unary/cryo_cell/loaded, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -103565,11 +103540,11 @@ /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/service/aft_starboard) "vgs" = ( -/obj/machinery/autolathe, /obj/effect/turf_decal/tiles/department/cargo/side{ dir = 1 }, /obj/machinery/requests_console/directional/north, +/obj/machinery/autolathe/loaded, /turf/simulated/floor/plasteel/dark, /area/station/supply/office) "vgw" = ( @@ -103606,7 +103581,6 @@ /turf/simulated/floor/plasteel/dark, /area/station/medical/medbay2) "vgV" = ( -/obj/machinery/r_n_d/circuit_imprinter, /obj/structure/extinguisher_cabinet{ pixel_y = 28; name = "custom placement" @@ -103614,6 +103588,7 @@ /obj/effect/turf_decal/tiles/department/science/side{ dir = 1 }, +/obj/machinery/r_n_d/circuit_imprinter/loaded, /turf/simulated/floor/plasteel/dark, /area/station/science/robotics) "vhk" = ( @@ -108465,10 +108440,6 @@ pixel_y = 10 }, /obj/item/book/manual/medical_cloning, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 1 - }, /obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -115547,10 +115518,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/engine, /area/station/engineering/control) -"xIx" = ( -/obj/item/reagent_containers/glass/bucket/wooden, -/turf/simulated/floor/grass/jungle, -/area/station/hallway/secondary/garden) "xIz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -138299,7 +138266,7 @@ uMr sNo oYZ oYZ -mUu +jvU qHj tFm hKm @@ -150382,7 +150349,7 @@ aXO aXO aXO kZW -xIx +aXP bMG qQU lzH diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 583a0cad15b..91d5a9b4d66 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -11496,19 +11496,11 @@ /area/station/engineering/atmos) "aUN" = ( /obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/glass{ - amount = 50; - pixel_x = 3; - pixel_y = 3 - }, /obj/machinery/newscaster/directional/west, /obj/effect/turf_decal/tiles/department/cargo/side{ dir = 9 }, +/obj/item/screwdriver/cargo, /turf/simulated/floor/plasteel, /area/station/supply/office) "aUO" = ( @@ -11516,7 +11508,6 @@ /obj/item/folder/yellow, /obj/item/multitool, /obj/item/pen/red, -/obj/item/screwdriver/cargo, /obj/effect/turf_decal/tiles/department/cargo/side{ dir = 1 }, @@ -13031,7 +13022,6 @@ /area/station/service/bar) "baV" = ( /obj/machinery/alarm/directional/south, -/obj/machinery/autolathe, /obj/machinery/light_switch{ dir = 4; name = "west bump"; @@ -13040,6 +13030,7 @@ /obj/effect/turf_decal/tiles/department/cargo/side{ dir = 10 }, +/obj/machinery/autolathe/loaded, /turf/simulated/floor/plasteel, /area/station/supply/office) "baW" = ( @@ -39022,7 +39013,6 @@ /turf/simulated/floor/plasteel/dark, /area/station/science/rnd) "cWS" = ( -/obj/machinery/r_n_d/protolathe, /obj/item/radio/intercom{ name = "east bump"; pixel_x = 28 @@ -39030,6 +39020,7 @@ /obj/effect/turf_decal/tiles/department/science/side{ dir = 4 }, +/obj/machinery/r_n_d/protolathe/loaded, /turf/simulated/floor/plasteel/dark, /area/station/science/rnd) "cWT" = ( @@ -39307,11 +39298,11 @@ /turf/simulated/floor/plasteel/dark, /area/station/science/rnd) "cYr" = ( -/obj/machinery/r_n_d/circuit_imprinter, /obj/machinery/requests_console/directional/east, /obj/effect/turf_decal/tiles/department/science/side{ dir = 6 }, +/obj/machinery/r_n_d/circuit_imprinter/loaded, /turf/simulated/floor/plasteel/dark, /area/station/science/rnd) "cYw" = ( @@ -39849,11 +39840,6 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -5; - pixel_y = 5 - }, /turf/simulated/floor/plasteel/white, /area/station/science/rnd) "daM" = ( @@ -43450,46 +43436,24 @@ /area/station/command/office/rd) "dsJ" = ( /obj/structure/table/reinforced, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/metal{ - amount = 50 - }, /obj/machinery/light_switch{ dir = 4; name = "west bump"; pixel_x = -24 }, -/obj/item/stack/sheet/plasteel{ - amount = 10 - }, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/glass{ - amount = 20; - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/stack/sheet/plasteel{ - amount = 10; - pixel_x = 7; - pixel_y = 3 - }, -/obj/item/stack/cable_coil/random, /obj/effect/turf_decal/tiles/department/science/side{ dir = 9 }, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/plasteel{ + amount = 20; + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/stack/cable_coil/random, /turf/simulated/floor/plasteel/dark, /area/station/science/robotics) "dsK" = ( @@ -43510,7 +43474,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/science/robotics) "dsL" = ( -/obj/machinery/mecha_part_fabricator/station, +/obj/machinery/mecha_part_fabricator/loaded/station, /obj/effect/turf_decal/tiles/department/science/side{ dir = 1 }, @@ -48059,10 +48023,10 @@ /obj/structure/window/reinforced/polarized{ id = "RoboSurgery" }, -/obj/machinery/r_n_d/circuit_imprinter, /obj/effect/turf_decal/tiles/department/science/side{ dir = 6 }, +/obj/machinery/r_n_d/circuit_imprinter/loaded, /turf/simulated/floor/plasteel/dark, /area/station/science/robotics) "dXs" = ( @@ -52482,7 +52446,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "fAW" = ( -/obj/machinery/mecha_part_fabricator/station, +/obj/machinery/mecha_part_fabricator/loaded/station, /obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/tiles/department/science/side{ dir = 1 @@ -57766,8 +57730,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "hET" = ( -/obj/machinery/autolathe, /obj/effect/turf_decal/tiles/department/engineering/side, +/obj/machinery/autolathe/loaded, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "hFx" = ( @@ -58917,14 +58881,6 @@ /area/station/maintenance/fsmaint) "ieS" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 1 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -3; - pixel_y = 1 - }, /obj/machinery/light{ dir = 4 }, @@ -58939,6 +58895,7 @@ /obj/effect/turf_decal/tiles/department/medical/side{ dir = 4 }, +/obj/item/soap/nanotrasen, /turf/simulated/floor/plasteel/white, /area/station/medical/cryo) "ieW" = ( @@ -62997,7 +62954,7 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/surgery/primary) "jQv" = ( -/obj/machinery/atmospherics/unary/cryo_cell, +/obj/machinery/atmospherics/unary/cryo_cell/loaded, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -76434,7 +76391,6 @@ "pmO" = ( /obj/structure/table/glass, /obj/item/roller, -/obj/item/soap/nanotrasen, /obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tiles/department/medical/side{ dir = 4 @@ -79532,10 +79488,10 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) "qAe" = ( -/obj/machinery/atmospherics/unary/cryo_cell, /obj/effect/turf_decal/tiles/department/medical/side{ dir = 8 }, +/obj/machinery/atmospherics/unary/cryo_cell/loaded, /turf/simulated/floor/plasteel/white, /area/station/medical/cryo) "qAz" = ( @@ -88633,8 +88589,7 @@ pixel_x = -32 }, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/glass/bucket, -/obj/machinery/biogenerator, +/obj/machinery/biogenerator/loaded, /turf/simulated/floor/plasteel, /area/station/maintenance/abandoned_garden) "tUf" = ( @@ -89451,8 +89406,7 @@ /turf/simulated/wall, /area/station/security/checkpoint/secondary) "uhU" = ( -/obj/machinery/biogenerator, -/obj/item/reagent_containers/glass/bucket, +/obj/machinery/biogenerator/loaded, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "uic" = ( @@ -90620,10 +90574,6 @@ "uGj" = ( /obj/structure/table/glass, /obj/item/roller, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 9; - pixel_y = 3 - }, /obj/machinery/light_switch{ dir = 8; name = "east bump"; @@ -94180,10 +94130,10 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "wcu" = ( -/obj/machinery/atmospherics/unary/cryo_cell, /obj/effect/turf_decal/tiles/department/medical/side{ dir = 4 }, +/obj/machinery/atmospherics/unary/cryo_cell/loaded, /turf/simulated/floor/plasteel/white, /area/station/medical/cryo) "wcM" = ( @@ -97368,11 +97318,10 @@ /turf/simulated/floor/plating, /area/station/command/teleporter) "xmW" = ( -/obj/machinery/biogenerator, -/obj/item/reagent_containers/glass/bucket, /obj/effect/turf_decal/tiles/department/virology/side{ dir = 6 }, +/obj/machinery/biogenerator/loaded, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "xmZ" = ( diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index b6faa0c62dc..afe5ec2a400 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -12846,10 +12846,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "cBM" = ( -/obj/machinery/r_n_d/circuit_imprinter{ - pixel_x = 3; - pixel_y = 5 - }, /obj/machinery/door_control{ id = "rndlab2"; name = "Research and Development Lab Shutters Control"; @@ -12860,6 +12856,7 @@ /obj/effect/turf_decal/tiles/department/science/side{ dir = 5 }, +/obj/machinery/r_n_d/circuit_imprinter/loaded, /turf/simulated/floor/plasteel, /area/station/science/rnd) "cBP" = ( @@ -17096,10 +17093,6 @@ /area/station/maintenance/dorms/starboard) "dti" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 1 - }, /obj/item/reagent_containers/spray/cleaner{ pixel_x = -3 }, @@ -31810,8 +31803,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/turret_protected/ai_upload) "gnI" = ( -/obj/machinery/biogenerator, -/obj/item/reagent_containers/glass/bucket, +/obj/machinery/biogenerator/loaded, /turf/simulated/floor/grass, /area/station/hallway/secondary/garden) "gnJ" = ( @@ -34227,27 +34219,6 @@ /obj/machinery/recharger, /turf/simulated/floor/plasteel/dark, /area/station/security/lobby) -"gPU" = ( -/obj/structure/table, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/glass{ - amount = 50; - pixel_x = 3; - pixel_y = 3 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/station/supply/office) "gQc" = ( /obj/effect/decal/cleanable/generic, /obj/effect/spawner/random/oil/maybe, @@ -38797,10 +38768,10 @@ }, /area/station/science/robotics) "hHn" = ( -/obj/machinery/r_n_d/protolathe, /obj/effect/turf_decal/tiles/department/science/side{ dir = 9 }, +/obj/machinery/r_n_d/protolathe/loaded, /turf/simulated/floor/plasteel, /area/station/science/rnd) "hHu" = ( @@ -41677,28 +41648,19 @@ /turf/simulated/floor/carpet, /area/station/command/office/hop) "ioL" = ( -/obj/item/stack/sheet/glass{ - amount = 20; - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/stack/sheet/glass{ - amount = 20; - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/plasteel{ - amount = 10; - pixel_x = 4; - pixel_y = -4 - }, /obj/machinery/light{ dir = 4 }, /obj/structure/rack, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/plasteel{ + amount = 20; + pixel_x = 6; + pixel_y = 3 + }, /turf/simulated/floor/plasteel/dark, /area/station/science/robotics) "ioO" = ( @@ -48872,7 +48834,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/abandonedservers) "jKH" = ( -/obj/machinery/atmospherics/unary/cryo_cell, +/obj/machinery/atmospherics/unary/cryo_cell/loaded, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -55901,7 +55863,6 @@ "lhT" = ( /obj/structure/sink/directional/south, /obj/effect/turf_decal/delivery/blue/hollow, -/obj/item/reagent_containers/glass/bucket, /obj/item/radio/intercom{ name = "south bump"; pixel_y = -28 @@ -56528,10 +56489,10 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/fore) "loZ" = ( -/obj/machinery/biogenerator, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/biogenerator/loaded, /turf/simulated/floor/grass, /area/station/security/permabrig) "lph" = ( @@ -56931,10 +56892,6 @@ "lsM" = ( /obj/structure/table/glass, /obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -58844,10 +58801,10 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/evidence) "lNp" = ( -/obj/machinery/r_n_d/circuit_imprinter, /obj/effect/turf_decal/tiles/department/science/side{ dir = 1 }, +/obj/machinery/r_n_d/circuit_imprinter/loaded, /turf/simulated/floor/plasteel/white, /area/station/science/robotics) "lNy" = ( @@ -77720,13 +77677,13 @@ /turf/simulated/floor/plasteel, /area/station/command/vault) "puY" = ( -/obj/machinery/autolathe, /obj/effect/turf_decal/tiles/dark/corner{ dir = 1 }, /obj/effect/turf_decal/tiles/department/engineering/corner{ dir = 4 }, +/obj/machinery/autolathe/loaded, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "pvb" = ( @@ -79969,7 +79926,7 @@ /turf/simulated/floor/carpet/grimey, /area/station/service/chapel/office) "pTg" = ( -/obj/machinery/mecha_part_fabricator/station{ +/obj/machinery/mecha_part_fabricator/loaded/station{ dir = 8 }, /turf/simulated/floor/plasteel/dark, @@ -86231,7 +86188,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "rgI" = ( -/obj/machinery/atmospherics/unary/cryo_cell, +/obj/machinery/atmospherics/unary/cryo_cell/loaded, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -103069,18 +103026,6 @@ /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) "uww" = ( -/obj/structure/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/stack/sheet/metal/fifty{ - pixel_x = -2; - pixel_y = -2 - }, /obj/machinery/light, /obj/item/radio/intercom{ name = "south bump"; @@ -103949,9 +103894,9 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft2) "uFD" = ( -/obj/machinery/autolathe, /obj/machinery/requests_console/directional/south, /obj/effect/turf_decal/tiles/department/cargo/corner, +/obj/machinery/autolathe/loaded, /turf/simulated/floor/plasteel, /area/station/supply/office) "uFE" = ( @@ -105142,7 +105087,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/medical/morgue) "uRq" = ( -/obj/machinery/biogenerator, +/obj/machinery/biogenerator/loaded, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "uRw" = ( @@ -106542,10 +106487,6 @@ "vha" = ( /obj/structure/table/glass, /obj/item/crowbar, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 1 - }, /obj/item/reagent_containers/glass/bottle/epinephrine, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -143211,7 +143152,7 @@ rnh hxS rje hxS -gPU +xKW uFD hTl hTl diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index b2ef47ba840..7c288e9e229 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -9681,11 +9681,11 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) "bmJ" = ( -/obj/machinery/r_n_d/circuit_imprinter, /obj/effect/turf_decal/stripes/line, /obj/machinery/light{ dir = 8 }, +/obj/machinery/r_n_d/circuit_imprinter/loaded, /turf/simulated/floor/plasteel, /area/station/science/robotics) "bmK" = ( @@ -16265,7 +16265,7 @@ }, /area/station/service/kitchen/freezer) "bQV" = ( -/obj/machinery/atmospherics/unary/cryo_cell, +/obj/machinery/atmospherics/unary/cryo_cell/loaded, /turf/simulated/floor/plasteel/dark, /area/station/medical/cryo) "bQW" = ( @@ -20668,10 +20668,6 @@ /area/station/maintenance/apmaint) "cpF" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -4; - pixel_y = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -21377,13 +21373,6 @@ /obj/effect/turf_decal/tiles/department/science/side{ dir = 4 }, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -4; - pixel_y = 1 - }, -/obj/item/stack/sheet/metal/fifty{ - pixel_x = 3 - }, /obj/item/toy/figure/crew/scientist{ pixel_x = 9; pixel_y = 6 @@ -23186,10 +23175,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 6; - pixel_y = 2 - }, /obj/effect/turf_decal/siding{ dir = 8 }, @@ -29610,11 +29595,10 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/west) "dFO" = ( -/obj/machinery/biogenerator, -/obj/item/reagent_containers/glass/bucket, /obj/effect/turf_decal/tiles/department/virology/side{ dir = 1 }, +/obj/machinery/biogenerator/loaded, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "dGk" = ( @@ -43321,10 +43305,10 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/autolathe, /obj/effect/turf_decal/tiles/department/engineering/side{ dir = 9 }, +/obj/machinery/autolathe/loaded, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "ieC" = ( @@ -44510,7 +44494,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/mecha_part_fabricator/station{ +/obj/machinery/mecha_part_fabricator/loaded/station{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -48343,8 +48327,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal) "jJI" = ( -/obj/machinery/atmospherics/unary/cryo_cell, /obj/effect/turf_decal/tiles/department/medical, +/obj/machinery/atmospherics/unary/cryo_cell/loaded, /turf/simulated/floor/plasteel/white, /area/station/medical/cloning) "jJM" = ( @@ -53108,7 +53092,6 @@ /turf/simulated/floor/plasteel/white, /area/station/science/toxins/mixing) "leR" = ( -/obj/machinery/r_n_d/protolathe, /obj/machinery/computer/guestpass{ pixel_y = 30 }, @@ -53122,6 +53105,7 @@ /obj/effect/turf_decal/tiles/department/science/side{ dir = 9 }, +/obj/machinery/r_n_d/protolathe/loaded, /turf/simulated/floor/plasteel/white, /area/station/science/rnd) "leT" = ( @@ -53169,30 +53153,16 @@ /area/station/maintenance/fore2) "lfO" = ( /obj/structure/table/reinforced, -/obj/item/stack/sheet/plasteel{ - amount = 10 - }, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/glass{ - amount = 20; - pixel_x = -3; - pixel_y = 6 - }, /obj/machinery/newscaster/directional/north, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/plasteel{ + amount = 20; + pixel_x = 6; + pixel_y = 3 + }, /turf/simulated/floor/plasteel, /area/station/science/robotics) "lfV" = ( @@ -55564,10 +55534,10 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/prison) "lVF" = ( -/obj/machinery/r_n_d/circuit_imprinter, /obj/effect/turf_decal/tiles/department/science/side{ dir = 8 }, +/obj/machinery/r_n_d/circuit_imprinter/loaded, /turf/simulated/floor/plasteel/white, /area/station/science/rnd) "lVI" = ( @@ -58267,15 +58237,8 @@ pixel_y = -28 }, /obj/structure/table, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/glass{ - amount = 50; - pixel_x = 3; - pixel_y = 3 - }, /obj/effect/turf_decal/tiles/department/cargo/side, +/obj/item/screwdriver/cargo, /turf/simulated/floor/plasteel, /area/station/supply/office) "mVu" = ( @@ -58392,7 +58355,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/biogenerator, +/obj/machinery/biogenerator/loaded, /turf/simulated/floor/plating, /area/station/maintenance/abandoned_garden) "mXw" = ( @@ -61618,7 +61581,6 @@ "nZl" = ( /obj/structure/table, /obj/item/storage/belt/utility, -/obj/item/screwdriver/cargo, /obj/item/multitool, /obj/structure/cable{ icon_state = "1-2" @@ -63198,7 +63160,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/mecha_part_fabricator/station{ +/obj/machinery/mecha_part_fabricator/loaded/station{ dir = 4 }, /obj/machinery/requests_console/directional/west, @@ -67101,10 +67063,6 @@ pixel_x = -6; pixel_y = 7 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 9; - pixel_y = 3 - }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -72938,10 +72896,10 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/autolathe, /obj/effect/turf_decal/tiles/department/cargo/side{ dir = 1 }, +/obj/machinery/autolathe/loaded, /turf/simulated/floor/plasteel, /area/station/supply/office) "rNN" = ( @@ -84451,8 +84409,6 @@ /turf/simulated/floor/plasteel/white, /area/station/maintenance/asmaint) "vAb" = ( -/obj/machinery/biogenerator, -/obj/item/reagent_containers/glass/bucket, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -84461,6 +84417,7 @@ /obj/effect/turf_decal/tiles/department/virology/side{ dir = 8 }, +/obj/machinery/biogenerator/loaded, /turf/simulated/floor/plasteel, /area/station/service/hydroponics) "vAc" = ( diff --git a/_maps/map_files/test_tiny/test_tgui.dmm b/_maps/map_files/test_tiny/test_tgui.dmm index e45bb77f516..01fdc197690 100644 --- a/_maps/map_files/test_tiny/test_tgui.dmm +++ b/_maps/map_files/test_tiny/test_tgui.dmm @@ -17,7 +17,7 @@ /turf/simulated/floor/carpet, /area/shuttle/arrival/station) "br" = ( -/obj/machinery/r_n_d/circuit_imprinter/upgraded, +/obj/machinery/r_n_d/circuit_imprinter/loaded/upgraded, /turf/simulated/floor/carpet, /area/shuttle/arrival/station) "ch" = ( @@ -616,7 +616,7 @@ /obj/machinery/keycard_auth{ pixel_y = 28 }, -/obj/machinery/r_n_d/protolathe/upgraded, +/obj/machinery/r_n_d/protolathe/loaded/upgraded, /turf/simulated/floor/carpet, /area/shuttle/arrival/station) "Gv" = ( diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index a221a4c4937..371c58ec39a 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -88,9 +88,9 @@ . = ..() component_parts = list() component_parts += new /obj/item/circuitboard/dna_scanner(null) - component_parts += new /obj/item/stock_parts/scanning_module/phasic(null) - component_parts += new /obj/item/stock_parts/manipulator/pico(null) - component_parts += new /obj/item/stock_parts/micro_laser/ultra(null) + component_parts += new /obj/item/stock_parts/scanning_module/triphasic(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null) component_parts += new /obj/item/stack/sheet/glass(null) component_parts += new /obj/item/stack/cable_coil(null, 1) component_parts += new /obj/item/stack/cable_coil(null, 1) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index d27657c1110..2de381faa40 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -74,8 +74,8 @@ . = ..() component_parts = list() component_parts += new /obj/item/circuitboard/sleeper(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/manipulator/pico(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) component_parts += new /obj/item/stack/sheet/glass(null) component_parts += new /obj/item/stack/sheet/glass(null) component_parts += new /obj/item/stack/cable_coil(null, 1) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 362abfbee3b..e897dd5f550 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -48,13 +48,24 @@ /obj/machinery/bodyscanner/Initialize(mapload) . = ..() + initialize_parts() + RefreshParts() + +/obj/machinery/bodyscanner/proc/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/bodyscanner(null) component_parts += new /obj/item/stock_parts/scanning_module(null) component_parts += new /obj/item/stack/sheet/glass(null) component_parts += new /obj/item/stack/sheet/glass(null) component_parts += new /obj/item/stack/cable_coil(null, 2) - RefreshParts() + +/obj/machinery/bodyscanner/upgraded/initialize_parts() + component_parts = list() + component_parts += new /obj/item/circuitboard/bodyscanner(null) + component_parts += new /obj/item/stock_parts/scanning_module/triphasic(null) + component_parts += new /obj/item/stack/sheet/glass(null) + component_parts += new /obj/item/stack/sheet/glass(null) + component_parts += new /obj/item/stack/cable_coil(null, 2) /obj/machinery/bodyscanner/RefreshParts() for(var/obj/item/stock_parts/scanning_module/S in component_parts) diff --git a/code/game/machinery/ai_resource.dm b/code/game/machinery/ai_resource.dm index bdd74cc291f..89d2858b642 100644 --- a/code/game/machinery/ai_resource.dm +++ b/code/game/machinery/ai_resource.dm @@ -235,6 +235,18 @@ GLOBAL_LIST_EMPTY(ai_nodes) component_parts += new /obj/item/stack/sheet/mineral/diamond(null) RefreshParts() +/obj/machinery/ai_node/processing_node/upgraded/Initialize(mapload) + ..() + component_parts = list() + component_parts += new /obj/item/circuitboard/processing_node(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) + component_parts += new /obj/item/stack/sheet/mineral/gold(null) + component_parts += new /obj/item/stack/sheet/mineral/silver(null) + component_parts += new /obj/item/stack/cable_coil(null, 5) + component_parts += new /obj/item/stack/sheet/mineral/diamond(null) + RefreshParts() + /obj/machinery/ai_node/network_node name = "network node" desc = "A rack of servers with a manual on/off switch. While running, it grants an AI bandwidth." @@ -260,6 +272,17 @@ GLOBAL_LIST_EMPTY(ai_nodes) component_parts += new /obj/item/stack/cable_coil(null, 5) RefreshParts() +/obj/machinery/ai_node/network_node/upgraded/Initialize(mapload) + ..() + component_parts = list() + component_parts += new /obj/item/circuitboard/network_node(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) + component_parts += new /obj/item/stack/sheet/mineral/gold(null) + component_parts += new /obj/item/stack/sheet/mineral/silver(null) + component_parts += new /obj/item/stack/cable_coil(null, 5) + RefreshParts() + /obj/machinery/computer/ai_resource name = "AI Resource Control Console" desc = "Used to reassign memory and bandwidth between multiple AI units." diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 2e8853964b4..a819cf9a69a 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -41,7 +41,15 @@ /obj/machinery/autolathe/Initialize(mapload) . = ..() - AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS), _show_on_examine=TRUE, _after_insert=CALLBACK(src, PROC_REF(AfterMaterialInsert))) + AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS), _show_on_examine = TRUE, _after_insert = CALLBACK(src, PROC_REF(AfterMaterialInsert))) + initialize_parts() + RefreshParts() + RegisterSignal(src, COMSIG_TOOL_ATTACK, PROC_REF(on_tool_attack)) + wires = new(src) + files = new /datum/research/autolathe(src) + matching_designs = list() + +/obj/machinery/autolathe/proc/initialize_parts() component_parts = list() component_parts += new board_type(null) component_parts += new /obj/item/stock_parts/matter_bin(null) @@ -49,26 +57,23 @@ component_parts += new /obj/item/stock_parts/matter_bin(null) component_parts += new /obj/item/stock_parts/manipulator(null) component_parts += new /obj/item/stack/sheet/glass(null) - RefreshParts() - RegisterSignal(src, COMSIG_TOOL_ATTACK, PROC_REF(on_tool_attack)) - - wires = new(src) - files = new /datum/research/autolathe(src) - matching_designs = list() - -/obj/machinery/autolathe/upgraded/Initialize(mapload) +/obj/machinery/autolathe/loaded/Initialize(mapload) . = ..() + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) + materials.insert_amount(MINERAL_MATERIAL_AMOUNT * 50, MAT_METAL) + materials.insert_amount(MINERAL_MATERIAL_AMOUNT * 50, MAT_GLASS) + +/obj/machinery/autolathe/loaded/upgraded/initialize_parts() component_parts = list() component_parts += new board_type(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/manipulator/pico(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) component_parts += new /obj/item/stack/sheet/glass(null) - RefreshParts() -/obj/machinery/autolathe/upgraded/gamma/Initialize(mapload) +/obj/machinery/autolathe/loaded/upgraded/gamma/Initialize(mapload) . = ..() files = new /datum/research/autolathe/gamma(src) adjust_hacked(TRUE) diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 5ddaf9756ad..78285025e01 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -166,3 +166,10 @@ if(chargelevel != newlevel) chargelevel = newlevel return TRUE + +/obj/machinery/cell_charger/upgraded/Initialize(mapload) + . = ..() + component_parts = list() + component_parts += new /obj/item/circuitboard/cell_charger(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) + RefreshParts() diff --git a/code/game/machinery/clonescanner.dm b/code/game/machinery/clonescanner.dm index 0a7778e64ba..08b8d05b9a1 100644 --- a/code/game/machinery/clonescanner.dm +++ b/code/game/machinery/clonescanner.dm @@ -189,7 +189,6 @@ icon_state = "scanner_occupied" return - /obj/machinery/clonescanner/multitool_act(mob/user, obj/item/I) . = TRUE if(!I.use_tool(src, user, 0, volume = I.tool_volume)) @@ -216,3 +215,15 @@ return TRUE if(default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]", I)) return TRUE + +/obj/machinery/clonescanner/upgraded/Initialize(mapload) + . = ..() + component_parts = list() + component_parts += new /obj/item/circuitboard/clonescanner(null) + component_parts += new /obj/item/stock_parts/scanning_module/triphasic(null) + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null) + component_parts += new /obj/item/stack/sheet/glass(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) + component_parts += new /obj/item/stack/cable_coil(null, 1) + update_icon() + RefreshParts() diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 263a60b3789..04f8a8f79af 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -252,6 +252,13 @@ return TRUE +/obj/machinery/recharger/upgraded/Initialize(mapload) + . = ..() + component_parts = list() + component_parts += new /obj/item/circuitboard/recharger(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) + RefreshParts() + // Atlantis: No need for that copy-pasta code, just use var to store icon_states instead. /obj/machinery/recharger/wallcharger name = "wall recharger" @@ -263,5 +270,5 @@ . = ..() component_parts = list() component_parts += new /obj/item/circuitboard/recharger(null) - component_parts += new /obj/item/stock_parts/capacitor/super(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) RefreshParts() diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 5c02f5617e1..9e860dbb813 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -38,10 +38,10 @@ . = ..() component_parts = list() component_parts += new /obj/item/circuitboard/cyborgrecharger(null) - component_parts += new /obj/item/stock_parts/capacitor/super(null) - component_parts += new /obj/item/stock_parts/capacitor/super(null) - component_parts += new /obj/item/stock_parts/manipulator/pico(null) - component_parts += new /obj/item/stock_parts/cell/hyper(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) + component_parts += new /obj/item/stock_parts/cell/bluespace(null) RefreshParts() /obj/machinery/recharge_station/RefreshParts() diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index efb971e1ab1..b0eaf563b5c 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -26,12 +26,21 @@ /obj/machinery/recycler/Initialize(mapload) . = ..() AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_TITANIUM, MAT_URANIUM, MAT_DIAMOND, MAT_BLUESPACE, MAT_WOOD, MAT_PLASTIC, MAT_BANANIUM, MAT_TRANQUILLITE, MAT_CARDBOARD), 0, TRUE, null, null, null, TRUE) + initialize_parts() + RefreshParts() + update_icon(UPDATE_ICON_STATE) + +/obj/machinery/recycler/proc/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/recycler(null) component_parts += new /obj/item/stock_parts/matter_bin(null) component_parts += new /obj/item/stock_parts/manipulator(null) - RefreshParts() - update_icon(UPDATE_ICON_STATE) + +/obj/machinery/recycler/upgraded/initialize_parts() + component_parts = list() + component_parts += new /obj/item/circuitboard/recycler(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) /obj/machinery/recycler/RefreshParts() var/amt_made = 0 diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index d61e65b7f91..4d37f095deb 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -51,11 +51,11 @@ . = ..() component_parts = list() component_parts += new /obj/item/circuitboard/mech_recharger(null) - component_parts += new /obj/item/stock_parts/capacitor/super(null) - component_parts += new /obj/item/stock_parts/capacitor/super(null) - component_parts += new /obj/item/stock_parts/capacitor/super(null) - component_parts += new /obj/item/stock_parts/capacitor/super(null) - component_parts += new /obj/item/stock_parts/capacitor/super(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() update_recharge_turf() diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 6bdd0369a25..96a8812da46 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -53,15 +53,7 @@ // Set up some datums var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TRANQUILLITE, MAT_TITANIUM, MAT_BLUESPACE), 0, FALSE, /obj/item/stack, CALLBACK(src, PROC_REF(can_insert_materials)), CALLBACK(src, PROC_REF(on_material_insert))) materials.precise_insertion = TRUE - - // Components - component_parts = list() - component_parts += new /obj/item/circuitboard/mechfab(null) - component_parts += new /obj/item/stock_parts/matter_bin(null) - component_parts += new /obj/item/stock_parts/matter_bin(null) - component_parts += new /obj/item/stock_parts/manipulator(null) - component_parts += new /obj/item/stock_parts/micro_laser(null) - component_parts += new /obj/item/stack/sheet/glass(null) + initialize_parts() RefreshParts() categories = list( @@ -89,12 +81,27 @@ output_dir = dir return INITIALIZE_HINT_LATELOAD +/obj/machinery/mecha_part_fabricator/proc/initialize_parts() + component_parts = list() + component_parts += new /obj/item/circuitboard/mechfab(null) + component_parts += new /obj/item/stock_parts/matter_bin(null) + component_parts += new /obj/item/stock_parts/matter_bin(null) + component_parts += new /obj/item/stock_parts/manipulator(null) + component_parts += new /obj/item/stock_parts/micro_laser(null) + component_parts += new /obj/item/stack/sheet/glass(null) + /obj/machinery/mecha_part_fabricator/LateInitialize() for(var/obj/machinery/computer/rnd_network_controller/RNC as anything in GLOB.rnd_network_managers) if(RNC.network_name == autolink_id) network_manager_uid = RNC.UID() RNC.mechfabs += UID() +/obj/machinery/mecha_part_fabricator/loaded/Initialize(mapload) + . = ..() + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) + materials.insert_amount(MINERAL_MATERIAL_AMOUNT * 50, MAT_METAL) + materials.insert_amount(MINERAL_MATERIAL_AMOUNT * 25, MAT_GLASS) + /obj/machinery/mecha_part_fabricator/proc/get_files() if(!network_manager_uid) return null @@ -551,20 +558,16 @@ * * Upgraded variant of [/obj/machinery/mecha_part_fabricator]. */ -/obj/machinery/mecha_part_fabricator/upgraded/Initialize(mapload) - . = ..() - // Upgraded components - QDEL_LIST_CONTENTS(component_parts) +/obj/machinery/mecha_part_fabricator/loaded/upgraded/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/mechfab(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/manipulator/pico(null) - component_parts += new /obj/item/stock_parts/micro_laser/ultra(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null) component_parts += new /obj/item/stack/sheet/glass(null) - RefreshParts() -/obj/machinery/mecha_part_fabricator/station +/obj/machinery/mecha_part_fabricator/loaded/station autolink_id = "station_rnd" #undef EXOFAB_BASE_CAPACITY diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 7e9ec7a8310..bf0359f5790 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -54,6 +54,10 @@ /obj/machinery/atmospherics/unary/cryo_cell/Initialize(mapload) . = ..() initialize_directions = dir + initialize_parts() + RefreshParts() + +/obj/machinery/atmospherics/unary/cryo_cell/proc/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/cryo_tube(null) component_parts += new /obj/item/stock_parts/matter_bin(null) @@ -62,19 +66,20 @@ component_parts += new /obj/item/stack/sheet/glass(null) component_parts += new /obj/item/stack/sheet/glass(null) component_parts += new /obj/item/stack/cable_coil(null, 1) - RefreshParts() -/obj/machinery/atmospherics/unary/cryo_cell/upgraded/Initialize(mapload) +/obj/machinery/atmospherics/unary/cryo_cell/loaded/Initialize(mapload) . = ..() + beaker = new /obj/item/reagent_containers/glass/beaker/cryoxadone(null) + +/obj/machinery/atmospherics/unary/cryo_cell/loaded/upgraded/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/cryo_tube(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) component_parts += new /obj/item/stack/sheet/glass(null) component_parts += new /obj/item/stack/sheet/glass(null) component_parts += new /obj/item/stack/sheet/glass(null) component_parts += new /obj/item/stack/sheet/glass(null) component_parts += new /obj/item/stack/cable_coil(null, 1) - RefreshParts() /obj/machinery/atmospherics/unary/cryo_cell/on_construction() ..(dir,dir) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index 98f19b2184a..e9c020ba2b1 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -296,3 +296,16 @@ /obj/machinery/atmospherics/unary/thermomachine/heater/on on = TRUE icon_state = "heater_1" + +/obj/machinery/atmospherics/unary/thermomachine/upgraded/Initialize(mapload) + ..() + component_parts = list() + component_parts += new /obj/item/circuitboard/thermomachine(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(src) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(src) + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(src) + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(src) + component_parts += new /obj/item/stack/sheet/glass(src) + component_parts += new /obj/item/stack/cable_coil(src, 1) + RefreshParts() + update_icon() diff --git a/code/modules/cooking/machines/deep_fryer.dm b/code/modules/cooking/machines/deep_fryer.dm index 565c84fa151..c86150dea23 100644 --- a/code/modules/cooking/machines/deep_fryer.dm +++ b/code/modules/cooking/machines/deep_fryer.dm @@ -108,12 +108,12 @@ container.make_mini() vis_contents += container -/obj/machinery/cooking/deepfryer/upgraded/InitializeParts() +/obj/machinery/cooking/deepfryer/loaded/upgraded/InitializeParts() component_parts = list() component_parts += new /obj/item/circuitboard/cooking/deep_fryer(null) - component_parts += new /obj/item/stock_parts/micro_laser/ultra(null) - component_parts += new /obj/item/stock_parts/micro_laser/ultra(null) - component_parts += new /obj/item/stock_parts/capacitor/super(null) + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null) + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) component_parts += new /obj/item/stack/cable_coil(null, 5) RefreshParts() diff --git a/code/modules/cooking/machines/grill.dm b/code/modules/cooking/machines/grill.dm index 59fbd38597e..5a5acd9eff0 100644 --- a/code/modules/cooking/machines/grill.dm +++ b/code/modules/cooking/machines/grill.dm @@ -181,13 +181,13 @@ container.make_mini() -/obj/machinery/cooking/grill/upgraded/InitializeParts() +/obj/machinery/cooking/grill/loaded/upgraded/InitializeParts() component_parts = list() component_parts += new /obj/item/circuitboard/grill(null) - component_parts += new /obj/item/stock_parts/micro_laser/ultra(null) - component_parts += new /obj/item/stock_parts/micro_laser/ultra(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null) + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) RefreshParts() /obj/item/circuitboard/grill diff --git a/code/modules/cooking/machines/ice_cream_mixer.dm b/code/modules/cooking/machines/ice_cream_mixer.dm index 3a47861485c..9b80ca8180b 100644 --- a/code/modules/cooking/machines/ice_cream_mixer.dm +++ b/code/modules/cooking/machines/ice_cream_mixer.dm @@ -68,12 +68,12 @@ else . += image(icon = icon, icon_state = "ice_cream_mixer_door_open", layer = ABOVE_OBJ_LAYER) -/obj/machinery/cooking/ice_cream_mixer/upgraded/InitializeParts() +/obj/machinery/cooking/ice_cream_mixer/loaded/upgraded/InitializeParts() component_parts = list() component_parts += new /obj/item/circuitboard/cooking/ice_cream_mixer(null) - component_parts += new /obj/item/stock_parts/micro_laser/ultra(null) - component_parts += new /obj/item/stock_parts/micro_laser/ultra(null) - component_parts += new /obj/item/stock_parts/capacitor/super(null) + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null) + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) RefreshParts() /obj/machinery/cooking/ice_cream_mixer/loaded/Initialize(mapload) diff --git a/code/modules/cooking/machines/oven.dm b/code/modules/cooking/machines/oven.dm index 16d0671546c..be2b6655c15 100644 --- a/code/modules/cooking/machines/oven.dm +++ b/code/modules/cooking/machines/oven.dm @@ -86,17 +86,6 @@ container.make_mini() vis_contents += container -/obj/machinery/cooking/oven/upgraded/InitializeParts() - component_parts = list() - component_parts += new /obj/item/circuitboard/cooking/oven(null) - component_parts += new /obj/item/stack/cable_coil(null, 5) - component_parts += new /obj/item/stack/sheet/glass(null) - component_parts += new /obj/item/stock_parts/capacitor/super(null) - component_parts += new /obj/item/stock_parts/micro_laser/ultra(null) - component_parts += new /obj/item/stock_parts/micro_laser/ultra(null) - - RefreshParts() - /obj/item/circuitboard/cooking/oven board_name = "Convection Oven" build_path = /obj/machinery/cooking/oven @@ -116,3 +105,13 @@ var/datum/cooking_surface/surface = surfaces[i] surface.container = new /obj/item/reagent_containers/cooking/oven(src) update_appearance() + +/obj/machinery/cooking/oven/loaded/upgraded/InitializeParts() + component_parts = list() + component_parts += new /obj/item/circuitboard/cooking/oven(null) + component_parts += new /obj/item/stack/cable_coil(null, 5) + component_parts += new /obj/item/stack/sheet/glass(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null) + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null) + RefreshParts() diff --git a/code/modules/cooking/machines/stovetop.dm b/code/modules/cooking/machines/stovetop.dm index 51f0118de52..08c4c6ed13f 100644 --- a/code/modules/cooking/machines/stovetop.dm +++ b/code/modules/cooking/machines/stovetop.dm @@ -15,18 +15,18 @@ /obj/machinery/cooking/stovetop/Initialize(mapload) . = ..() + for(var/i in 1 to 4) + surfaces += new/datum/cooking_surface/stovetop_burner(src) + initialize_parts() + RefreshParts() +/obj/machinery/cooking/stovetop/proc/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/cooking/stove(null) component_parts += new /obj/item/stock_parts/micro_laser(null) component_parts += new /obj/item/stock_parts/micro_laser(null) component_parts += new /obj/item/stock_parts/capacitor(null) - for(var/i in 1 to 4) - surfaces += new/datum/cooking_surface/stovetop_burner(src) - - RefreshParts() - /obj/machinery/cooking/stovetop/examine(mob/user) . = ..() . += SPAN_NOTICE("Ctrl-Click on a burner to set its timer, temperature, and toggle it on or off.") @@ -139,3 +139,10 @@ else surface.container = new /obj/item/reagent_containers/cooking/pan(src) update_appearance() + +/obj/machinery/cooking/stovetop/loaded/upgraded/initialize_parts() + component_parts = list() + component_parts += new /obj/item/circuitboard/cooking/stove(null) + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null) + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index a36949ecbd6..9221b2eab65 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -32,7 +32,7 @@ . = ..() component_parts = list() component_parts += new /obj/item/circuitboard/microwave(null) - component_parts += new /obj/item/stock_parts/micro_laser/ultra(null) + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null) component_parts += new /obj/item/stack/sheet/glass(null) component_parts += new /obj/item/stack/cable_coil(null, 2) RefreshParts() diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index 9bda1301cec..1b9424ed9e3 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -20,6 +20,14 @@ component_parts += new /obj/item/stock_parts/manipulator(null) RefreshParts() +/obj/machinery/processor/upgraded/Initialize(mapload) + . = ..() + component_parts = list() + component_parts += new /obj/item/circuitboard/processor(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) + RefreshParts() + /obj/machinery/processor/update_icon_state() . = ..() if(processing) diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 4c78c1effae..59aec4400ea 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -40,13 +40,29 @@ /obj/machinery/biogenerator/Initialize(mapload) . = ..() files = new(src) + initialize_parts() + RefreshParts() + +/obj/machinery/biogenerator/proc/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/biogenerator(null) component_parts += new /obj/item/stock_parts/matter_bin(null) component_parts += new /obj/item/stock_parts/manipulator(null) component_parts += new /obj/item/stack/sheet/glass(null) component_parts += new /obj/item/stack/cable_coil(null, 1) - RefreshParts() + +/obj/machinery/biogenerator/loaded/Initialize(mapload) + . = ..() + container = new /obj/item/reagent_containers/glass/bucket(null) + update_icon(UPDATE_ICON_STATE) + +/obj/machinery/biogenerator/loaded/upgraded/initialize_parts() + component_parts = list() + component_parts += new /obj/item/circuitboard/biogenerator(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) + component_parts += new /obj/item/stack/sheet/glass(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) /obj/machinery/biogenerator/Destroy() QDEL_NULL(container) diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm index 5849d1e657b..1b83c5dab4a 100644 --- a/code/modules/hydroponics/gene_modder.dm +++ b/code/modules/hydroponics/gene_modder.dm @@ -39,23 +39,32 @@ /obj/machinery/plantgenes/Initialize(mapload) . = ..() + initialize_parts() + RefreshParts() + +/obj/machinery/plantgenes/proc/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/plantgenes(null) component_parts += new /obj/item/stack/sheet/glass(null) component_parts += new /obj/item/stock_parts/scanning_module(null) component_parts += new /obj/item/stock_parts/micro_laser(null) component_parts += new /obj/item/stock_parts/manipulator(null) - RefreshParts() -/obj/machinery/plantgenes/seedvault/Initialize(mapload) - . = ..() +/obj/machinery/plantgenes/upgraded/initialize_parts() + component_parts = list() + component_parts += new /obj/item/circuitboard/plantgenes(null) + component_parts += new /obj/item/stack/sheet/glass(null) + component_parts += new /obj/item/stock_parts/scanning_module/triphasic(null) + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) + +/obj/machinery/plantgenes/seedvault/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/plantgenes/vault(null) component_parts += new /obj/item/stack/sheet/glass(null) component_parts += new /obj/item/stock_parts/scanning_module(null) component_parts += new /obj/item/stock_parts/micro_laser(null) component_parts += new /obj/item/stock_parts/manipulator(null) - RefreshParts() /obj/machinery/plantgenes/Destroy() for(var/atom/movable/A in contents) diff --git a/code/modules/hydroponics/hydroponics_tray.dm b/code/modules/hydroponics/hydroponics_tray.dm index 9b725e58583..42114ea96fc 100644 --- a/code/modules/hydroponics/hydroponics_tray.dm +++ b/code/modules/hydroponics/hydroponics_tray.dm @@ -105,6 +105,16 @@ component_parts += new /obj/item/stack/sheet/glass(null) RefreshParts() +/obj/machinery/hydroponics/constructable/upgraded/Initialize(mapload) + ..() + component_parts = list() + component_parts += new /obj/item/circuitboard/hydroponics(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) + component_parts += new /obj/item/stack/sheet/glass(null) + RefreshParts() + /obj/machinery/hydroponics/constructable/RefreshParts() var/tmp_capacity = 0 for(var/obj/item/stock_parts/matter_bin/M in component_parts) diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm index 82767363281..3a3bc624174 100644 --- a/code/modules/hydroponics/seed_extractor.dm +++ b/code/modules/hydroponics/seed_extractor.dm @@ -64,6 +64,14 @@ component_parts += new /obj/item/stock_parts/manipulator(null) RefreshParts() +/obj/machinery/seed_extractor/upgraded/Initialize(mapload) + ..() + component_parts = list() + component_parts += new /obj/item/circuitboard/seed_extractor(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) + RefreshParts() + /obj/machinery/seed_extractor/Destroy() QDEL_LIST_CONTENTS(piles) return ..() diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index 3ee03305a55..c2e66526341 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -53,7 +53,10 @@ mat_container = AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TRANQUILLITE, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLATINUM, MAT_IRIDIUM, MAT_PALLADIUM), INFINITY, FALSE, /obj/item/stack, null, CALLBACK(src, PROC_REF(on_material_insert))) ore_buffer = list() files = new /datum/research/smelter(src) - // Stock parts + initialize_parts() + RefreshParts() + +/obj/machinery/mineral/ore_redemption/proc/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/ore_redemption(null) component_parts += new /obj/item/stock_parts/matter_bin(null) @@ -61,18 +64,15 @@ component_parts += new /obj/item/stock_parts/micro_laser(null) component_parts += new /obj/item/assembly/igniter(null) component_parts += new /obj/item/stack/sheet/glass(null) - RefreshParts() -/obj/machinery/mineral/ore_redemption/upgraded/Initialize(mapload) - . = ..() +/obj/machinery/mineral/ore_redemption/upgraded/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/ore_redemption(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/manipulator/pico(null) - component_parts += new /obj/item/stock_parts/micro_laser/ultra(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null) component_parts += new /obj/item/assembly/igniter(null) component_parts += new /obj/item/stack/sheet/glass(null) - RefreshParts() /** * # Ore Redemption Machine (Labor Camp) @@ -84,8 +84,7 @@ req_access = list() anyone_claim = TRUE -/obj/machinery/mineral/ore_redemption/labor/Initialize(mapload) - . = ..() +/obj/machinery/mineral/ore_redemption/labor/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/ore_redemption/labor(null) component_parts += new /obj/item/stock_parts/matter_bin(null) @@ -93,7 +92,6 @@ component_parts += new /obj/item/stock_parts/micro_laser(null) component_parts += new /obj/item/assembly/igniter(null) component_parts += new /obj/item/stack/sheet/glass(null) - RefreshParts() /obj/machinery/mineral/ore_redemption/Destroy() // Move any stuff inside us out diff --git a/code/modules/power/engines/fission/reactor_machines.dm b/code/modules/power/engines/fission/reactor_machines.dm index cf6da111b2e..8c0cc2a342f 100644 --- a/code/modules/power/engines/fission/reactor_machines.dm +++ b/code/modules/power/engines/fission/reactor_machines.dm @@ -29,14 +29,25 @@ /obj/machinery/nuclear_centrifuge/Initialize(mapload) . = ..() soundloop = new(list(src), FALSE) + initialize_parts() + RefreshParts() + update_icon(UPDATE_OVERLAYS) + +/obj/machinery/nuclear_centrifuge/proc/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/nuclear_centrifuge(src) component_parts += new /obj/item/stock_parts/manipulator(src) component_parts += new /obj/item/stock_parts/manipulator(src) component_parts += new /obj/item/stock_parts/manipulator(src) component_parts += new /obj/item/stock_parts/manipulator(src) - RefreshParts() - update_icon(UPDATE_OVERLAYS) + +/obj/machinery/nuclear_centrifuge/upgraded/initialize_parts() + component_parts = list() + component_parts += new /obj/item/circuitboard/nuclear_centrifuge(src) + component_parts += new /obj/item/stock_parts/manipulator/femto(src) + component_parts += new /obj/item/stock_parts/manipulator/femto(src) + component_parts += new /obj/item/stock_parts/manipulator/femto(src) + component_parts += new /obj/item/stock_parts/manipulator/femto(src) /obj/machinery/nuclear_centrifuge/examine(mob/user) . = ..() @@ -173,13 +184,15 @@ COOLDOWN_DECLARE(fabrication_timer) -/obj/machinery/nuclear_rod_fabricator/upgraded - upgraded = TRUE - /obj/machinery/nuclear_rod_fabricator/Initialize(mapload) . = ..() materials = AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TRANQUILLITE, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC), 0, TRUE, /obj/item/stack, CALLBACK(src, PROC_REF(is_insertion_ready)), CALLBACK(src, PROC_REF(AfterMaterialInsert))) materials.precise_insertion = TRUE + initialize_parts() + RefreshParts() + create_designs() + +/obj/machinery/nuclear_rod_fabricator/proc/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/nuclear_rod_fabricator(src) component_parts += new /obj/item/stock_parts/matter_bin(src) @@ -187,8 +200,14 @@ component_parts += new /obj/item/stock_parts/manipulator(src) component_parts += new /obj/item/stock_parts/manipulator(src) - RefreshParts() - create_designs() +/obj/machinery/nuclear_rod_fabricator/upgraded/initialize_parts() + component_parts = list() + component_parts += new /obj/item/circuitboard/nuclear_rod_fabricator(src) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(src) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(src) + component_parts += new /obj/item/stock_parts/manipulator/femto(src) + component_parts += new /obj/item/stock_parts/manipulator/femto(src) + upgraded = TRUE /obj/machinery/nuclear_rod_fabricator/RefreshParts() var/temp_coeff = 12 diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index b5bcd32f525..fb94075785a 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -38,15 +38,7 @@ /obj/machinery/power/smes/Initialize(mapload) . = ..() - component_parts = list() - component_parts += new /obj/item/circuitboard/smes(null) - component_parts += new /obj/item/stock_parts/cell/high(null) - component_parts += new /obj/item/stock_parts/cell/high(null) - component_parts += new /obj/item/stock_parts/cell/high(null) - component_parts += new /obj/item/stock_parts/cell/high(null) - component_parts += new /obj/item/stock_parts/cell/high(null) - component_parts += new /obj/item/stock_parts/capacitor(null) - component_parts += new /obj/item/stack/cable_coil(null, 5) + initialize_parts() RefreshParts() // When (re)built, try to connect to the powernet under us. @@ -66,18 +58,27 @@ terminal.master = src update_icon() -/obj/machinery/power/smes/upgraded/Initialize(mapload) - . = ..() +/obj/machinery/power/smes/proc/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/smes(null) - component_parts += new /obj/item/stock_parts/cell/hyper(null) - component_parts += new /obj/item/stock_parts/cell/hyper(null) - component_parts += new /obj/item/stock_parts/cell/hyper(null) - component_parts += new /obj/item/stock_parts/cell/hyper(null) - component_parts += new /obj/item/stock_parts/cell/hyper(null) - component_parts += new /obj/item/stock_parts/capacitor/super(null) + component_parts += new /obj/item/stock_parts/cell/high(null) + component_parts += new /obj/item/stock_parts/cell/high(null) + component_parts += new /obj/item/stock_parts/cell/high(null) + component_parts += new /obj/item/stock_parts/cell/high(null) + component_parts += new /obj/item/stock_parts/cell/high(null) + component_parts += new /obj/item/stock_parts/capacitor(null) + component_parts += new /obj/item/stack/cable_coil(null, 5) + +/obj/machinery/power/smes/upgraded/initialize_parts() + component_parts = list() + component_parts += new /obj/item/circuitboard/smes(null) + component_parts += new /obj/item/stock_parts/cell/bluespace(null) + component_parts += new /obj/item/stock_parts/cell/bluespace(null) + component_parts += new /obj/item/stock_parts/cell/bluespace(null) + component_parts += new /obj/item/stock_parts/cell/bluespace(null) + component_parts += new /obj/item/stock_parts/cell/bluespace(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) component_parts += new /obj/item/stack/cable_coil(null, 5) - RefreshParts() /obj/machinery/power/smes/RefreshParts() var/IO = 0 diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 3bf4f86405a..5c987bc2d2d 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -8,7 +8,6 @@ idle_power_consumption = 40 resistance_flags = FIRE_PROOF | ACID_PROOF var/ui_title = "Chem Dispenser 5000" - var/cell_type = /obj/item/stock_parts/cell/high var/obj/item/stock_parts/cell/cell var/powerefficiency = 0.1 var/amount = 10 @@ -30,27 +29,29 @@ /obj/machinery/chem_dispenser/Initialize(mapload) . = ..() + initialize_parts() + RefreshParts() + dispensable_reagents = sortList(dispensable_reagents) + +/obj/machinery/chem_dispenser/proc/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/chem_dispenser(null) component_parts += new /obj/item/stock_parts/matter_bin(null) component_parts += new /obj/item/stock_parts/matter_bin(null) component_parts += new /obj/item/stock_parts/capacitor(null) component_parts += new /obj/item/stock_parts/manipulator(null) + component_parts += new /obj/item/stock_parts/cell/high(null) component_parts += new /obj/item/stack/sheet/glass(null) - component_parts += new cell_type(null) - RefreshParts() - dispensable_reagents = sortList(dispensable_reagents) -/obj/machinery/chem_dispenser/upgraded/Initialize(mapload) - . = ..() +/obj/machinery/chem_dispenser/upgraded/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/chem_dispenser(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/capacitor/super(null) - component_parts += new /obj/item/stock_parts/manipulator/pico(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) + component_parts += new /obj/item/stock_parts/cell/bluespace(null) component_parts += new /obj/item/stack/sheet/glass(null) - RefreshParts() /obj/machinery/chem_dispenser/mutagensaltpeter name = "botanical chemical dispenser" @@ -73,17 +74,15 @@ "diethylamine") upgrade_reagents = null -/obj/machinery/chem_dispenser/mutagensaltpeter/Initialize(mapload) - . = ..() +/obj/machinery/chem_dispenser/mutagensaltpeter/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/chem_dispenser(null) component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) component_parts += new /obj/item/stock_parts/manipulator/femto(null) + component_parts += new /obj/item/stock_parts/cell/bluespace(null) component_parts += new /obj/item/stack/sheet/glass(null) - component_parts += new /obj/item/stack/cable_coil(null) - RefreshParts() /obj/machinery/chem_dispenser/RefreshParts() recharge_amount = initial(recharge_amount) @@ -357,29 +356,25 @@ unhack_message = "You change the mode from 'Pizza King' to 'McNano'." is_drink = TRUE -/obj/machinery/chem_dispenser/soda/Initialize(mapload) - . = ..() - QDEL_LIST_CONTENTS(component_parts) +/obj/machinery/chem_dispenser/soda/initialize_parts() + component_parts = list() component_parts += new /obj/item/circuitboard/chem_dispenser/soda(null) component_parts += new /obj/item/stock_parts/matter_bin(null) component_parts += new /obj/item/stock_parts/matter_bin(null) component_parts += new /obj/item/stock_parts/manipulator(null) component_parts += new /obj/item/stock_parts/capacitor(null) + component_parts += new /obj/item/stock_parts/cell/high(null) component_parts += new /obj/item/stack/sheet/glass(null) - component_parts += new cell_type(null) - RefreshParts() -/obj/machinery/chem_dispenser/soda/upgraded/Initialize(mapload) - . = ..() - QDEL_LIST_CONTENTS(component_parts) +/obj/machinery/chem_dispenser/soda/upgraded/initialize_parts() + component_parts = list() component_parts += new /obj/item/circuitboard/chem_dispenser/soda(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/manipulator/pico(null) - component_parts += new /obj/item/stock_parts/capacitor/super(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) + component_parts += new /obj/item/stock_parts/cell/bluespace(null) component_parts += new /obj/item/stack/sheet/glass(null) - component_parts += new cell_type(null) - RefreshParts() /obj/machinery/chem_dispenser/beer icon_state = "booze_dispenser" @@ -393,29 +388,25 @@ unhack_message = "You re-enable the 'nanotrasen-are-cheap-bastards' lock, disabling hidden and very expensive boozes." is_drink = TRUE -/obj/machinery/chem_dispenser/beer/Initialize(mapload) - . = ..() - QDEL_LIST_CONTENTS(component_parts) +/obj/machinery/chem_dispenser/beer/initialize_parts() + component_parts = list() component_parts += new /obj/item/circuitboard/chem_dispenser/beer(null) component_parts += new /obj/item/stock_parts/matter_bin(null) component_parts += new /obj/item/stock_parts/matter_bin(null) component_parts += new /obj/item/stock_parts/capacitor(null) component_parts += new /obj/item/stock_parts/manipulator(null) + component_parts += new /obj/item/stock_parts/cell/high(null) component_parts += new /obj/item/stack/sheet/glass(null) - component_parts += new cell_type(null) - RefreshParts() -/obj/machinery/chem_dispenser/beer/upgraded/Initialize(mapload) - . = ..() - QDEL_LIST_CONTENTS(component_parts) +/obj/machinery/chem_dispenser/beer/upgraded/initialize_parts() + component_parts = list() component_parts += new /obj/item/circuitboard/chem_dispenser/beer(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/capacitor/super(null) - component_parts += new /obj/item/stock_parts/manipulator/pico(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/capacitor/quadratic(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) + component_parts += new /obj/item/stock_parts/cell/bluespace(null) component_parts += new /obj/item/stack/sheet/glass(null) - component_parts += new cell_type(null) - RefreshParts() // Handheld chem dispenser /obj/item/handheld_chem_dispenser diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm index 55ad074a8a6..2890ba5904f 100644 --- a/code/modules/reagents/chemistry/machinery/pandemic.dm +++ b/code/modules/reagents/chemistry/machinery/pandemic.dm @@ -61,11 +61,7 @@ GLOBAL_LIST_EMPTY(detected_advanced_diseases) /obj/machinery/pandemic/Initialize(mapload) . = ..() - component_parts = list() - component_parts += new /obj/item/circuitboard/pandemic(null) - component_parts += new /obj/item/stock_parts/manipulator(null) - component_parts += new /obj/item/stock_parts/micro_laser(null) - RefreshParts() + initialize_parts() GLOB.pandemics |= src var/datum/symptom/S @@ -80,6 +76,20 @@ GLOBAL_LIST_EMPTY(detected_advanced_diseases) GLOB.known_advanced_diseases += list("[z]" = list("4:origin", "24:origin")) update_icon() +/obj/machinery/pandemic/proc/initialize_parts() + component_parts = list() + component_parts += new /obj/item/circuitboard/pandemic(null) + component_parts += new /obj/item/stock_parts/manipulator(null) + component_parts += new /obj/item/stock_parts/micro_laser(null) + RefreshParts() + +/obj/machinery/pandemic/upgraded/initialize_parts() + component_parts = list() + component_parts += new /obj/item/circuitboard/pandemic(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null) + RefreshParts() + /obj/machinery/pandemic/RefreshParts() var/manip_rating = 0 var/laser_rating = 0 diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index fcd275e1965..916bf83988e 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -100,12 +100,22 @@ /obj/machinery/reagentgrinder/Initialize(mapload) . = ..() + initialize_parts() + RefreshParts() + +/obj/machinery/reagentgrinder/proc/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/reagentgrinder(null) component_parts += new /obj/item/stock_parts/manipulator(null) component_parts += new /obj/item/stock_parts/manipulator(null) component_parts += new /obj/item/stock_parts/matter_bin(null) - RefreshParts() + +/obj/machinery/reagentgrinder/upgraded/initialize_parts() + component_parts = list() + component_parts += new /obj/item/circuitboard/reagentgrinder(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) /obj/machinery/reagentgrinder/RefreshParts() var/H diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 431d675c16d..c848367bf68 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -25,24 +25,30 @@ sometimes a secondary material (often gold or diamond). /obj/machinery/r_n_d/circuit_imprinter/Initialize(mapload) . = ..() + initialize_parts() + create_reagents() + RefreshParts() + +/obj/machinery/r_n_d/circuit_imprinter/proc/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/circuit_imprinter(null) component_parts += new /obj/item/stock_parts/matter_bin(null) component_parts += new /obj/item/stock_parts/manipulator(null) component_parts += new /obj/item/reagent_containers/glass/beaker(null) component_parts += new /obj/item/reagent_containers/glass/beaker(null) - create_reagents() - RefreshParts() -/obj/machinery/r_n_d/circuit_imprinter/upgraded/Initialize(mapload) +/obj/machinery/r_n_d/circuit_imprinter/loaded/Initialize(mapload) . = ..() + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) + materials.insert_amount(MINERAL_MATERIAL_AMOUNT * 25, MAT_GLASS) + +/obj/machinery/r_n_d/circuit_imprinter/loaded/upgraded/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/circuit_imprinter(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/manipulator/pico(null) - component_parts += new /obj/item/reagent_containers/glass/beaker/large(null) - component_parts += new /obj/item/reagent_containers/glass/beaker/large(null) - RefreshParts() + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) + component_parts += new /obj/item/reagent_containers/glass/beaker/bluespace(null) + component_parts += new /obj/item/reagent_containers/glass/beaker/bluespace(null) /obj/machinery/r_n_d/circuit_imprinter/Destroy() if(linked_console) diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index cbf0f5b5354..c4cb32645ca 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -27,28 +27,35 @@ Note: Must be placed west/left of and R&D console to function. /obj/machinery/r_n_d/protolathe/Initialize(mapload) . = ..() - component_parts = list() - component_parts += new /obj/item/circuitboard/protolathe(null) - component_parts += new /obj/item/stock_parts/matter_bin(null) - component_parts += new /obj/item/stock_parts/matter_bin(null) - component_parts += new /obj/item/stock_parts/manipulator(null) - component_parts += new /obj/item/stock_parts/manipulator(null) - component_parts += new /obj/item/reagent_containers/glass/beaker/large(null) - component_parts += new /obj/item/reagent_containers/glass/beaker/large(null) + initialize_parts() create_reagents() RefreshParts() -/obj/machinery/r_n_d/protolathe/upgraded/Initialize(mapload) - . = ..() +/obj/machinery/r_n_d/protolathe/proc/initialize_parts() component_parts = list() component_parts += new /obj/item/circuitboard/protolathe(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/manipulator/pico(null) - component_parts += new /obj/item/stock_parts/manipulator/pico(null) + component_parts += new /obj/item/stock_parts/matter_bin(null) + component_parts += new /obj/item/stock_parts/matter_bin(null) + component_parts += new /obj/item/stock_parts/manipulator(null) + component_parts += new /obj/item/stock_parts/manipulator(null) component_parts += new /obj/item/reagent_containers/glass/beaker/large(null) component_parts += new /obj/item/reagent_containers/glass/beaker/large(null) - RefreshParts() + +/obj/machinery/r_n_d/protolathe/loaded/Initialize(mapload) + . = ..() + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) + materials.insert_amount(MINERAL_MATERIAL_AMOUNT * 50, MAT_METAL) + materials.insert_amount(MINERAL_MATERIAL_AMOUNT * 20, MAT_GLASS) + +/obj/machinery/r_n_d/protolathe/loaded/upgraded/initialize_parts() + component_parts = list() + component_parts += new /obj/item/circuitboard/protolathe(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) + component_parts += new /obj/item/reagent_containers/glass/beaker/bluespace(null) + component_parts += new /obj/item/reagent_containers/glass/beaker/bluespace(null) /obj/machinery/r_n_d/protolathe/Destroy() if(linked_console) diff --git a/code/modules/research/scientific_analyzer.dm b/code/modules/research/scientific_analyzer.dm index 0450015c827..60f4ef45145 100644 --- a/code/modules/research/scientific_analyzer.dm +++ b/code/modules/research/scientific_analyzer.dm @@ -24,9 +24,9 @@ Note: Must be placed within 3 tiles of the R&D Console . = ..() component_parts = list() component_parts += new /obj/item/circuitboard/scientific_analyzer(null) - component_parts += new /obj/item/stock_parts/scanning_module/phasic(null) - component_parts += new /obj/item/stock_parts/manipulator/pico(null) - component_parts += new /obj/item/stock_parts/micro_laser/ultra(null) + component_parts += new /obj/item/stock_parts/scanning_module/triphasic(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null) RefreshParts() /obj/machinery/r_n_d/scientific_analyzer/Destroy()