From 2a4df099761f70debf2d46e486e046ac25084207 Mon Sep 17 00:00:00 2001 From: tmtmtl30 Date: Sat, 18 Nov 2023 17:09:36 -0800 Subject: [PATCH 1/6] expands unit tests; refuses to dock docked ships --- code/modules/overmap/_overmap_datum.dm | 2 +- code/modules/unit_tests/ship_outpost_placement.dm | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/code/modules/overmap/_overmap_datum.dm b/code/modules/overmap/_overmap_datum.dm index 076188f6ec58..5244f2850188 100644 --- a/code/modules/overmap/_overmap_datum.dm +++ b/code/modules/overmap/_overmap_datum.dm @@ -222,7 +222,7 @@ if(!istype(dock_target)) CRASH("Overmap datum [src] tried to dock to an invalid overmap datum.") if(docked_to) - CRASH("Overmap datum [src] tried to dock to [docked_to] when it is already docked to another overmap datum.") + CRASH("Overmap datum [src] tried to dock to [dock_target] when it is already docked to another overmap datum ([docked_to])!.") if(docking || current_docking_ticket) return "Already docking!" diff --git a/code/modules/unit_tests/ship_outpost_placement.dm b/code/modules/unit_tests/ship_outpost_placement.dm index e1e27097ee6f..73dc32a088fa 100644 --- a/code/modules/unit_tests/ship_outpost_placement.dm +++ b/code/modules/unit_tests/ship_outpost_placement.dm @@ -1,6 +1,8 @@ /datum/unit_test/ship_outpost_placement/Run() - for(var/mapname as anything in SSmapping.ship_purchase_list) - var/datum/map_template/shuttle/map = SSmapping.ship_purchase_list[mapname] + // checks all shuttle templates, including those + // disabled or intended as subshuttles + for(var/name as anything in SSmapping.shuttle_templates) + var/datum/map_template/shuttle/map = SSmapping.shuttle_templates[name] try // they'll spawn in empty space, and won't be docked new /datum/overmap/ship/controlled(list("x" = 1, "y" = 1), map) @@ -11,6 +13,11 @@ var/datum/overmap/outpost/test_outpost = new outpost_type() for(var/datum/overmap/ship/controlled/cur_ship as anything in SSovermap.controlled_ships) + // already-docked ships are ignored. + // this was added to stop runtimes when subshuttles, which were docked to their parent ship, attempted to dock to the outpost as part of this test. + // all ships which start undocked will end the loop undocked, so this shouldn't cause any ships to be wrongfully skipped. + if(cur_ship.docked_to) + continue cur_ship.Dock(test_outpost, TRUE) var/obj/docking_port/stationary/ship_dock = cur_ship.shuttle_port.docked From 269b1d7d606e0e60ec30cd31aefec893e829a105 Mon Sep 17 00:00:00 2001 From: tmtmtl30 Date: Sat, 18 Nov 2023 19:04:41 -0800 Subject: [PATCH 2/6] fixes jump_to_null_space() operator bullshit (not sure why there's a null turf in that list anyway) --- _maps/shuttles/independent/independent_pillbottle.dmm | 5 +---- code/modules/shuttle/shuttle.dm | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/_maps/shuttles/independent/independent_pillbottle.dmm b/_maps/shuttles/independent/independent_pillbottle.dmm index 7408067decf5..92529ea329c6 100644 --- a/_maps/shuttles/independent/independent_pillbottle.dmm +++ b/_maps/shuttles/independent/independent_pillbottle.dmm @@ -1721,9 +1721,6 @@ }, /turf/open/floor/plating, /area/ship/hallway/fore) -"CP" = ( -/turf/template_noop, -/area/space) "CQ" = ( /turf/closed/wall, /area/ship/bridge) @@ -3919,5 +3916,5 @@ hT hT WS tG -CP +Oz "} diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index f706bc87a491..8bfe1f7e9bd8 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -598,7 +598,7 @@ all_shuttle_areas += M.shuttle_areas for(var/turf/oldT as anything in old_turfs) - if(!(oldT?.loc in all_shuttle_areas)) + if(!oldT || !(oldT.loc in all_shuttle_areas)) continue var/area/old_area = oldT.loc for(var/obj/docking_port/mobile/bottom_shuttle in all_towed_shuttles) From aa8f67938ab1d85071c91d4bd28caec9ecc1968b Mon Sep 17 00:00:00 2001 From: tmtmtl30 Date: Sat, 25 Nov 2023 19:05:50 -0800 Subject: [PATCH 3/6] fixes the superpill --- .../subshuttles/Subshuttle Catalog.txt | 2 +- .../subshuttles/independent_superpill.dmm | 235 +++++++++--------- .../machinery/pipes/heat_exchange/junction.dm | 4 - .../machinery/pipes/heat_exchange/manifold.dm | 4 - .../pipes/heat_exchange/manifold4w.dm | 4 - .../machinery/pipes/heat_exchange/simple.dm | 4 - code/modules/power/singularity/emitter.dm | 34 +-- 7 files changed, 144 insertions(+), 143 deletions(-) diff --git a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt index 1d48dbc85f03..fb9dc1591234 100644 --- a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt +++ b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt @@ -29,7 +29,7 @@ Purpose = "Supposedly an manned torpedo. What is this. Subtest?" File Path = "_maps\shuttles\subshuttles\independant_pill.dmm" Name = "Superpill" -Size = "1x3" +Size = "3x4" Purpose = "A horrid merger of engineering platform and pill" File Path = "_maps\shuttles\subshuttles\independant_pill.dmm" diff --git a/_maps/shuttles/subshuttles/independent_superpill.dmm b/_maps/shuttles/subshuttles/independent_superpill.dmm index fc0dacddc501..de9046d091a4 100644 --- a/_maps/shuttles/subshuttles/independent_superpill.dmm +++ b/_maps/shuttles/subshuttles/independent_superpill.dmm @@ -1,208 +1,219 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer2, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible/layer4{ - dir = 5 +/obj/structure/catwalk, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 }, /obj/machinery/portable_atmospherics/canister/toxins, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer1{ - dir = 4 - }, -/obj/structure/catwalk, /turf/open/floor/plating/rust, /area/ship/storage) "b" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer2, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 +/obj/structure/catwalk, +/obj/machinery/conveyor_switch/oneway{ + id = "superpill_start"; + name = "jumpstart device"; + desc = "A conveyor control switch. It appears to only go in one direction; once you've pulled this, there's no going back." }, -/obj/machinery/atmospherics/components/binary/pump/on/layer1{ +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ dir = 4 }, -/obj/structure/catwalk, /turf/open/floor/plating/rust, /area/ship/storage) "f" = ( -/obj/machinery/power/emitter/welded{ - dir = 4 +/obj/structure/window/plasma/reinforced, +/obj/structure/window/plasma/reinforced/spawner/west, +/obj/structure/window/plasma/reinforced/spawner/north, +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "0-2" +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{ +/obj/machinery/conveyor{ dir = 4; - layer = 3 + id = "superpill_start" }, -/obj/machinery/atmospherics/pipe/simple/general/visible/layer1{ - dir = 10 +/obj/item/reagent_containers/pill/floorpill{ + pixel_y = -5; + pixel_x = -1 + }, +/obj/item/reagent_containers/pill/floorpill{ + pixel_x = 6 + }, +/obj/item/reagent_containers/pill/floorpill{ + pixel_x = 4; + pixel_y = 7 + }, +/turf/open/floor/plating{ + initial_gas_mix = "n2o=28, n2=72;TEMP=7" }, -/obj/structure/catwalk, -/turf/open/floor/plating/rust, /area/ship/storage) "h" = ( +/obj/structure/catwalk, /obj/machinery/power/shuttle/engine/electric{ dir = 4 }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2, -/obj/machinery/atmospherics/pipe/simple/general/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/structure/catwalk, /obj/docking_port/mobile{ can_move_docking_ports = 1; dir = 4; port_direction = 2; preferred_direction = 4 }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/layer_manifold/visible, /turf/open/floor/plating/rust, /area/ship/storage) "i" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer2, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - filter_types = list("co2","bz","o2","plasma","water_vapor","nob","no2","tritium","freon","pluox","stim") - }, +/obj/structure/window/plasma/reinforced/spawner/north, +/obj/structure/window/plasma/reinforced/spawner/east, +/obj/structure/window/plasma/reinforced, /obj/machinery/power/supermatter_crystal/shard, -/obj/structure/window/plasma/reinforced/spawner{ - pixel_y = -7 - }, -/obj/structure/window/plasma/reinforced/spawner/east{ - pixel_x = 7 +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ + dir = 10 }, -/obj/structure/window/plasma/reinforced/spawner/north{ - pixel_y = 7 +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 }, -/obj/structure/window/plasma/reinforced/spawner/west{ - pixel_x = -7 +/obj/effect/decal/remains/human{ + name = "environmental storytelling" }, -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer4, -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w{ - layer = 3 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + filter_types = list("co2","bz","o2","plasma","water_vapor","nob","no2","tritium","freon","pluox","stim") }, /turf/open/floor/plating{ initial_gas_mix = "n2o=28, n2=72;TEMP=7" }, /area/ship/storage) "l" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 6 - }, +/obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/general/visible/layer2{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/general/visible/layer4{ +/obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 6 }, -/obj/structure/catwalk, +/obj/structure/sign/warning/incident, /turf/open/floor/plating/rust, /area/ship/storage) "m" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w{ - layer = 3 - }, -/obj/machinery/atmospherics/components/unary/passive_vent/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer4, -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer2, -/obj/structure/catwalk, /obj/machinery/computer/helm/retro{ dir = 8 }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, /turf/open/floor/plating/rust, /area/ship/storage) "s" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer4, -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer2, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ - dir = 4; - layer = 3 +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/general/visible/layer1{ +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible/layer4{ dir = 9 }, -/obj/structure/catwalk, /turf/open/floor/plating/rust, /area/ship/storage) "x" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ - dir = 8 - }, /obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/emitter/welded/upgraded{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{ + dir = 4; + layer = 3 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 4; + layer = 3 + }, /turf/open/floor/plating/rust, /area/ship/storage) "C" = ( -/obj/structure/cable{ - icon_state = "0-8" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -25 }, -/obj/structure/window/reinforced/tinted, +/obj/item/tank/internals/plasma/full, +/obj/item/clothing/head/helmet/space/orange, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/pickaxe/improvised, +/obj/item/clothing/suit/space/orange, +/obj/item/storage/toolbox/mechanical/old, +/obj/item/clothing/mask/gas, +/obj/structure/bed, +/obj/machinery/light/floor, +/obj/machinery/holopad, +/obj/machinery/door/window, /obj/structure/window/reinforced/tinted{ dir = 8 }, /obj/structure/window/reinforced/tinted{ - dir = 1 + dir = 4 + }, +/obj/structure/fans/tiny, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" }, /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/door/window{ + dir = 1 + }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel/tech/grid, /area/ship/storage) "R" = ( -/obj/machinery/power/rad_collector/anchored, +/obj/structure/catwalk, /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/manifold/general/visible/layer4{ +/obj/machinery/power/rad_collector/anchored, +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer4, -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w, -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer2, +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible/layer4{ + dir = 9 + }, /turf/open/floor/plating/rust, /area/ship/storage) "W" = ( -/obj/item/clothing/mask/gas, -/obj/structure/bed, -/obj/machinery/light/floor, -/obj/structure/fans/tiny, -/obj/machinery/door/window{ - dir = 1 - }, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/obj/structure/cable, +/obj/structure/catwalk, /obj/structure/cable{ - icon_state = "0-4" + icon_state = "4-8" }, -/obj/machinery/airalarm/directional/west, -/obj/structure/cable{ - icon_state = "0-8" +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{ + dir = 8 }, -/obj/machinery/door/window, -/obj/machinery/atmospherics/pipe/simple/general/visible/layer1, -/obj/machinery/holopad, -/obj/item/storage/toolbox/mechanical/old, -/obj/item/clothing/suit/space/orange, -/obj/item/pickaxe/improvised, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/clothing/head/helmet/space/orange, -/obj/item/tank/internals/plasma/full, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ + dir = 8 }, -/turf/open/floor/plasteel/tech/grid, +/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/machinery/atmospherics/pipe/manifold/general/visible/layer4{ + dir = 1 + }, +/turf/open/floor/plating/rust, /area/ship/storage) (1,1,1) = {" diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm index b7fca049449c..ac7c85cb2fe8 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm @@ -34,10 +34,6 @@ icon_state = "pipe[nodes[1] ? "1" : "0"][nodes[2] ? "1" : "0"]-[piping_layer]" return ..() -/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer1 - piping_layer = 1 - icon_state = "pipe11-1" - /obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2 piping_layer = 2 icon_state = "pipe11-2" diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm index 61d909c7fc71..d452f11c11e7 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm @@ -37,10 +37,6 @@ if(nodes[i]) . += getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer1 - piping_layer = 1 - icon_state = "manifold-1" - /obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2 piping_layer = 2 icon_state = "manifold-2" diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold4w.dm index 57e9b6ea797b..40a049064148 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold4w.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold4w.dm @@ -35,10 +35,6 @@ if(nodes[i]) . += getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer1 - piping_layer = 1 - icon_state = "manifold4w-1" - /obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer2 piping_layer = 2 icon_state = "manifold4w-2" diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm index debbe9350c14..60379cb3a57e 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm @@ -28,10 +28,6 @@ icon_state = "pipe[nodes[1] ? "1" : "0"][nodes[2] ? "1" : "0"]-[piping_layer]" return ..() -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1 - piping_layer = 1 - icon_state = "pipe11-1" - /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2 piping_layer = 2 icon_state = "pipe11-2" diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 0a38f45c49ad..e3bc921019a2 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -41,20 +41,6 @@ var/last_projectile_params -/obj/machinery/power/emitter/welded/Initialize() - welded = TRUE - return ..() - -/obj/machinery/power/emitter/ctf - name = "Energy Cannon" - active = TRUE - active_power_usage = FALSE - idle_power_usage = FALSE - locked = TRUE - req_access_txt = "100" - welded = TRUE - use_power = FALSE - /obj/machinery/power/emitter/Initialize() . = ..() RefreshParts() @@ -371,6 +357,26 @@ if(user) user.visible_message("[user.name] emags [src].", "You short out the lock.") +/obj/machinery/power/emitter/ctf + name = "Energy Cannon" + active = TRUE + active_power_usage = FALSE + idle_power_usage = FALSE + locked = TRUE + req_access_txt = "100" + welded = TRUE + use_power = FALSE + +/obj/machinery/power/emitter/welded/Initialize() + welded = TRUE + return ..() + +/obj/machinery/power/emitter/welded/upgraded/Initialize() + . = ..() + component_parts = list() + component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null) + component_parts += new /obj/item/stock_parts/manipulator/femto(null) + RefreshParts() /obj/machinery/power/emitter/prototype name = "Prototype Emitter" From cbff4372a2536ed9e7574a55b2fc6dae4f0f5cf2 Mon Sep 17 00:00:00 2001 From: tmtmtl30 Date: Sat, 25 Nov 2023 19:24:15 -0800 Subject: [PATCH 4/6] fixes rube + twinkle --- .../independent/independent_rube_goldberg.dmm | 29 ++++++++++++++++--- .../syndicate/syndicate_twinkleshine.dmm | 3 -- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/_maps/shuttles/independent/independent_rube_goldberg.dmm b/_maps/shuttles/independent/independent_rube_goldberg.dmm index 50febf2f2550..b8960b78342d 100644 --- a/_maps/shuttles/independent/independent_rube_goldberg.dmm +++ b/_maps/shuttles/independent/independent_rube_goldberg.dmm @@ -83,6 +83,7 @@ "bb" = ( /obj/structure/cable/green, /obj/effect/turf_decal/industrial/radiation/full, +/obj/machinery/power/grounding_rod, /turf/open/floor/plating, /area/ship/storage) "be" = ( @@ -4162,6 +4163,19 @@ /obj/machinery/suit_storage_unit/atmos, /turf/open/floor/plating, /area/ship/engineering/atmospherics) +"Or" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/industrial/radiation{ + dir = 8 + }, +/obj/effect/turf_decal/industrial/radiation{ + dir = 4 + }, +/obj/machinery/power/grounding_rod, +/turf/open/floor/mineral/titanium, +/area/ship/storage) "Ot" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -4450,7 +4464,14 @@ /turf/open/floor/plating/airless, /area/ship/hallway) "Sw" = ( -/obj/machinery/atmospherics/components/unary/thermomachine, +/obj/structure/frame/machine, +/obj/item/circuitboard/machine/thermomachine/freezer, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stack/cable_coil/cut, +/obj/item/stack/sheet/glass, /turf/open/floor/plating, /area/ship/engineering/engine) "Sx" = ( @@ -7063,9 +7084,9 @@ Zy mV bB SY -SY -SY -SY +Or +Or +Or bb zy wg diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index 9200c091f618..b263f34b53ab 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -5843,9 +5843,6 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/door/airlock/hatch{ name = "Security" }, From 28f2bcef7fb19218640fadee2e6309bdd8e69927 Mon Sep 17 00:00:00 2001 From: tmtmtl30 Date: Sat, 25 Nov 2023 19:37:11 -0800 Subject: [PATCH 5/6] fixes heron, hellfactory --- _maps/RandomRuins/SpaceRuins/hellfactory.dmm | 22 +++++++++---------- _maps/configs/nanotrasen_heron.json | 2 +- .../nanotrasen_heron.dmm | 0 3 files changed, 12 insertions(+), 12 deletions(-) rename _maps/shuttles/{independent => nanotrasen}/nanotrasen_heron.dmm (100%) diff --git a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm index 0104b112aeda..f425c41bccf3 100644 --- a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm +++ b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm @@ -25,7 +25,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 4 }, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer1{ +/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer4{ @@ -37,7 +37,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ dir = 1 }, -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer1{ +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{ dir = 1 }, /obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer4{ @@ -52,7 +52,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 8 }, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer1{ +/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{ dir = 8 }, /obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer4{ @@ -119,7 +119,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1{ +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ dir = 6 }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{ @@ -131,7 +131,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1{ +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ dir = 4 }, /obj/structure/holobox, @@ -144,7 +144,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ dir = 4 }, -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer1{ +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer4{ @@ -165,7 +165,7 @@ /area/ruin/space/has_grav/hellfactory) "aC" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2, /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4, /turf/open/floor/plastic, /area/ruin/space/has_grav/hellfactory) @@ -203,7 +203,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 5 }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1{ +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ dir = 5 }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{ @@ -215,7 +215,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1{ +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{ @@ -227,7 +227,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1{ +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ dir = 9 }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{ @@ -1029,7 +1029,7 @@ /area/ruin/space/has_grav/hellfactory) "Nv" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2, /obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4, /turf/open/floor/plastic, diff --git a/_maps/configs/nanotrasen_heron.json b/_maps/configs/nanotrasen_heron.json index 3cdc9821a859..fbe11a792000 100644 --- a/_maps/configs/nanotrasen_heron.json +++ b/_maps/configs/nanotrasen_heron.json @@ -4,7 +4,7 @@ "namelists": ["WEAPONS"], "map_name": "Heron-Class Dreadnaught", "map_short_name": "Heron-class", - "map_path": "_maps/shuttles/shiptest/nanotrasen_heron.dmm", + "map_path": "_maps/shuttles/nanotrasen/nanotrasen_heron.dmm", "map_id": "nanotrasen_heron", "description": "The Heron-Class is the biggest ship available to NanoTrasen's frontier forces. These vessels served as the flagship of many fleets during the war, serving as a carrier for an operative team, or a command vessel for corporate units. Captains of this vessel were known to retrofit bluespace artillery onto the hangar, and directly fire it during combat. Since the end of the war, it has been repurposed for peacekeeping missions on backline sectors. Though the age of the design is starting to show, it stands as one of the remnants of NanoTrasen's once powerful hold over the cosmos.", "limit": 1, diff --git a/_maps/shuttles/independent/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm similarity index 100% rename from _maps/shuttles/independent/nanotrasen_heron.dmm rename to _maps/shuttles/nanotrasen/nanotrasen_heron.dmm From ac00c23e8154031175fdf8418555b68c43976508 Mon Sep 17 00:00:00 2001 From: tmtmtl30 Date: Sun, 26 Nov 2023 01:28:52 -0800 Subject: [PATCH 6/6] further heron fixes --- _maps/shuttles/nanotrasen/nanotrasen_heron.dmm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm index a7ccdec275fc..740397c662ad 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm @@ -773,7 +773,7 @@ dir = 5 }, /obj/machinery/computer/atmos_control/tank/air_tank{ - sensors = list("hairon"="Heron Air Mix Tank") + sensors = list("hairon"="Heron Air Mix Tank") }, /obj/machinery/light_switch{ pixel_y = 23 @@ -6003,6 +6003,9 @@ name = "Helm" }, /obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "vC" = ( @@ -9711,7 +9714,7 @@ dir = 9 }, /obj/machinery/computer/atmos_control/tank/toxin_tank{ - sensors = list("heron_plasm"="Heron Plasma Tank") + sensors = list("heron_plasm"="Heron Plasma Tank") }, /obj/structure/cable{ icon_state = "0-4" @@ -10759,6 +10762,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "NE" = ( @@ -13676,9 +13682,6 @@ /area/ship/science/robotics) "YP" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 },