diff --git a/_maps/RandomRuins/IceRuins/nova/icemoon_underground_interdyne_base1.dmm b/_maps/RandomRuins/IceRuins/nova/icemoon_underground_interdyne_base1.dmm index ab982cc45c2..b852ea59236 100644 --- a/_maps/RandomRuins/IceRuins/nova/icemoon_underground_interdyne_base1.dmm +++ b/_maps/RandomRuins/IceRuins/nova/icemoon_underground_interdyne_base1.dmm @@ -620,6 +620,21 @@ }, /obj/structure/rack, /obj/effect/turf_decal/box/white, +/obj/item/gps{ + gpstag = "INTRDYN0" + }, +/obj/item/gps{ + gpstag = "INTRDYN0" + }, +/obj/item/gps{ + gpstag = "INTRDYN0" + }, +/obj/item/gps{ + gpstag = "INTRDYN0" + }, +/obj/item/gps{ + gpstag = "INTRDYN0" + }, /turf/open/floor/iron/diagonal, /area/ruin/interdyne_planetary_base/cargo) "bR" = ( @@ -2070,6 +2085,7 @@ /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/white/textured_large, /area/ruin/interdyne_planetary_base/med) "fG" = ( @@ -2431,6 +2447,7 @@ }, /obj/effect/turf_decal/siding/dark/corner, /obj/effect/turf_decal/stripes/white/corner, +/obj/structure/cable, /turf/open/floor/iron/white/textured_large, /area/ruin/interdyne_planetary_base/med/pharm) "gz" = ( @@ -2628,6 +2645,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/white/textured_large, /area/ruin/interdyne_planetary_base/med/pharm) "gX" = ( @@ -2689,7 +2707,6 @@ control_area = "/area/ruin/interdyne_planetary_base"; ailock = 1 }, -/obj/item/folder/syndicate/red/secretformula, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main/vault) "hi" = ( @@ -2794,6 +2811,7 @@ "hw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron/white/textured_large, /area/ruin/interdyne_planetary_base/med/pharm) "hx" = ( @@ -2803,6 +2821,7 @@ /obj/machinery/light_switch/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron/white/textured_large, /area/ruin/interdyne_planetary_base/med/pharm) "hy" = ( @@ -2931,7 +2950,6 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 4 }, -/obj/item/reagent_containers/dropper, /turf/open/floor/iron/white/textured_large, /area/ruin/interdyne_planetary_base/med/pharm) "hR" = ( @@ -3115,8 +3133,9 @@ /obj/machinery/reagentgrinder{ pixel_x = 5 }, -/obj/item/storage/box/syndie_kit/sansufentanyl{ - pixel_x = -9 +/obj/item/storage/box/beakers/bluespace{ + pixel_x = -5; + pixel_y = 3 }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/med/pharm) @@ -3481,18 +3500,16 @@ /area/ruin/interdyne_planetary_base/med/morgue) "jj" = ( /obj/structure/table/glass, +/obj/item/clothing/glasses/science, /obj/machinery/firealarm/directional/west{ dir = 4 }, -/obj/item/storage/box/beakers/bluespace{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/clothing/glasses/science, -/obj/item/reagent_containers/dropper, /obj/item/stack/sheet/mineral/plasma{ amount = 15 }, +/obj/item/reagent_containers/dropper, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/white/textured_large, /area/ruin/interdyne_planetary_base/med/pharm) "jk" = ( @@ -4321,6 +4338,7 @@ "lg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/wood, /area/ruin/interdyne_planetary_base/main/dorms/lib) "lh" = ( @@ -4375,6 +4393,7 @@ name = "Library" }, /obj/machinery/door/firedoor, +/obj/structure/cable, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main/dorms) "lm" = ( @@ -4413,6 +4432,7 @@ /area/ruin/interdyne_planetary_base/serv/hydr) "lq" = ( /obj/machinery/light_switch/directional/west, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/eng) "lr" = ( @@ -4453,27 +4473,28 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/sign/poster/contraband/cybersun_six_hundred/directional/west, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/interdyne_planetary_base/main/dorms) "lz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/interdyne_planetary_base/main/dorms) "lA" = ( /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/eng) "lB" = ( -/obj/machinery/power/rtg/advanced, -/obj/structure/cable, /obj/effect/turf_decal/stripes/white/line{ dir = 8 }, -/obj/structure/railing{ - dir = 8 +/obj/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 4 }, -/obj/effect/turf_decal/bot/right, -/turf/open/floor/iron/dark/textured_large, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/turf/open/floor/iron/submarine_vents, /area/ruin/interdyne_planetary_base/eng) "lC" = ( /obj/effect/turf_decal/stripes/line{ @@ -4631,10 +4652,10 @@ }, /area/ruin/interdyne_planetary_base/main/dorms) "lT" = ( -/obj/machinery/power/rtg/advanced, -/obj/structure/cable, -/obj/effect/turf_decal/bot/left, -/turf/open/floor/iron/dark/textured_large, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/submarine_vents, /area/ruin/interdyne_planetary_base/eng) "lU" = ( /obj/structure/cable, @@ -4655,8 +4676,11 @@ /turf/open/floor/iron/white/textured_large, /area/ruin/interdyne_planetary_base/med) "lX" = ( -/obj/structure/cable, -/turf/open/floor/iron/dark/textured_large, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 1 + }, +/obj/machinery/door/window/survival_pod/left/directional/south, +/turf/open/floor/iron/submarine_vents, /area/ruin/interdyne_planetary_base/eng) "lY" = ( /obj/effect/decal/cleanable/glass/plastitanium, @@ -4780,6 +4804,7 @@ /obj/machinery/light/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/interdyne_planetary_base/main/dorms) "mk" = ( @@ -4872,6 +4897,7 @@ /obj/structure/disposalpipe/junction{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/interdyne_planetary_base/serv) "mu" = ( @@ -4885,6 +4911,7 @@ layer = 2.52 }, /obj/machinery/duct, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/interdyne_planetary_base/serv) "mv" = ( @@ -5028,16 +5055,19 @@ /turf/open/floor/plating/reinforced, /area/ruin/interdyne_planetary_base/serv/hydr) "mO" = ( -/obj/machinery/power/rtg/advanced, /obj/machinery/power/terminal, /obj/structure/cable, /obj/effect/turf_decal/stripes/white/line{ dir = 8 }, -/obj/structure/railing{ - dir = 8 +/obj/effect/turf_decal/trimline/dark_red/filled/corner{ + dir = 4 + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/structure/window/reinforced/survival_pod{ + dir = 10 }, -/obj/effect/turf_decal/bot/right, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/eng) "mP" = ( @@ -5051,10 +5081,15 @@ /turf/open/floor/plating/reinforced, /area/ruin/interdyne_planetary_base/main/dorms) "mR" = ( -/obj/machinery/power/rtg/advanced, -/obj/structure/cable, /obj/structure/sign/poster/contraband/syndiemoth/directional/east, -/obj/effect/turf_decal/bot/left, +/obj/effect/turf_decal/trimline/dark_red/filled/corner{ + dir = 1 + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/structure/marker_beacon/burgundy, +/obj/structure/window/reinforced/survival_pod{ + dir = 6 + }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/eng) "mS" = ( @@ -5173,12 +5208,9 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/eng) "nj" = ( -/obj/structure/cable, -/obj/machinery/power/rtg/advanced, /obj/effect/turf_decal/stripes/white/line, /obj/machinery/light/directional/east, /obj/structure/railing, -/obj/effect/turf_decal/bot/left, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/eng) "nk" = ( @@ -5210,6 +5242,7 @@ /obj/effect/turf_decal/siding/dark{ dir = 5 }, +/obj/structure/cable, /turf/open/floor/stone, /area/ruin/interdyne_planetary_base/serv/hydr) "nn" = ( @@ -5381,6 +5414,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/duct, /obj/machinery/door/firedoor, +/obj/structure/cable, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv/hydr) "nI" = ( @@ -5413,6 +5447,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Dormitories" }, +/obj/structure/cable, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main/dorms) "nM" = ( @@ -5426,6 +5461,7 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/stone, /area/ruin/interdyne_planetary_base/serv/hydr) "nN" = ( @@ -5692,6 +5728,7 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/stone, /area/ruin/interdyne_planetary_base/serv/hydr) "ow" = ( @@ -5777,6 +5814,7 @@ dir = 4 }, /obj/effect/turf_decal/siding/thinplating/dark, +/obj/structure/cable, /turf/open/floor/iron/white, /area/ruin/interdyne_planetary_base/serv/bar) "oE" = ( @@ -5787,6 +5825,7 @@ }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/siding/thinplating/dark, +/obj/structure/cable, /turf/open/floor/iron/white, /area/ruin/interdyne_planetary_base/serv/bar) "oF" = ( @@ -5813,6 +5852,7 @@ /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/freezer, /area/ruin/interdyne_planetary_base/serv/kitchen) "oH" = ( @@ -5832,6 +5872,7 @@ dir = 1 }, /obj/machinery/duct, +/obj/structure/cable, /turf/open/floor/iron/freezer, /area/ruin/interdyne_planetary_base/serv/kitchen) "oI" = ( @@ -5845,6 +5886,7 @@ dir = 1 }, /obj/machinery/duct, +/obj/structure/cable, /turf/open/floor/iron/freezer, /area/ruin/interdyne_planetary_base/serv/kitchen) "oJ" = ( @@ -5858,6 +5900,7 @@ dir = 1 }, /obj/machinery/duct, +/obj/structure/cable, /turf/open/floor/iron/freezer, /area/ruin/interdyne_planetary_base/serv/kitchen) "oK" = ( @@ -5871,6 +5914,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/freezer, /area/ruin/interdyne_planetary_base/serv/kitchen) "oL" = ( @@ -5887,6 +5931,7 @@ /obj/effect/turf_decal/siding/dark{ dir = 10 }, +/obj/structure/cable, /turf/open/floor/stone, /area/ruin/interdyne_planetary_base/serv/hydr) "oN" = ( @@ -5897,6 +5942,7 @@ }, /obj/machinery/duct, /obj/effect/turf_decal/siding/thinplating/dark, +/obj/structure/cable, /turf/open/floor/stone, /area/ruin/interdyne_planetary_base/serv/hydr) "oO" = ( @@ -5907,6 +5953,7 @@ }, /obj/machinery/duct, /obj/effect/turf_decal/siding/thinplating/dark, +/obj/structure/cable, /turf/open/floor/stone, /area/ruin/interdyne_planetary_base/serv/hydr) "oP" = ( @@ -5919,6 +5966,7 @@ /obj/structure/disposalpipe/junction/yjunction{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/stone, /area/ruin/interdyne_planetary_base/serv/hydr) "oQ" = ( @@ -6019,6 +6067,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/siding/thinplating/dark, /obj/machinery/door/firedoor, +/obj/structure/cable, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv/kitchen) "pe" = ( @@ -6034,6 +6083,7 @@ /obj/machinery/duct, /obj/effect/turf_decal/siding/thinplating/dark, /obj/machinery/door/firedoor, +/obj/structure/cable, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv/hydr) "pf" = ( @@ -6081,6 +6131,9 @@ /obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ dir = 1 }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/syndicate_access, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv/bar) "pl" = ( @@ -6088,6 +6141,9 @@ anchored = 1; req_access = list("syndicate") }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/syndicate_access, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv/kitchen) "pm" = ( @@ -6119,7 +6175,8 @@ /area/ruin/interdyne_planetary_base/eng) "pq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/closed/wall/r_wall/syndicate, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/turf/open/floor/plating/reinforced, /area/ruin/interdyne_planetary_base/eng) "pr" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/south, @@ -6866,6 +6923,8 @@ /area/icemoon/underground/explored) "rp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, /turf/open/floor/wood, /area/ruin/interdyne_planetary_base/main/dorms/lib) "rq" = ( @@ -6963,6 +7022,15 @@ initial_gas_mix = "ICEMOON_ATMOS" }, /area/icemoon/underground/explored) +"vU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/white/textured_large, +/area/ruin/interdyne_planetary_base/med) "xc" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/weather/snow{ @@ -7008,6 +7076,14 @@ initial_gas_mix = "ICEMOON_ATMOS" }, /area/icemoon/underground/explored) +"zv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/interdyne_planetary_base/main) "zy" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -7059,6 +7135,12 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main/dorms) +"AX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured_large, +/area/ruin/interdyne_planetary_base/main/dorms) "Br" = ( /obj/machinery/door/airlock/public/glass{ name = "Service Wing" @@ -7112,6 +7194,12 @@ initial_gas_mix = "ICEMOON_ATMOS" }, /area/icemoon/underground/explored) +"Dq" = ( +/obj/effect/turf_decal/trimline/dark_red/filled/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured_large, +/area/ruin/interdyne_planetary_base/eng) "DJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -7156,6 +7244,18 @@ initial_gas_mix = "ICEMOON_ATMOS" }, /area/icemoon/underground/explored) +"FH" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_red/filled/corner, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/structure/marker_beacon/burgundy, +/obj/structure/window/reinforced/survival_pod{ + dir = 9 + }, +/turf/open/floor/iron/dark/textured_large, +/area/ruin/interdyne_planetary_base/eng) "FU" = ( /obj/effect/turf_decal/siding/thinplating/dark, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -7172,6 +7272,18 @@ initial_gas_mix = "ICEMOON_ATMOS" }, /area/icemoon/underground/explored) +"Hm" = ( +/obj/machinery/hydroponics/constructable{ + dir = 8 + }, +/obj/machinery/door/window/survival_pod/left/directional/south{ + req_access = list("syndicate") + }, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/iron/dark/textured_large, +/area/ruin/interdyne_planetary_base/serv/hydr) "Ht" = ( /obj/machinery/door/airlock/grunge{ name = "Bar" @@ -7324,6 +7436,15 @@ /obj/effect/baseturf_helper/reinforced_plating, /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/interdyne_planetary_base/med/viro) +"No" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/floor{ + pixel_x = -16 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured_large, +/area/ruin/interdyne_planetary_base/main/dorms) "Np" = ( /obj/structure/railing{ dir = 8 @@ -7390,6 +7511,10 @@ initial_gas_mix = "ICEMOON_ATMOS" }, /area/icemoon/underground/explored) +"Pp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/interdyne_planetary_base/eng) "PD" = ( /obj/structure/railing, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7403,6 +7528,13 @@ initial_gas_mix = "ICEMOON_ATMOS" }, /area/icemoon/underground/explored) +"Qk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron/dark/textured_large, +/area/ruin/interdyne_planetary_base/main/dorms) "QK" = ( /obj/structure/railing{ dir = 10 @@ -7419,7 +7551,8 @@ /area/ruin/interdyne_planetary_base/main/dorms) "Rt" = ( /obj/structure/sign/warning/radiation/directional/north, -/turf/open/floor/iron/dark/textured_large, +/obj/effect/turf_decal/trimline/yellow/filled/warning, +/turf/open/floor/iron/submarine_vents, /area/ruin/interdyne_planetary_base/eng) "Sp" = ( /obj/structure/cable, @@ -7463,6 +7596,11 @@ /obj/item/radio/headset/interdyne/green, /turf/open/floor/iron/smooth_large, /area/ruin/interdyne_planetary_base/cargo) +"Te" = ( +/obj/machinery/duct, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured_large, +/area/ruin/interdyne_planetary_base/serv/hydr) "Ur" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -7478,6 +7616,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/sign/poster/contraband/interdyne_gene_clinics/directional/west, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/interdyne_planetary_base/main/dorms) "VH" = ( @@ -7513,6 +7652,11 @@ }, /turf/open/floor/iron/smooth_large, /area/ruin/interdyne_planetary_base/main/dorms) +"Wi" = ( +/obj/machinery/power/micro_reactor, +/obj/structure/cable, +/turf/open/floor/iron/submarine, +/area/ruin/interdyne_planetary_base/eng) "Wm" = ( /obj/machinery/porta_turret/syndicate{ dir = 9; @@ -8297,7 +8441,7 @@ lx lS Oy lv -nJ +AX lv mi lS @@ -8356,7 +8500,7 @@ lv lv lv lv -nJ +Qk lv lv lv @@ -8415,7 +8559,7 @@ Bx lR mh mx -nJ +AX nq mh og @@ -8474,7 +8618,7 @@ lx lS VH lv -nJ +AX lv WZ lS @@ -8533,7 +8677,7 @@ lv lv lv lv -nK +No lv lv lv @@ -8592,7 +8736,7 @@ Bx lR mh mC -nJ +AX nr mh og @@ -8651,7 +8795,7 @@ lx lS Oj lv -nJ +AX lv VY lS @@ -9230,7 +9374,7 @@ hb hb ft eQ -eY +zv qf jr jr @@ -9954,7 +10098,7 @@ nM nM ov oP -qA +Te qA qA qA @@ -10013,7 +10157,7 @@ oo oV pb pf -ui +Hm ui ui qC @@ -10170,7 +10314,7 @@ ea eB fh fF -gg +vU gy gW ix @@ -10239,7 +10383,7 @@ qN qT qT jY -lB +FH lB mO nh @@ -10299,11 +10443,11 @@ ra as jY Rt -lX +Wi lX ni my -nw +mZ pp pu py @@ -10357,12 +10501,12 @@ pJ ac ab jY -lT +Dq lT mR nj pU -jY +nw pq jY jY @@ -10422,8 +10566,8 @@ kk kk mA kk -me -qZ +Pp +jY as ab ab @@ -10481,7 +10625,8 @@ dZ mb mB kk -ac +me +qZ as ab ab @@ -10490,7 +10635,6 @@ ab ab ab ab -ab dW dW "} @@ -10540,8 +10684,8 @@ le mc mW kk -ab -ab +ac +as ab ab ab diff --git a/_maps/RandomRuins/SpaceRuins/nova/blackmarket.dmm b/_maps/RandomRuins/SpaceRuins/nova/blackmarket.dmm index 4d8cdabbade..4890bf350f7 100644 --- a/_maps/RandomRuins/SpaceRuins/nova/blackmarket.dmm +++ b/_maps/RandomRuins/SpaceRuins/nova/blackmarket.dmm @@ -41,6 +41,7 @@ /obj/structure/sign/warning/electric_shock/directional/west, /obj/item/mod/module/orebag, /obj/item/trench_tool, +/obj/item/t_scanner/adv_mining_scanner/lesser, /turf/open/floor/iron/dark/textured_large, /area/ruin/space/has_grav/powered/nova/blackmarket) "fB" = ( @@ -142,7 +143,6 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/space/has_grav/powered/nova/blackmarket) "mX" = ( -/obj/structure/deployable_barricade/guardrail, /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 6 }, @@ -195,9 +195,6 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/space/has_grav/powered/nova/blackmarket) "rs" = ( -/obj/structure/deployable_barricade/guardrail{ - dir = 1 - }, /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 5 }, @@ -376,9 +373,6 @@ /turf/open/misc/asteroid, /area/ruin/space/has_grav/powered/nova/blackmarket) "AX" = ( -/obj/structure/deployable_barricade/guardrail{ - dir = 4 - }, /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 4 }, @@ -563,14 +557,19 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/space/has_grav/powered/nova/blackmarket) "OR" = ( -/obj/effect/spawner/random/engineering/atmospherics_portable, /obj/effect/turf_decal/bot_white, /obj/machinery/light/red/dim/directional/west, +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/iron/dark/textured_large, /area/ruin/space/has_grav/powered/nova/blackmarket) +"Pb" = ( +/obj/effect/spawner/random/engineering/atmospherics_portable, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/powered/nova/blackmarket) "Pd" = ( /obj/effect/spawner/random/structure/closet_private, /obj/effect/turf_decal/bot_white, +/obj/item/gun/ballistic/automatic/pistol, /turf/open/floor/iron/dark/textured_large, /area/ruin/space/has_grav/powered/nova/blackmarket) "Py" = ( @@ -581,9 +580,9 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/space/has_grav/powered/nova/blackmarket) "Qm" = ( -/obj/effect/spawner/random/engineering/tank, /obj/effect/turf_decal/bot_white, /obj/structure/sign/warning/no_smoking/directional/south, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron/dark/textured_large, /area/ruin/space/has_grav/powered/nova/blackmarket) "QV" = ( @@ -908,7 +907,7 @@ hO hO Zh Zh -io +Pb Fa Zh Zh @@ -1216,7 +1215,7 @@ hO hO hO Fq -FJ +oV oV oV oV @@ -1308,7 +1307,7 @@ oV oV oV oV -oV +FJ de hO hO diff --git a/_maps/RandomRuins/SpaceRuins/nova/cargodiselost.dmm b/_maps/RandomRuins/SpaceRuins/nova/cargodiselost.dmm index cf34ff58b29..c4b77954bea 100644 --- a/_maps/RandomRuins/SpaceRuins/nova/cargodiselost.dmm +++ b/_maps/RandomRuins/SpaceRuins/nova/cargodiselost.dmm @@ -39,6 +39,10 @@ /obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/iron/white, /area/ruin/space/has_grav/cargodise_freighter/trauma) +"ax" = ( +/obj/machinery/light/floor, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) "aJ" = ( /obj/structure/table, /obj/machinery/chem_dispenser/drinks/beer{ @@ -147,6 +151,11 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"cq" = ( +/obj/machinery/power/micro_reactor, +/obj/structure/cable, +/turf/open/floor/iron/submarine, +/area/ruin/space/has_grav/cargodise_freighter/utility) "ct" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -419,11 +428,6 @@ /obj/machinery/recharger, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/cargodise_freighter/vault) -"fV" = ( -/obj/structure/cable, -/obj/machinery/power/port_gen/pacman/super, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) "fZ" = ( /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/cargodise_freighter/quarters) @@ -525,7 +529,7 @@ }, /area/ruin/space/has_grav/cargodise_freighter/bridge) "hM" = ( -/obj/structure/cable, +/obj/item/stack/cable_coil/cut, /turf/open/floor/plating, /area/ruin/space/has_grav/cargodise_freighter/utility) "hQ" = ( @@ -724,6 +728,20 @@ /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/kitchen) +"kT" = ( +/obj/machinery/power/shuttle_engine/heater{ + dir = 8 + }, +/obj/structure/window/reinforced/tinted/spawner/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"kW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/turf/open/floor/iron/submarine_vents, +/area/ruin/space/has_grav/cargodise_freighter/utility) "kX" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/cargodise_freighter/bridge) @@ -848,6 +866,10 @@ /obj/machinery/light/directional/east, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/cargodise_freighter/vault) +"mR" = ( +/obj/machinery/vending/tool, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) "mY" = ( /obj/structure/table/wood, /obj/effect/spawner/random/food_or_drink/booze, @@ -942,6 +964,10 @@ /obj/effect/spawner/random/entertainment/money_medium, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/bridge) +"oC" = ( +/obj/item/stack/cable_coil/cut, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/cargodise_freighter/utility) "oK" = ( /obj/machinery/door/airlock/glass{ name = "Crew Quarters" @@ -1025,6 +1051,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/open/floor/wood/tile, /area/ruin/space/has_grav/cargodise_freighter/hydroponics) +"qr" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) "qE" = ( /obj/machinery/door/airlock/maintenance/glass{ name = "Utilities Room" @@ -1229,6 +1260,16 @@ /obj/item/storage/box/nif_ghost_box/ghost_role, /turf/open/floor/carpet/orange, /area/ruin/space/has_grav/cargodise_freighter/bridge) +"tK" = ( +/obj/machinery/power/shuttle_engine/heater{ + dir = 8 + }, +/obj/structure/window/reinforced/tinted/spawner/directional/west, +/obj/structure/window/reinforced/tinted/spawner/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) "tL" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/structure/extinguisher_cabinet/directional/north, @@ -1278,10 +1319,6 @@ "uq" = ( /turf/closed/wall/r_wall/syndicate, /area/ruin/space/has_grav/cargodise_freighter/trauma) -"uu" = ( -/obj/machinery/portable_atmospherics/pump, -/turf/open/floor/iron/smooth, -/area/ruin/space/has_grav/cargodise_freighter/utility) "ux" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /turf/open/floor/plating, @@ -1340,6 +1377,15 @@ }, /turf/open/floor/iron/white, /area/ruin/space/has_grav/cargodise_freighter/trauma) +"vP" = ( +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"wa" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) "wd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1704,6 +1750,11 @@ /obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Bc" = ( +/obj/machinery/door/window/survival_pod/left/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/submarine_vents, +/area/ruin/space/has_grav/cargodise_freighter/utility) "Be" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, @@ -1713,6 +1764,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/obj/item/stack/cable_coil/cut, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/cargodise_freighter/utility) "Bs" = ( @@ -1733,6 +1785,11 @@ /obj/machinery/microwave, /turf/open/floor/iron/kitchen, /area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Bz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/turf/open/floor/iron/submarine_vents, +/area/ruin/space/has_grav/cargodise_freighter/utility) "BE" = ( /obj/machinery/power/terminal{ dir = 4 @@ -1896,7 +1953,8 @@ "Et" = ( /obj/structure/cable, /obj/machinery/light/cold/directional/south, -/obj/machinery/light_switch/directional/west, +/obj/machinery/power/port_gen/pacman/super, +/obj/machinery/light_switch/directional/south, /turf/open/floor/plating, /area/ruin/space/has_grav/cargodise_freighter/utility) "Ew" = ( @@ -1986,7 +2044,6 @@ }, /area/ruin/space/has_grav/cargodise_freighter/primaryhall) "Fy" = ( -/obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/cargodise_freighter/utility) "FP" = ( @@ -2409,6 +2466,7 @@ /area/ruin/space/has_grav/cargodise_freighter/primaryhall) "LF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/stack/cable_coil/cut, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/cargodise_freighter/utility) "LG" = ( @@ -3094,6 +3152,10 @@ dir = 1 }, /area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"WN" = ( +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) "WO" = ( /obj/effect/turf_decal/tile/yellow/half{ dir = 8 @@ -3196,6 +3258,24 @@ }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/cargo) +"Yf" = ( +/obj/machinery/power/shuttle_engine/heater{ + dir = 8 + }, +/obj/structure/window/reinforced/tinted/spawner/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"Yg" = ( +/obj/machinery/power/shuttle_engine/heater{ + dir = 8 + }, +/obj/structure/window/reinforced/tinted/spawner/directional/west, +/obj/structure/window/reinforced/tinted/spawner/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) "Yi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -3375,9 +3455,9 @@ Gh Gh Gh Gh -Gh -Gh -Gh +KS +KS +SF Gh Gh Gh @@ -3416,9 +3496,9 @@ Gh Gh Gh Gh -Gh -Gh -Gh +AN +AN +AN Gh Gh Gh @@ -3455,13 +3535,13 @@ Gh JQ Gh Gh -Gh -Gh KS +UH +AN +AN +AN KS -SF -Gh -Gh +UH Gh Gh JQ @@ -3495,15 +3575,15 @@ Gh Gh Ef Gh -Gh -KS -UH +Tg AN AN +tK +kT +Yg AN -KS -UH -Gh +AN +Tg Gh Ef Gh @@ -3536,15 +3616,15 @@ Gh Gh Ef Gh -Gh -AN -AN -AN -AN -AN -AN -AN -Gh +mb +Yf +Yf +Bz +cq +kW +Yf +Yf +Tg Gh Ef Gh @@ -3577,15 +3657,15 @@ OT Gh Ef Gh -Tg -mb -mb -mb -mb -mb mb +vP +ax +wa +Bc +qr +ax +yv mb -Tg Gh Ef Gh @@ -3619,13 +3699,13 @@ KY Sg Tg mb -mb +WN Fy -uu nL -yv -fV -mb +oC +is +is +mR NE uq Sg @@ -3664,7 +3744,7 @@ dJ oY aN zU -is +Ai hM Et NE @@ -3705,7 +3785,7 @@ pm dp SZ VL -Ai +is is Mu NE diff --git a/_maps/RandomRuins/SpaceRuins/nova/des_two.dmm b/_maps/RandomRuins/SpaceRuins/nova/des_two.dmm index 2f5b815f194..58d18571119 100644 --- a/_maps/RandomRuins/SpaceRuins/nova/des_two.dmm +++ b/_maps/RandomRuins/SpaceRuins/nova/des_two.dmm @@ -578,12 +578,6 @@ /obj/item/stack/sheet/mineral/uranium{ amount = 10 }, -/obj/item/stack/sheet/mineral/plasma{ - amount = 10 - }, -/obj/item/stack/sheet/mineral/titanium{ - amount = 10 - }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/nova/des_two/bridge/vault) "cC" = ( @@ -1460,8 +1454,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/power/rtg/advanced, -/turf/open/floor/plating, +/obj/effect/turf_decal/trimline/dark_red/filled/warning, +/turf/open/floor/iron/submarine_vents, /area/ruin/space/has_grav/nova/des_two/engineering) "gm" = ( /obj/structure/table/reinforced, @@ -2521,6 +2515,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/nova/des_two/engineering) "kz" = ( @@ -2807,6 +2802,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/nova/des_two/engineering) "lQ" = ( @@ -3372,11 +3368,6 @@ /obj/machinery/light/cold/directional/east, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/nova/des_two/halls) -"ox" = ( -/obj/machinery/hydroponics/constructable, -/obj/machinery/door/window/survival_pod/left/directional/north, -/turf/open/floor/iron/dark/small, -/area/ruin/space/has_grav/nova/des_two/service/hydroponics) "oA" = ( /obj/structure/cable, /obj/machinery/light/cold/directional/west, @@ -4441,6 +4432,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/nova/des_two/engineering) "tf" = ( @@ -6965,8 +6957,8 @@ /area/ruin/space/has_grav/nova/des_two/research) "FC" = ( /obj/structure/cable, -/obj/machinery/power/rtg/advanced, -/turf/open/floor/plating, +/obj/machinery/power/micro_reactor, +/turf/open/floor/iron/submarine, /area/ruin/space/has_grav/nova/des_two/engineering) "FD" = ( /obj/effect/turf_decal/siding/wood, @@ -7055,13 +7047,16 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, -/obj/item/storage/box/stockparts/deluxe{ - pixel_x = -4; - pixel_y = -2 +/obj/item/storage/box/stockparts/basic{ + pixel_y = 6 }, -/obj/item/storage/box/stockparts/deluxe{ +/obj/item/storage/box/stockparts/basic{ pixel_x = 8 }, +/obj/item/storage/box/beakers{ + pixel_x = -4; + pixel_y = -2 + }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/nova/des_two/research) "FX" = ( @@ -7118,7 +7113,6 @@ /obj/machinery/hydroponics/constructable, /obj/machinery/airalarm/directional/east, /obj/effect/mapping_helpers/airalarm/syndicate_access, -/obj/machinery/door/window/survival_pod/left/directional/north, /turf/open/floor/iron/dark/small, /area/ruin/space/has_grav/nova/des_two/service/hydroponics) "Gg" = ( @@ -7698,9 +7692,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/structure/cable, -/obj/machinery/power/rtg/advanced, -/turf/open/floor/plating, +/obj/structure/marker_beacon/burgundy, +/obj/effect/turf_decal/trimline/dark_red/filled/corner, +/turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/nova/des_two/engineering) "Ir" = ( /obj/effect/turf_decal/stripes/red/line{ @@ -8383,10 +8377,11 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/nova/des_two/halls) "LA" = ( -/obj/structure/cable, /obj/effect/turf_decal/stripes/line, -/obj/machinery/power/rtg/advanced, -/turf/open/floor/plating, +/obj/effect/turf_decal/trimline/dark_red/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/submarine_vents, /area/ruin/space/has_grav/nova/des_two/engineering) "LB" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -9023,12 +9018,14 @@ /turf/open/floor/iron/white/small, /area/ruin/space/has_grav/nova/des_two/security/prison) "OD" = ( -/obj/structure/cable, /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/power/rtg/advanced, -/turf/open/floor/plating, +/obj/structure/marker_beacon/burgundy, +/obj/effect/turf_decal/trimline/dark_red/filled/corner{ + dir = 4 + }, +/turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/nova/des_two/engineering) "OF" = ( /obj/effect/turf_decal/trimline/dark_green/warning{ @@ -9043,12 +9040,13 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/nova/des_two/halls) "OK" = ( -/obj/structure/cable, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/power/rtg/advanced, -/turf/open/floor/plating, +/obj/effect/turf_decal/trimline/dark_red/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/submarine_vents, /area/ruin/space/has_grav/nova/des_two/engineering) "ON" = ( /obj/machinery/atmospherics/miner/nitrogen, @@ -9375,12 +9373,14 @@ /turf/open/floor/wood/large, /area/ruin/space/has_grav/nova/des_two/bridge/cl) "Qe" = ( -/obj/structure/cable, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/power/rtg/advanced, -/turf/open/floor/plating, +/obj/machinery/door/window/survival_pod/left/directional/east, +/obj/effect/turf_decal/trimline/dark_red/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/submarine_vents, /area/ruin/space/has_grav/nova/des_two/engineering) "Qi" = ( /obj/structure/mirror/directional/north, @@ -9606,7 +9606,6 @@ /obj/machinery/power/apc/auto_name/directional/east, /obj/effect/mapping_helpers/apc/syndicate_access, /obj/structure/cable, -/obj/item/storage/part_replacer/bluespace, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/nova/des_two/research) "Rl" = ( @@ -10226,13 +10225,16 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/nova/des_two/engineering) "TM" = ( -/obj/structure/cable, /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/power/rtg/advanced, /obj/machinery/light/warm/directional/south, -/turf/open/floor/plating, +/obj/structure/marker_beacon/burgundy, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/effect/turf_decal/trimline/dark_red/filled/corner{ + dir = 1 + }, +/turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/nova/des_two/engineering) "TU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10272,7 +10274,6 @@ pixel_x = 4 }, /obj/item/reagent_containers/blood/o_minus, -/obj/item/defibrillator/loaded, /turf/open/floor/iron/dark/textured_large, /area/ruin/space/has_grav/nova/des_two/cargo) "Ud" = ( @@ -10455,9 +10456,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/structure/cable, -/obj/machinery/power/rtg/advanced, -/turf/open/floor/plating, +/obj/structure/marker_beacon/burgundy, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/effect/turf_decal/trimline/dark_red/filled/corner{ + dir = 8 + }, +/turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/nova/des_two/engineering) "Va" = ( /obj/effect/turf_decal/siding/dark{ @@ -13430,8 +13434,8 @@ mi Xz PS VB -ox -ox +VB +VB Hz tm RH @@ -13540,8 +13544,8 @@ kz Fx we VB -ox -ox +VB +VB Hz Nl Jv @@ -13595,8 +13599,8 @@ mT WW LF VB -ox -ox +VB +VB Hz LB Gz @@ -13706,7 +13710,7 @@ DH dn eO Gf -ox +VB Hz KT Ku diff --git a/html/changelogs/AutoChangeLog-pr-2851.yml b/html/changelogs/AutoChangeLog-pr-2851.yml deleted file mode 100644 index 6a516de74ae..00000000000 --- a/html/changelogs/AutoChangeLog-pr-2851.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DaCoolBoss" -delete-after: True -changes: - - spellcheck: "Fixes a typo in the cargo console." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2852.yml b/html/changelogs/AutoChangeLog-pr-2852.yml deleted file mode 100644 index 4fbb0ab9352..00000000000 --- a/html/changelogs/AutoChangeLog-pr-2852.yml +++ /dev/null @@ -1,13 +0,0 @@ -author: "Melbert" -delete-after: True -changes: - - bugfix: "You can't change the GPS tag of something unless you can actually use the GPS" - - bugfix: "You can't set the teleporter to a location unless you can actually use the teleporter" - - bugfix: "You can't reply to request console requests unless you can actually use the console" - - bugfix: "You can't update AI lawboards unless you're actually holding them" - - bugfix: "You can't update a borg rename board unless you're actually holding it" - - bugfix: "You can't mess with plumbing machines unless you can actually use them" - - bugfix: "You can't recolor / relayer ducts unless you're actually holding them" - - bugfix: "You can't magically wire APCs and SMESs unless you're right by them" - - bugfix: "You can't use Stargazer Telepathy on people who you can't see" - - bugfix: "You can't configure the Inspector Hat unless you can actually use it" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2853.yml b/html/changelogs/AutoChangeLog-pr-2853.yml deleted file mode 100644 index 0f9970e8c90..00000000000 --- a/html/changelogs/AutoChangeLog-pr-2853.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "jlsnow301" -delete-after: True -changes: - - bugfix: "Airlock electronics and other access-config type UIs should look much better." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2854.yml b/html/changelogs/AutoChangeLog-pr-2854.yml deleted file mode 100644 index 6ad8a94a9ca..00000000000 --- a/html/changelogs/AutoChangeLog-pr-2854.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "Iamgoofball" -delete-after: True -changes: - - bugfix: "Fixes AI lag by re-adding idle mode to all AI that was lost with the simple mob to basic mob conversion." - - bugfix: "AI controllers with no clients around for 14 tiles will move into idle mode and stop planning or acting." - - bugfix: "AI controllers will now record how much time was spent on planning or un-idling AI controllers." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2856.yml b/html/changelogs/AutoChangeLog-pr-2856.yml deleted file mode 100644 index f59e7e6800f..00000000000 --- a/html/changelogs/AutoChangeLog-pr-2856.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "wesoda25" -delete-after: True -changes: - - bugfix: "blood rites - will no longer delete after running out of charges" - - bugfix: "blood rites - now heal shades as well" - - bugfix: "blood rites - now charge 1.65x for self healing as opposed to the ~2x they were before" - - code_imp: "blood rites code hurts my eyes a bit less now" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2857.yml b/html/changelogs/AutoChangeLog-pr-2857.yml deleted file mode 100644 index 884870c0151..00000000000 --- a/html/changelogs/AutoChangeLog-pr-2857.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Watermelon914" -delete-after: True -changes: - - bugfix: "LUA: Registering a signal on a deleted datum will throw a more descriptive error message." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2858.yml b/html/changelogs/AutoChangeLog-pr-2858.yml deleted file mode 100644 index adf755aa3d6..00000000000 --- a/html/changelogs/AutoChangeLog-pr-2858.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "StrangeWeirdKitten" -delete-after: True -changes: - - balance: "The upload and communication boards directly have trackers installed, activated only when authenticated." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2859.yml b/html/changelogs/AutoChangeLog-pr-2859.yml deleted file mode 100644 index d212d03fc24..00000000000 --- a/html/changelogs/AutoChangeLog-pr-2859.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "jlsnow301" -delete-after: True -changes: - - bugfix: "Deviants buffed: Rogue shoelacing, pickpocketing and restraint resisting no longer give cogbar icons." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2860.yml b/html/changelogs/AutoChangeLog-pr-2860.yml new file mode 100644 index 00000000000..382fad4e369 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2860.yml @@ -0,0 +1,6 @@ +author: "Zergspower" +delete-after: True +changes: + - rscadd: "Adds a new powersource - A miniature Reactor - for ghost roles to replace bluespace SMES and the need to RTG Spam" + - qol: "BMD now has a mining scanner! Gone are the days of accidentally blowing your home apart trying to get silver to make one" + - qol: "Freighter, DS2 and Ice Interdyne receive a new reactor to give baseline power" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2861.yml b/html/changelogs/AutoChangeLog-pr-2861.yml deleted file mode 100644 index 04a91ee24f5..00000000000 --- a/html/changelogs/AutoChangeLog-pr-2861.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "Ketrai" -delete-after: True -changes: - - qol: "chef equipment can now deposit and withdraw to/from trays!" - - qol: "chef now has access to griddle and oven sized trays!" - - qol: "service can now print soup pots" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2862.yml b/html/changelogs/AutoChangeLog-pr-2862.yml deleted file mode 100644 index 70a63e7f738..00000000000 --- a/html/changelogs/AutoChangeLog-pr-2862.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SomeRandomOwl" -delete-after: True -changes: - - qol: "Added TGUI color prefixes for Tarkon :k, Solfed :l, Guild :p, Interdyne :w and Cybersun :q" - - rscadd: "Two radio headsets for the Solfed EMT team, and Solfed Marshel / SWAT / Marine teams" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2863.yml b/html/changelogs/AutoChangeLog-pr-2863.yml deleted file mode 100644 index b63e83f675c..00000000000 --- a/html/changelogs/AutoChangeLog-pr-2863.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Metekillot" -delete-after: True -changes: - - bugfix: "Being in critical condition no longer damages zombies." - - code_imp: "TRAIT_NODEATH will actually stop you dying in (most) cases." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2864.yml b/html/changelogs/AutoChangeLog-pr-2864.yml deleted file mode 100644 index 3a56f0ef616..00000000000 --- a/html/changelogs/AutoChangeLog-pr-2864.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "nikothedude" -delete-after: True -changes: - - rscadd: "*esigh, for exasperated sighing" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2865.yml b/html/changelogs/AutoChangeLog-pr-2865.yml new file mode 100644 index 00000000000..ff79cdbcee7 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2865.yml @@ -0,0 +1,4 @@ +author: "YehnBeep" +delete-after: True +changes: + - bugfix: "Fixed icebox interdyne outpost missing GPSs and canisters." \ No newline at end of file diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml index 904c74269e9..22cea450f06 100644 --- a/html/changelogs/archive/2024-04.yml +++ b/html/changelogs/archive/2024-04.yml @@ -468,3 +468,58 @@ hyperjll: - balance: Haloperidol now purges 2 units per second of itself, should the victim have zero stamina. (Stamcrit) +2024-04-14: + DaCoolBoss: + - spellcheck: Fixes a typo in the cargo console. + Iamgoofball: + - bugfix: Fixes AI lag by re-adding idle mode to all AI that was lost with the simple + mob to basic mob conversion. + - bugfix: AI controllers with no clients around for 14 tiles will move into idle + mode and stop planning or acting. + - bugfix: AI controllers will now record how much time was spent on planning or + un-idling AI controllers. + Ketrai: + - qol: chef equipment can now deposit and withdraw to/from trays! + - qol: chef now has access to griddle and oven sized trays! + - qol: service can now print soup pots + Melbert: + - bugfix: You can't change the GPS tag of something unless you can actually use + the GPS + - bugfix: You can't set the teleporter to a location unless you can actually use + the teleporter + - bugfix: You can't reply to request console requests unless you can actually use + the console + - bugfix: You can't update AI lawboards unless you're actually holding them + - bugfix: You can't update a borg rename board unless you're actually holding it + - bugfix: You can't mess with plumbing machines unless you can actually use them + - bugfix: You can't recolor / relayer ducts unless you're actually holding them + - bugfix: You can't magically wire APCs and SMESs unless you're right by them + - bugfix: You can't use Stargazer Telepathy on people who you can't see + - bugfix: You can't configure the Inspector Hat unless you can actually use it + Metekillot: + - bugfix: Being in critical condition no longer damages zombies. + - code_imp: TRAIT_NODEATH will actually stop you dying in (most) cases. + SomeRandomOwl: + - qol: Added TGUI color prefixes for Tarkon :k, Solfed :l, Guild :p, Interdyne :w + and Cybersun :q + - rscadd: Two radio headsets for the Solfed EMT team, and Solfed Marshel / SWAT + / Marine teams + StrangeWeirdKitten: + - balance: The upload and communication boards directly have trackers installed, + activated only when authenticated. + Watermelon914: + - bugfix: 'LUA: Registering a signal on a deleted datum will throw a more descriptive + error message.' + jlsnow301: + - bugfix: Airlock electronics and other access-config type UIs should look much + better. + - bugfix: 'Deviants buffed: Rogue shoelacing, pickpocketing and restraint resisting + no longer give cogbar icons.' + nikothedude: + - rscadd: '*esigh, for exasperated sighing' + wesoda25: + - bugfix: blood rites - will no longer delete after running out of charges + - bugfix: blood rites - now heal shades as well + - bugfix: blood rites - now charge 1.65x for self healing as opposed to the ~2x + they were before + - code_imp: blood rites code hurts my eyes a bit less now diff --git a/modular_nova/modules/mapping/code/machinery.dm b/modular_nova/modules/mapping/code/machinery.dm index 1c143c2ed5a..531ee924cf2 100644 --- a/modular_nova/modules/mapping/code/machinery.dm +++ b/modular_nova/modules/mapping/code/machinery.dm @@ -31,3 +31,94 @@ if(.) return attack_self(user) + + +/** + * Power related machines + */ + +/// Primarily a replacement for Bluespace SMES/RTG spam into be something more realistic +/obj/machinery/power/micro_reactor + icon = 'modular_nova/modules/mapping/icons/machinery/reactor.dmi' + name = "micro reactor" + desc = "Designed as a self-containing powersource for long-haul vessels, the stamp of SOAR Industries \ + on the top. A steady output once active with plenty of safety features to ensure a meltdown is not possible, \ + having one installed means a steady clean powersource for between 75-125 years." + icon_state = "reactor0_0" + base_icon_state = "reactor0" + obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION + density = TRUE + anchored = TRUE + + var/power_gen = 200 KILO WATTS + var/active = FALSE + var/power_output = 1 + + interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND + + light_color = LIGHT_COLOR_ELECTRIC_CYAN + light_on = FALSE + + var/datum/looping_sound/generator/soundloop + +/obj/machinery/power/micro_reactor/Initialize(mapload) + . = ..() + soundloop = new(src, active) + connect_to_network() + +/obj/machinery/power/micro_reactor/Destroy() + QDEL_NULL(soundloop) + return ..() + +/obj/machinery/power/micro_reactor/update_icon_state() + icon_state = "[base_icon_state]_[active]" + return ..() + +/obj/machinery/power/micro_reactor/attack_hand(mob/user, list/modifiers) + . = ..() + TogglePower() + +/obj/machinery/power/micro_reactor/attack_robot(mob/user) + . = ..() + TogglePower() + +/obj/machinery/power/micro_reactor/proc/handleInactive() + return + +/obj/machinery/power/micro_reactor/update_appearance(updates) + . = ..() + if(!active) + set_light(0) + return + set_light(2, 3) + +/obj/machinery/power/micro_reactor/proc/TogglePower() + if(active) + active = FALSE + set_light_power(0) + set_light_on(0) + update_appearance() + soundloop.stop() + else + active = TRUE + START_PROCESSING(SSmachines, src) + set_light_power(3) + set_light_range(2) + set_light_on(TRUE) + update_appearance() + soundloop.start() + +/obj/machinery/power/micro_reactor/process() + if(active) + if(!anchored) + TogglePower() + return + if(powernet) + add_avail(power_to_energy(power_gen * power_output)) + else + handleInactive() + +/obj/machinery/power/micro_reactor/examine(mob/user) + . = ..() + if(in_range(user, src) || isobserver(user)) + . += "It is[!active?"n't":""] running." diff --git a/modular_nova/modules/mapping/code/space.dm b/modular_nova/modules/mapping/code/space.dm index 1bb749b8a77..c9632412e6f 100644 --- a/modular_nova/modules/mapping/code/space.dm +++ b/modular_nova/modules/mapping/code/space.dm @@ -89,6 +89,7 @@ suffix = "blackmarket.dmm" name = "Space-Ruin Shady Market" description = "Whaddya buyin'?" + always_place = TRUE /datum/map_template/ruin/space/nova/shuttle8532 id = "shuttle8532" diff --git a/modular_nova/modules/mapping/icons/machinery/reactor.dmi b/modular_nova/modules/mapping/icons/machinery/reactor.dmi new file mode 100644 index 00000000000..3254c467dcf Binary files /dev/null and b/modular_nova/modules/mapping/icons/machinery/reactor.dmi differ