From 45da308a8d583e956b174821d106cd0409b459d3 Mon Sep 17 00:00:00 2001 From: Astra Farera E'luna Awiarera Date: Thu, 21 Mar 2024 21:39:28 +0400 Subject: [PATCH 01/10] Icebox wend prices and reaaally needed magboots, some rrs. --- .../IceRuins/fluffy/icemoon_interdyne_base_ff.dmm | 15 +++++++++------ .../fluffy/lavaland_interdyne_base_ff.dmm | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm index 8f189099807..b39d168c610 100644 --- a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm +++ b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm @@ -321,7 +321,8 @@ displayed_currency_name = " soviet ruble"; name = "Interdyne NanoMed"; light_color = "#adadcd"; - color = "#adadcd" + color = "#adadcd"; + onstation = 0 }, /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/interdyne_planetary_base) @@ -560,6 +561,7 @@ /obj/item/gun/ballistic/rifle/sniper_rifle, /obj/item/modular_computer/laptop/preset/syndicate, /obj/item/folder/syndicate/red, +/obj/effect/spawner/random/entertainment/money_medium, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main/vault) "cS" = ( @@ -1663,7 +1665,7 @@ }, /obj/machinery/shower/directional/east, /obj/structure/drain, -/obj/structure/sign/warning/cold_temp/directional/west, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) "jy" = ( @@ -1952,7 +1954,7 @@ /obj/effect/turf_decal/box/white/corners{ dir = 1 }, -/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/sign/warning/cold_temp/directional/west, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) "lz" = ( @@ -4411,7 +4413,8 @@ "Am" = ( /obj/effect/turf_decal/tile/dark/full, /obj/machinery/vending/wardrobe/syndie_wardrobe/interdyne{ - extended_inventory = 1 + extended_inventory = 1; + onstation = 0 }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) @@ -5722,7 +5725,7 @@ dir = 4 }, /obj/effect/turf_decal/box/white/corners, -/obj/structure/sign/warning/gas_mask/directional/east, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) "HF" = ( @@ -6393,7 +6396,7 @@ name = "Inderdyne security camera"; network = list("Interdyne") }, -/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/sign/warning/gas_mask/directional/east, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) "Mc" = ( diff --git a/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm b/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm index adc63dfebd8..212ee467637 100644 --- a/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm +++ b/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm @@ -1631,6 +1631,7 @@ /obj/item/gun/ballistic/rifle/sniper_rifle, /obj/item/modular_computer/laptop/preset/syndicate, /obj/item/folder/syndicate/red, +/obj/effect/spawner/random/entertainment/money_medium, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main/vault) "jG" = ( @@ -2544,7 +2545,7 @@ /obj/effect/turf_decal/box/white/corners{ dir = 1 }, -/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/sign/warning/hot_temp/directional/west, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) "pk" = ( @@ -2839,7 +2840,7 @@ name = "Inderdyne security camera"; network = list("Interdyne") }, -/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/sign/warning/gas_mask/directional/east, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) "qR" = ( @@ -3424,7 +3425,7 @@ }, /obj/structure/drain, /obj/machinery/shower/directional/east, -/obj/structure/sign/warning/hot_temp/directional/west, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) "vF" = ( @@ -4536,7 +4537,7 @@ dir = 4 }, /obj/effect/turf_decal/box/white/corners, -/obj/structure/sign/warning/gas_mask/directional/east, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) "Cn" = ( @@ -5094,7 +5095,8 @@ "FQ" = ( /obj/effect/turf_decal/tile/dark/full, /obj/machinery/vending/wardrobe/syndie_wardrobe/interdyne{ - extended_inventory = 1 + extended_inventory = 1; + onstation = 0 }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) @@ -6122,7 +6124,8 @@ displayed_currency_name = " soviet ruble"; name = "Interdyne NanoMed"; light_color = "#adadcd"; - color = "#adadcd" + color = "#adadcd"; + onstation = 0 }, /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/interdyne_planetary_base) From 1e33415c4f35e61860d878ca4da0f647807b7645 Mon Sep 17 00:00:00 2001 From: Astra Farera E'luna Awiarera Date: Thu, 21 Mar 2024 21:58:52 +0400 Subject: [PATCH 02/10] Reverting turret faction to stop dyne robbing again. --- .../fluffy/icemoon_interdyne_base_ff.dmm | 15 +++++---------- .../fluffy/lavaland_interdyne_base_ff.dmm | 18 ++++++++---------- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm index b39d168c610..186d34a1a05 100644 --- a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm +++ b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm @@ -40,8 +40,7 @@ /area/icemoon/underground/explored) "ak" = ( /obj/machinery/porta_turret/syndicate{ - dir = 5; - faction = list("Syndicate","neutral") + dir = 5 }, /obj/structure/marker_beacon/burgundy, /obj/machinery/camera/xray{ @@ -664,8 +663,7 @@ /area/ruin/interdyne_planetary_base/cargo) "dk" = ( /obj/machinery/porta_turret/syndicate{ - dir = 6; - faction = list("Syndicate","neutral") + dir = 6 }, /obj/structure/marker_beacon/burgundy, /obj/machinery/camera/xray{ @@ -5039,8 +5037,7 @@ /area/ruin/interdyne_planetary_base/science) "Ei" = ( /obj/machinery/porta_turret/syndicate{ - dir = 5; - faction = list("Syndicate","neutral") + dir = 5 }, /obj/structure/marker_beacon/burgundy, /obj/machinery/camera/xray{ @@ -6847,8 +6844,7 @@ /area/ruin/interdyne_planetary_base/serv) "Pn" = ( /obj/machinery/porta_turret/syndicate{ - dir = 10; - faction = list("Syndicate","neutral") + dir = 10 }, /obj/structure/marker_beacon/burgundy, /obj/machinery/camera/xray{ @@ -6906,8 +6902,7 @@ /area/ruin/interdyne_planetary_base/serv/rstrm) "Pv" = ( /obj/machinery/porta_turret/syndicate{ - dir = 9; - faction = list("Syndicate","neutral") + dir = 9 }, /obj/structure/marker_beacon/burgundy, /obj/machinery/camera/xray{ diff --git a/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm b/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm index 212ee467637..7790bcdf1e9 100644 --- a/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm +++ b/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm @@ -426,8 +426,7 @@ /area/ruin/interdyne_planetary_base/med) "co" = ( /obj/machinery/porta_turret/syndicate{ - dir = 6; - faction = list("Syndicate","neutral") + dir = 6 }, /obj/structure/marker_beacon/burgundy, /obj/machinery/camera/xray{ @@ -741,8 +740,7 @@ /area/ruin/interdyne_planetary_base/main/dorms) "el" = ( /obj/machinery/porta_turret/syndicate{ - dir = 5; - faction = list("Syndicate","neutral") + dir = 5 }, /obj/structure/marker_beacon/burgundy, /obj/machinery/camera/xray{ @@ -1943,8 +1941,7 @@ /area/ruin/interdyne_planetary_base/science) "lx" = ( /obj/machinery/porta_turret/syndicate{ - dir = 9; - faction = list("Syndicate","neutral") + dir = 9 }, /obj/structure/marker_beacon/burgundy, /obj/machinery/camera/xray{ @@ -6098,8 +6095,7 @@ /area/ruin/interdyne_planetary_base/serv/rstrm) "LE" = ( /obj/machinery/porta_turret/syndicate{ - dir = 5; - faction = list("Syndicate","neutral") + dir = 5 }, /obj/structure/marker_beacon/burgundy, /obj/machinery/camera/xray{ @@ -7632,8 +7628,7 @@ /area/ruin/interdyne_planetary_base/cargo) "UO" = ( /obj/machinery/porta_turret/syndicate{ - dir = 10; - faction = list("Syndicate","neutral") + dir = 10 }, /obj/structure/marker_beacon/burgundy, /obj/machinery/camera/xray{ @@ -8096,6 +8091,9 @@ /obj/structure/table/reinforced/plastitaniumglass, /obj/item/storage/toolbox/electrical, /obj/effect/turf_decal/tile/dark/full, +/obj/item/clothing/shoes/magboots{ + pixel_y = 8 + }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main) "Xr" = ( From eb771a79964660b9bfe2cd32b96b16d045d488e1 Mon Sep 17 00:00:00 2001 From: Astra Farera E'luna Awiarera Date: Fri, 22 Mar 2024 01:24:53 +0400 Subject: [PATCH 03/10] Hid botany tools, inc some random amount of money to allow dyne to at least buy something. --- .../fluffy/icemoon_interdyne_base_ff.dmm | 44 +++++++++---------- .../fluffy/lavaland_interdyne_base_ff.dmm | 22 ++++------ 2 files changed, 31 insertions(+), 35 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm index 186d34a1a05..9dbc0eb9811 100644 --- a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm +++ b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm @@ -561,6 +561,8 @@ /obj/item/modular_computer/laptop/preset/syndicate, /obj/item/folder/syndicate/red, /obj/effect/spawner/random/entertainment/money_medium, +/obj/effect/spawner/random/entertainment/money_medium, +/obj/effect/spawner/random/entertainment/money_medium, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main/vault) "cS" = ( @@ -3112,7 +3114,8 @@ "ss" = ( /obj/machinery/vending/hydronutrients{ onstation = 0; - extended_inventory = 1 + extended_inventory = 1; + products = list(/obj/item/gun/energy/floragun = 3, /obj/item/geneshears = 3, /obj/item/hatchet = 3, /obj/item/cultivator = 3, /obj/item/plant_analyzer = 3, /obj/item/reagent_containers/cup/bottle/nutrient/ez = 5, /obj/item/reagent_containers/cup/bottle/nutrient/l4z = 5, /obj/item/reagent_containers/cup/bottle/nutrient/rh = 3, /obj/item/reagent_containers/spray/pestspray = 2, /obj/item/reagent_containers/syringe = 5, /obj/item/secateurs = 3, /obj/item/shovel/spade = 3, /obj/item/storage/bag/plants = 3) }, /obj/effect/turf_decal/tile/dark/full, /turf/open/floor/iron/dark/textured_large, @@ -4073,9 +4076,9 @@ /area/ruin/interdyne_planetary_base/serv) "xY" = ( /obj/effect/turf_decal/tile/dark/full, -/obj/machinery/oven/range{ +/obj/machinery/griddle{ color = "#9d9ddd"; - name = "Interdyne range"; + name = "Interdyne griddle"; light_color = "#9d9ddd" }, /turf/open/floor/iron/dark/textured_large, @@ -4454,7 +4457,6 @@ /area/icemoon/underground/explored) "AR" = ( /obj/effect/decal/remains/human, -/obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "AT" = ( @@ -4948,9 +4950,9 @@ "DI" = ( /obj/effect/turf_decal/tile/dark/full, /obj/structure/marker_beacon/burgundy, -/obj/machinery/griddle{ +/obj/machinery/oven/range{ color = "#9d9ddd"; - name = "Interdyne griddle"; + name = "Interdyne range"; light_color = "#9d9ddd" }, /turf/open/floor/iron/dark/textured_large, @@ -7415,6 +7417,11 @@ /obj/item/storage/toolbox/syndicate, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) +"TF" = ( +/obj/structure/flora/grass/both/style_random, +/obj/structure/flora/tree/pine/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "TH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -8482,13 +8489,6 @@ /obj/structure/marker_beacon/teal, /obj/effect/turf_decal/tile/dark/full, /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/gun/energy/floragun, -/obj/item/geneshears, -/obj/item/shovel/spade, -/obj/item/hatchet, -/obj/item/cultivator, -/obj/item/secateurs, -/obj/item/plant_analyzer, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv) "Zr" = ( @@ -8952,7 +8952,7 @@ aa aa aa ac -eE +ac SH Se Iy @@ -9012,7 +9012,7 @@ aa ac ac Se -Iy +eE Jx Iy Se @@ -9068,11 +9068,11 @@ aa aa aa ac +ac Iy eE Iy Iy -Iy eE Iy BM @@ -9126,8 +9126,8 @@ aa aa aa ac +ac eE -Iy dM dM SH @@ -9184,10 +9184,10 @@ aa (11,1,1) = {" aa ac -Iy +ac eE AR -dM +TF Im Iy Iy @@ -9242,8 +9242,8 @@ aa "} (12,1,1) = {" ac -eE -SH +ac +JV Iy dM Se @@ -9301,9 +9301,9 @@ aa "} (13,1,1) = {" ei -Iy eE Iy +Iy eE Iy Oc diff --git a/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm b/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm index 7790bcdf1e9..24a33c132f7 100644 --- a/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm +++ b/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm @@ -103,13 +103,6 @@ /obj/structure/marker_beacon/teal, /obj/effect/turf_decal/tile/dark/full, /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/gun/energy/floragun, -/obj/item/geneshears, -/obj/item/shovel/spade, -/obj/item/hatchet, -/obj/item/cultivator, -/obj/item/secateurs, -/obj/item/plant_analyzer, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv) "aL" = ( @@ -1630,6 +1623,8 @@ /obj/item/modular_computer/laptop/preset/syndicate, /obj/item/folder/syndicate/red, /obj/effect/spawner/random/entertainment/money_medium, +/obj/effect/spawner/random/entertainment/money_medium, +/obj/effect/spawner/random/entertainment/money_medium, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main/vault) "jG" = ( @@ -5015,9 +5010,9 @@ "Ff" = ( /obj/effect/turf_decal/tile/dark/full, /obj/structure/marker_beacon/burgundy, -/obj/machinery/griddle{ +/obj/machinery/oven/range{ color = "#9d9ddd"; - name = "Interdyne griddle"; + name = "Interdyne range"; light_color = "#9d9ddd" }, /turf/open/floor/iron/dark/textured_large, @@ -5126,11 +5121,12 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main/vault) "Gf" = ( +/obj/effect/turf_decal/tile/dark/full, /obj/machinery/vending/hydronutrients{ onstation = 0; - extended_inventory = 1 + extended_inventory = 1; + products = list(/obj/item/gun/energy/floragun = 3, /obj/item/geneshears = 3, /obj/item/hatchet = 3, /obj/item/cultivator = 3, /obj/item/plant_analyzer = 3, /obj/item/reagent_containers/cup/bottle/nutrient/ez = 5, /obj/item/reagent_containers/cup/bottle/nutrient/l4z = 5, /obj/item/reagent_containers/cup/bottle/nutrient/rh = 3, /obj/item/reagent_containers/spray/pestspray = 2, /obj/item/reagent_containers/syringe = 5, /obj/item/secateurs = 3, /obj/item/shovel/spade = 3, /obj/item/storage/bag/plants = 3) }, -/obj/effect/turf_decal/tile/dark/full, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv) "Gj" = ( @@ -5731,9 +5727,9 @@ /area/ruin/interdyne_planetary_base/serv) "JK" = ( /obj/effect/turf_decal/tile/dark/full, -/obj/machinery/oven/range{ +/obj/machinery/griddle{ color = "#9d9ddd"; - name = "Interdyne range"; + name = "Interdyne griddle"; light_color = "#9d9ddd" }, /turf/open/floor/iron/dark/textured_large, From f63bc8f8b641347c44a03990af566eff7c0af0d5 Mon Sep 17 00:00:00 2001 From: Astra Farera E'luna Awiarera Date: Sun, 24 Mar 2024 08:42:47 +0400 Subject: [PATCH 04/10] Entrance storm-safety deco, batons, rrs. --- .../fluffy/icemoon_interdyne_base_ff.dmm | 414 +++++++++++------- .../fluffy/lavaland_interdyne_base_ff.dmm | 213 +++++---- 2 files changed, 386 insertions(+), 241 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm index 9dbc0eb9811..04abfcb2a2b 100644 --- a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm +++ b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm @@ -308,13 +308,6 @@ /turf/open/floor/iron/dark/textured, /area/ruin/interdyne_planetary_base/serv) "bK" = ( -/obj/machinery/camera/xray{ - pixel_x = 10; - name = "Inderdyne security camera"; - network = list("Interdyne"); - color = "#adadcd"; - pixel_y = 25 - }, /obj/machinery/vending/wallmed{ products = list(/obj/item/reagent_containers/pill/patch/libital = 5, /obj/item/reagent_containers/pill/patch/aiuri = 5, /obj/item/reagent_containers/pill/multiver = 2, /obj/item/storage/box/bandages = 4); displayed_currency_name = " soviet ruble"; @@ -323,6 +316,13 @@ color = "#adadcd"; onstation = 0 }, +/obj/machinery/camera/xray{ + pixel_x = 22; + name = "Inderdyne security camera"; + network = list("Interdyne"); + color = "#adadcd"; + pixel_y = 25 + }, /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/interdyne_planetary_base) "bM" = ( @@ -626,13 +626,25 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv) "da" = ( -/obj/structure/marker_beacon/burgundy, /obj/structure/sign/poster/contraband/syndicate_medical/directional/south{ name = "Interdyne Pharmaceutics"; desc = "Beware of perimeter turrets.'" }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) +/obj/effect/turf_decal/stripes/blue{ + dir = 1 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 5 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/obj/structure/marker_beacon/cerulean, +/turf/open/floor/plating/snowed/icemoon, +/area/ruin/interdyne_planetary_base) "db" = ( /obj/structure/sign/poster/contraband/c20r/directional/south, /obj/effect/turf_decal/trimline/dark/filled/line, @@ -1614,9 +1626,6 @@ dir = 8 }, /obj/structure/lattice/catwalk/mining, -/obj/effect/turf_decal/weather/snow{ - layer = 3 - }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) "jo" = ( @@ -1938,6 +1947,17 @@ }, /turf/open/floor/iron/dark/textured, /area/ruin/interdyne_planetary_base/main/dorms) +"lo" = ( +/obj/structure/flora/tree/pine/style_random, +/obj/structure/flora/grass/brown/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"lp" = ( +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) "lu" = ( /obj/effect/turf_decal/stripes/red/corner{ dir = 4 @@ -1966,12 +1986,14 @@ "lD" = ( /obj/effect/turf_decal/tile/dark/full, /obj/structure/marker_beacon/indigo, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/mecha_part_fabricator{ name = "Interdyne exosuit fabricator"; color = "#adadcd"; - light_color = "#adadcd" + light_color = "#adadcd"; + hacked = 1; + id = awa }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) "lH" = ( @@ -2017,9 +2039,6 @@ dir = 4 }, /obj/structure/lattice/catwalk/mining, -/obj/effect/turf_decal/weather/snow{ - layer = 3 - }, /obj/effect/turf_decal/weather/snow/corner{ dir = 4; layer = 3 @@ -2027,10 +2046,10 @@ /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "mg" = ( -/obj/structure/marker_beacon/burgundy, /obj/structure/flora/grass/both/style_random, +/obj/structure/marker_beacon/cerulean, /turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) +/area/ruin/interdyne_planetary_base) "mp" = ( /obj/structure/marker_beacon/burgundy, /obj/structure/railing{ @@ -2430,12 +2449,14 @@ /area/ruin/interdyne_planetary_base/main) "ol" = ( /obj/effect/turf_decal/tile/dark/full, +/obj/structure/marker_beacon/burgundy, /obj/machinery/rnd/production/circuit_imprinter/offstation{ name = "Interdyne circuit imprinter"; color = "#adadcd"; - light_color = "#adadcd" + light_color = "#adadcd"; + hacked = 1; + id = awa }, -/obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) "on" = ( @@ -3079,6 +3100,10 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) +"sh" = ( +/obj/structure/flora/ash/chilly, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "sm" = ( /obj/effect/turf_decal/vg_decals/atmos/air, /obj/effect/turf_decal/trimline/dark/filled/line{ @@ -3187,7 +3212,13 @@ /turf/open/floor/iron/recharge_floor, /area/ruin/interdyne_planetary_base/main/vault) "sO" = ( -/turf/open/floor/plating/snowed/smoothed/icemoon, +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 5 + }, +/turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) "sP" = ( /turf/closed/wall/r_wall/syndicate, @@ -3565,9 +3596,6 @@ dir = 4 }, /obj/structure/lattice/catwalk/mining, -/obj/effect/turf_decal/weather/snow{ - layer = 3 - }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) "uN" = ( @@ -3772,6 +3800,10 @@ /obj/effect/mob_spawn/ghost_role/human/interdyne_planetary_base/deck_officer/ice, /turf/open/floor/iron/dark/textured, /area/ruin/interdyne_planetary_base/main/dorms) +"wd" = ( +/obj/structure/flora/bush/flowers_br/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "wl" = ( /obj/structure/chair/sofa/bench/right{ dir = 8 @@ -3923,9 +3955,6 @@ /obj/effect/turf_decal/weather/snow{ layer = 3 }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, /turf/open/floor/plating/reinforced/icemoon, /area/icemoon/underground/explored) "wP" = ( @@ -3949,6 +3978,15 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) +"wS" = ( +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 9 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) "wU" = ( /obj/structure/bookcase/random/religion, /turf/open/floor/wood/large, @@ -3981,6 +4019,11 @@ }, /turf/open/floor/iron/dark/textured, /area/ruin/interdyne_planetary_base/serv) +"xk" = ( +/obj/structure/marker_beacon/burgundy, +/obj/structure/flora/grass/brown/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "xl" = ( /obj/effect/turf_decal/trimline/dark/filled/corner{ dir = 4 @@ -4044,8 +4087,14 @@ /area/ruin/interdyne_planetary_base/main) "xF" = ( /obj/structure/fence/door, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/underground/explored) +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/ruin/interdyne_planetary_base) "xP" = ( /obj/effect/turf_decal/trimline/dark/filled/line{ dir = 8 @@ -4364,7 +4413,9 @@ /obj/machinery/rnd/production/protolathe/offstation{ name = "Interdyne protolathe"; color = "#adadcd"; - light_color = "#adadcd" + light_color = "#adadcd"; + hacked = 1; + id = awa }, /obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured_large, @@ -4425,6 +4476,22 @@ }, /turf/closed/mineral/random/snow/underground, /area/icemoon/underground/explored) +"Ay" = ( +/obj/effect/turf_decal/stripes/blue{ + dir = 1 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4; + layer = 3 + }, +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/ruin/interdyne_planetary_base) "AF" = ( /obj/machinery/light/directional/north{ bulb_colour = "#AC3CFF"; @@ -4447,9 +4514,6 @@ dir = 8 }, /obj/structure/lattice/catwalk/mining, -/obj/effect/turf_decal/weather/snow{ - layer = 3 - }, /obj/effect/turf_decal/weather/snow/corner{ dir = 8 }, @@ -4977,6 +5041,11 @@ /obj/effect/mapping_helpers/apc/syndicate_access, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) +"DM" = ( +/obj/structure/flora/grass/both/style_random, +/obj/structure/flora/tree/pine/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "DN" = ( /obj/structure/flora/grass/brown/style_random, /obj/structure/shipping_container/interdyne, @@ -5395,15 +5464,6 @@ /obj/effect/turf_decal/stripes/red/corner{ dir = 1 }, -/obj/machinery/button/door{ - id = "syndie_lavaland_vault"; - name = "Vault Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -8; - pixel_y = 24; - req_access = list("syndicate"); - specialfunctions = 4 - }, /obj/effect/turf_decal/trimline/dark/filled/corner, /obj/effect/turf_decal/trimline/dark/filled/corner{ dir = 8 @@ -5418,6 +5478,15 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/button/door{ + id = "syndie_lavaland_vault"; + name = "Vault Bolt Control"; + normaldoorcontrol = 1; + pixel_x = -8; + pixel_y = 24; + req_access = list("syndicate"); + specialfunctions = 4 + }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main) "FV" = ( @@ -5451,9 +5520,6 @@ /obj/structure/railing{ dir = 8 }, -/obj/effect/turf_decal/weather/snow{ - layer = 3 - }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) "Gl" = ( @@ -5640,9 +5706,6 @@ dir = 8 }, /obj/structure/lattice/catwalk/mining, -/obj/effect/turf_decal/weather/snow{ - layer = 3 - }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "Hb" = ( @@ -5945,6 +6008,10 @@ /obj/structure/bookcase/random, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/serv) +"Ju" = ( +/obj/structure/flora/rock/pile/icy/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/ruin/interdyne_planetary_base) "Jx" = ( /obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, @@ -5953,6 +6020,15 @@ /obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/ruin/interdyne_planetary_base/main) +"JC" = ( +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) "JM" = ( /obj/structure/flora/grass/brown/style_random, /obj/structure/flora/grass/brown/style_random, @@ -6305,7 +6381,8 @@ req_access = list("syndicate"); lethal = 1; control_area = "/area/ruin/interdyne_planetary_base"; - ailock = 1 + ailock = 1; + shoot_cyborgs = 1 }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main/vault) @@ -6491,9 +6568,6 @@ /obj/effect/turf_decal/weather/snow{ layer = 3 }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, /turf/open/floor/plating/reinforced/icemoon, /area/icemoon/underground/explored) "MG" = ( @@ -6600,8 +6674,15 @@ /obj/structure/fence{ dir = 4 }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/underground/explored) +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 5 + }, +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/floor/plating/snowed/icemoon, +/area/ruin/interdyne_planetary_base) "NI" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 9 @@ -6974,6 +7055,22 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main) +"PN" = ( +/obj/effect/turf_decal/stripes/blue{ + dir = 1 + }, +/obj/effect/turf_decal/caution/blue, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/ruin/interdyne_planetary_base) "PO" = ( /obj/structure/cable, /turf/open/floor/iron/dark/textured_large, @@ -7164,6 +7261,8 @@ "Sb" = ( /obj/structure/rack/shelf, /obj/effect/turf_decal/tile/dark/full, +/obj/item/melee/baton/security/loaded, +/obj/item/melee/baton/security/loaded, /obj/item/gun/energy/plasmacutter, /obj/item/gun/energy/plasmacutter, /obj/item/binoculars, @@ -7229,6 +7328,15 @@ }, /turf/open/floor/engine, /area/ruin/interdyne_planetary_base/science) +"Sy" = ( +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) "SG" = ( /obj/effect/turf_decal/trimline/dark/filled/corner{ dir = 1 @@ -7366,9 +7474,6 @@ /obj/effect/turf_decal/weather/snow{ layer = 3 }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, /turf/open/floor/plating/reinforced/icemoon, /area/icemoon/underground/explored) "Tu" = ( @@ -7400,7 +7505,11 @@ /obj/effect/turf_decal/trimline/dark/filled/line, /obj/effect/turf_decal/trimline/dark/filled/mid_joiner, /obj/effect/turf_decal/stripes/red/line, -/obj/structure/sign/poster/contraband/syndicate_medical/directional/north, +/obj/structure/sign/poster/contraband/syndicate_medical/directional/south{ + name = "Interdyne Pharmaceutics"; + desc = "Beware of perimeter turrets.'"; + pixel_y = 32 + }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) "TB" = ( @@ -7417,11 +7526,6 @@ /obj/item/storage/toolbox/syndicate, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) -"TF" = ( -/obj/structure/flora/grass/both/style_random, -/obj/structure/flora/tree/pine/style_random, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "TH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -7902,7 +8006,6 @@ /area/ruin/interdyne_planetary_base/main/vault) "Wo" = ( /obj/machinery/camera/xray{ - pixel_x = 10; name = "Inderdyne security camera"; network = list("Interdyne"); color = "#adadcd"; @@ -8032,6 +8135,11 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv) +"WO" = ( +/obj/structure/flora/tree/pine/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "WS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -8410,7 +8518,7 @@ dir = 4 }, /turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) +/area/ruin/interdyne_planetary_base) "Zg" = ( /obj/structure/flora/grass/brown/style_random, /turf/open/misc/ice/smooth{ @@ -8676,7 +8784,7 @@ ac ac SH Iy -eE +lo Im ac ac @@ -8735,19 +8843,19 @@ Im Iy Iy eE -Se +Iy Se Iy dM NI lz Hl -Iy Se Iy -Se Iy Iy +Se +Iy SH Iy ac @@ -8783,7 +8891,7 @@ ac ac ac ac -Iy +eE Im Iy Iy @@ -8803,7 +8911,7 @@ GV eE Iy dM -Iy +sh Iy Iy uQ @@ -8845,21 +8953,21 @@ Iy Se Iy Iy -Iy eE Iy -eE +Iy +lo Iy Se BM Iy SH -Iy +wd ab ab Iy Se -Se +wd Se Iy SH @@ -8867,7 +8975,7 @@ Iy ab ab ab -Iy +wd Iy JM Se @@ -8907,7 +9015,7 @@ eE Iy Iy eE -Se +Iy dM Iy uQ @@ -8935,7 +9043,7 @@ Iy dM Iy Im -eE +lo ac ac ac @@ -8965,7 +9073,7 @@ SH Iy Se Iy -Iy +sh Iy Iy Iy @@ -8991,9 +9099,9 @@ Se Iy SH Iy +sh Iy Iy -Se Iy Jx ac @@ -9080,7 +9188,7 @@ Iy Iy eE Iy -Iy +wd Iy Iy Iy @@ -9112,7 +9220,7 @@ Iy SH Iy Iy -eE +Iy Se Iy Im @@ -9187,14 +9295,14 @@ ac ac eE AR -TF +DM Im Iy Iy eE Iy Iy -SM +eE Iy dM Iy @@ -9231,7 +9339,7 @@ ab ab ab ab -Iy +wd Iy SM Ps @@ -9244,14 +9352,14 @@ aa ac ac JV -Iy +wd dM Se LE Jd Iy Iy -Se +Zx dM Iy Iy @@ -9310,7 +9418,7 @@ Oc CE Iy Iy -eE +Iy Iy SH Iy @@ -9429,8 +9537,8 @@ Iy Iy eE Iy -uQ Iy +SM SH ab ab @@ -9529,7 +9637,7 @@ ab ab ab Iy -eE +Se Iy Iy eE @@ -9546,7 +9654,7 @@ Se Iy eE Iy -eE +Iy Iy Iy ab @@ -9588,8 +9696,8 @@ ab ab ab dM -Se Iy +sh SH ac ac @@ -9600,14 +9708,14 @@ JV Se Iy dM -SH -Ps Iy +Ps Iy -eE Iy Iy Iy +sh +wd ab ab ab @@ -9657,9 +9765,9 @@ ac Lh Im Iy -eE -Iy +WO Iy +SH BM Se Iy @@ -9707,19 +9815,19 @@ ab ab ab ab -Iy +wd Se ac ac "} (20,1,1) = {" Lh -SH -Iy +eE Iy +SH Se Iy -eE +Iy Iy Iy SH @@ -9779,7 +9887,7 @@ Iy Iy Iy Se -Iy +eE Se Iy ab @@ -9837,7 +9945,7 @@ Iy uQ SH Se -Iy +eE SH Iy ab @@ -9892,7 +10000,7 @@ ac (23,1,1) = {" Lh ac -Iy +sh Se Iy Iy @@ -9952,7 +10060,7 @@ ac Au io Se -Iy +wd mN ab ab @@ -10002,7 +10110,7 @@ vL NS ab ab -Iy +Se Jx SH ac @@ -10061,16 +10169,16 @@ vB NS SH ab -Se +Iy Se ac ac "} (26,1,1) = {" -sO +PN YZ -sO -sO +wS +Sy wN jn Gh @@ -10126,10 +10234,10 @@ ac ac "} (27,1,1) = {" -sO +Ay xF -sO -sO +JC +lp Tn ai ai @@ -10185,7 +10293,7 @@ ac ac "} (28,1,1) = {" -SH +Ju NF Iy sO @@ -10238,7 +10346,7 @@ vt NS Se ab -Iy +wd Iy ac ac @@ -10251,7 +10359,7 @@ Iy kr ab SH -Iy +sh tT dM ab @@ -10307,7 +10415,7 @@ ac IS dT Iy -Iy +wd ab ab ab @@ -10315,7 +10423,7 @@ ab ab ab ab -Iy +dM BF BF BF @@ -10368,13 +10476,13 @@ SH DN Iy SH -SH +Jx ab ab ab Pv ab -Iy +sh sP BF BF @@ -10429,11 +10537,11 @@ SM Iy Iy Iy -Iy +Se ab ab ab -Iy +Se SH sP BF @@ -10475,18 +10583,18 @@ RM ab ab ab -Se +Iy SM ac "} (33,1,1) = {" Lh -eE +WO Im SH eE Iy -eE +Iy SH Iy ab @@ -10534,8 +10642,8 @@ ab ab dk ab -Iy -Im +sh +xk ac "} (34,1,1) = {" @@ -10548,7 +10656,7 @@ Se SH Iy uQ -Iy +wd ab ab ab @@ -10602,7 +10710,7 @@ Jb ac ac Jx -Iy +sh Iy Iy Se @@ -10612,7 +10720,7 @@ SH ab ab ab -Iy +dM SH ds iG @@ -10663,8 +10771,8 @@ ac eE Iy SH -eE -Se +lo +Iy Iy dM Iy @@ -10769,8 +10877,8 @@ ab ab ab SH -Se Iy +Se ac ac "} @@ -10781,7 +10889,7 @@ ac ac Iy Iy -eE +WO Se pv WU @@ -10901,10 +11009,10 @@ ac ac SM Iy +sh Iy Iy -Iy -eE +WO Iy dM ab @@ -10943,7 +11051,7 @@ ab ab ab ab -Iy +wd SH Iy ac @@ -11085,7 +11193,7 @@ Iy Iy Se Iy -Iy +sh ab ab ab @@ -11145,7 +11253,7 @@ eE Iy Iy Iy -Iy +wd ab ab ab @@ -11233,7 +11341,7 @@ ab ab ab SH -Iy +wd Iy Iy Iy @@ -11265,7 +11373,7 @@ dM Iy Se Iy -Iy +Se Iy dM ab @@ -11281,7 +11389,7 @@ Iy ab ab ab -Iy +wd SH ab ab @@ -11324,7 +11432,7 @@ SH SM Iy Se -Se +Iy Ps Iy Iy @@ -11352,7 +11460,7 @@ Iy Iy Iy eE -Iy +sh Im Iy uQ @@ -11381,11 +11489,11 @@ ac ac eE Se -Iy +sh Iy dM DQ -Iy +wd Iy dM ab @@ -11463,8 +11571,8 @@ ab Iy SH Iy -Iy -Iy +wd +sh Se Iy SH @@ -11506,11 +11614,11 @@ SH SM Iy Se -Se Iy -dM Iy +dM Iy +sh ab ab ab @@ -11565,7 +11673,7 @@ ac ac ac ac -Im +xk SH ac ac diff --git a/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm b/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm index 24a33c132f7..ce7048ab395 100644 --- a/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm +++ b/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm @@ -129,11 +129,10 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/med) "aS" = ( -/obj/structure/lattice/catwalk/mining, /obj/structure/railing{ dir = 8 }, -/obj/effect/turf_decal/sand/plating/volcanic, +/obj/structure/lattice/catwalk/mining, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "aT" = ( @@ -1355,6 +1354,11 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) +"ir" = ( +/obj/structure/lattice, +/obj/structure/marker_beacon/cerulean, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/interdyne_planetary_base) "it" = ( /obj/effect/turf_decal/stripes/red/line, /obj/structure/window/reinforced/survival_pod/spawner/directional/south{ @@ -1769,11 +1773,10 @@ /turf/open/floor/plating/reinforced, /area/ruin/interdyne_planetary_base/serv/rstrm) "ku" = ( -/obj/structure/lattice/catwalk/mining, /obj/structure/railing{ dir = 9 }, -/obj/effect/turf_decal/sand/plating/volcanic, +/obj/structure/lattice/catwalk/mining, /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) "kv" = ( @@ -1829,8 +1832,6 @@ dir = 4 }, /obj/structure/lattice/catwalk/mining, -/obj/effect/turf_decal/sand/plating/volcanic, -/obj/effect/turf_decal/sand/plating/volcanic, /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) "kL" = ( @@ -1926,12 +1927,14 @@ "lr" = ( /obj/effect/turf_decal/tile/dark/full, /obj/structure/marker_beacon/indigo, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/mecha_part_fabricator{ name = "Interdyne exosuit fabricator"; color = "#adadcd"; - light_color = "#adadcd" + light_color = "#adadcd"; + hacked = 1; + id = awa }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) "lx" = ( @@ -1949,10 +1952,15 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/interdyne_planetary_base) "lz" = ( -/obj/structure/lattice/catwalk/mining, +/obj/effect/turf_decal/stripes/blue{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, /obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/lava/smooth/lava_land_surface, -/area/lavaland/surface/outdoors) +/turf/open/floor/plating/reinforced/lavaland, +/area/ruin/interdyne_planetary_base) "lA" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -2352,13 +2360,15 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main) "oh" = ( -/obj/structure/marker_beacon/burgundy, /obj/structure/sign/poster/contraband/syndicate_medical/directional/south{ name = "Interdyne Pharmaceutics"; desc = "Beware of perimeter turrets.'" }, +/obj/structure/lattice, +/obj/structure/flora/ash/cap_shroom, +/obj/structure/marker_beacon/cerulean, /turf/open/misc/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/ruin/interdyne_planetary_base) "on" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 5 @@ -2518,7 +2528,6 @@ dir = 8 }, /obj/structure/lattice/catwalk/mining, -/obj/effect/turf_decal/sand/plating/volcanic, /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) "pc" = ( @@ -2555,15 +2564,17 @@ /obj/structure/railing{ dir = 5 }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, /obj/effect/turf_decal/sand/plating/volcanic, /turf/open/floor/engine/hull/reinforced/lavaland, /area/lavaland/surface/outdoors) "pp" = ( -/obj/structure/lattice/catwalk/mining, /obj/structure/railing{ dir = 8 }, -/obj/effect/turf_decal/sand/plating/volcanic, +/obj/structure/lattice/catwalk/mining, /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) "pq" = ( @@ -3002,7 +3013,6 @@ dir = 6 }, /obj/structure/lattice/catwalk/mining, -/obj/effect/turf_decal/sand/plating/volcanic, /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) "sb" = ( @@ -3030,7 +3040,6 @@ dir = 5 }, /obj/structure/lattice/catwalk/mining, -/obj/effect/turf_decal/sand/plating/volcanic, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "sg" = ( @@ -3571,7 +3580,8 @@ req_access = list("syndicate"); lethal = 1; control_area = "/area/ruin/interdyne_planetary_base"; - ailock = 1 + ailock = 1; + shoot_cyborgs = 1 }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main/vault) @@ -3790,10 +3800,11 @@ /turf/open/floor/engine, /area/ruin/interdyne_planetary_base/science) "xN" = ( -/obj/structure/railing, -/obj/structure/lattice/catwalk/mining, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, /obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/floor/plating/reinforced/lavaland, /area/lavaland/surface/outdoors) "xR" = ( /obj/effect/turf_decal/trimline/dark/filled/line, @@ -4099,13 +4110,9 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) "zn" = ( -/obj/structure/lattice/catwalk/mining, -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/lava/smooth/lava_land_surface, -/area/lavaland/surface/outdoors) +/obj/structure/flora/rock/pile/style_random, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/interdyne_planetary_base) "zq" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -4435,7 +4442,6 @@ dir = 1 }, /obj/structure/lattice/catwalk/mining, -/obj/effect/turf_decal/sand/plating/volcanic, /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) "BD" = ( @@ -4443,7 +4449,7 @@ dir = 4 }, /turf/open/misc/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/ruin/interdyne_planetary_base) "BE" = ( /obj/effect/turf_decal/trimline/dark/filled/corner{ dir = 1 @@ -4800,6 +4806,9 @@ /obj/structure/railing/corner{ dir = 1 }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, /obj/effect/turf_decal/sand/plating/volcanic, /turf/open/floor/plating/reinforced/lavaland, /area/lavaland/surface/outdoors) @@ -5600,6 +5609,13 @@ }, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/serv) +"IZ" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/effect/turf_decal/sand/plating/volcanic, +/turf/open/floor/plating/reinforced/lavaland, +/area/lavaland/surface/outdoors) "Jb" = ( /obj/effect/turf_decal/trimline/dark/filled/line{ dir = 4 @@ -5983,7 +5999,6 @@ dir = 4 }, /obj/structure/lattice/catwalk/mining, -/obj/effect/turf_decal/sand/plating/volcanic, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "KZ" = ( @@ -6053,10 +6068,14 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) "Lr" = ( -/obj/structure/railing, -/obj/structure/lattice/catwalk/mining, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, /obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/lava/smooth/lava_land_surface, +/turf/open/floor/plating/reinforced/lavaland, /area/lavaland/surface/outdoors) "Lu" = ( /obj/structure/marker_beacon/bronze, @@ -6105,7 +6124,7 @@ /area/ruin/interdyne_planetary_base) "LI" = ( /obj/machinery/camera/xray{ - pixel_x = 10; + pixel_x = 22; name = "Inderdyne security camera"; network = list("Interdyne"); color = "#adadcd"; @@ -6477,7 +6496,6 @@ /area/ruin/interdyne_planetary_base/cargo) "NW" = ( /obj/machinery/camera/xray{ - pixel_x = 10; name = "Inderdyne security camera"; network = list("Interdyne"); color = "#adadcd"; @@ -6648,6 +6666,8 @@ "OS" = ( /obj/structure/rack/shelf, /obj/effect/turf_decal/tile/dark/full, +/obj/item/melee/baton/security/loaded, +/obj/item/melee/baton/security/loaded, /obj/item/gun/energy/plasmacutter, /obj/item/gun/energy/plasmacutter, /obj/item/binoculars, @@ -6679,12 +6699,14 @@ /area/ruin/interdyne_planetary_base/cargo) "Pe" = ( /obj/effect/turf_decal/tile/dark/full, +/obj/structure/marker_beacon/burgundy, /obj/machinery/rnd/production/protolathe/offstation{ name = "Interdyne protolathe"; color = "#adadcd"; - light_color = "#adadcd" + light_color = "#adadcd"; + hacked = 1; + id = awa }, -/obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) "Pf" = ( @@ -6849,6 +6871,13 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/med) +"PL" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/effect/turf_decal/sand/plating/volcanic, +/turf/open/floor/plating/reinforced/lavaland, +/area/lavaland/surface/outdoors) "PP" = ( /obj/effect/turf_decal/trimline/dark/filled/line{ dir = 6 @@ -7038,13 +7067,16 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main) "Rd" = ( -/obj/structure/railing{ - dir = 8 +/obj/effect/turf_decal/stripes/blue{ + dir = 1 + }, +/obj/effect/turf_decal/caution/blue, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 }, -/obj/structure/lattice/catwalk/mining, /obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/lava/smooth/lava_land_surface, -/area/lavaland/surface/outdoors) +/turf/open/floor/plating/reinforced/lavaland, +/area/ruin/interdyne_planetary_base) "Rf" = ( /obj/structure/railing/corner{ dir = 4 @@ -7199,12 +7231,8 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv) "RS" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/lattice/catwalk/mining, -/obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/lava/smooth/lava_land_surface, +/obj/structure/lattice, +/turf/open/misc/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "RU" = ( /obj/structure/table/reinforced/plastitaniumglass, @@ -8158,8 +8186,15 @@ /area/ruin/interdyne_planetary_base/serv) "XB" = ( /obj/structure/fence/door, -/turf/open/misc/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/effect/turf_decal/sand/plating/volcanic, +/turf/open/floor/plating/reinforced/lavaland, +/area/ruin/interdyne_planetary_base) "XD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored{ chamber_id = "interdyneo2"; @@ -8257,12 +8292,14 @@ /area/ruin/interdyne_planetary_base/science) "Yv" = ( /obj/effect/turf_decal/tile/dark/full, +/obj/structure/marker_beacon/burgundy, /obj/machinery/rnd/production/circuit_imprinter/offstation{ name = "Interdyne circuit imprinter"; color = "#adadcd"; - light_color = "#adadcd" + light_color = "#adadcd"; + hacked = 1; + id = awa }, -/obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) "Yw" = ( @@ -9113,7 +9150,7 @@ BO ku pp oB -vT +pp aS HQ vT @@ -9169,7 +9206,7 @@ CH (12,1,1) = {" Nm BO -zn +Bx yq yq nr @@ -9227,15 +9264,15 @@ CH "} (13,1,1) = {" Nm -BO -zn +ZT +Bx nr OG OG OG nr OG -mo +pN eO BO ZT @@ -9345,7 +9382,7 @@ Co "} (15,1,1) = {" Nm -BO +Jt yt nr nr @@ -9353,7 +9390,7 @@ OG OG nr BZ -xN +te hY BO BO @@ -9522,7 +9559,7 @@ Co "} (18,1,1) = {" Nm -BO +ZT Ak uH nr @@ -9589,7 +9626,7 @@ OG OG nr OG -Lr +pN eO ZT eO @@ -9648,7 +9685,7 @@ nr nr uH yq -Lr +pN eO eO eO @@ -9706,7 +9743,7 @@ bX pu xB EE -RS +kJ rW eO eO @@ -9877,7 +9914,7 @@ Co (24,1,1) = {" JC dU -BO +ZT BO BO MQ @@ -9934,10 +9971,10 @@ Co Co "} (25,1,1) = {" -fU +ir LI -ZT -BO +RS +RS zr pu pN @@ -9993,18 +10030,18 @@ ZT Co "} (26,1,1) = {" -BO +zn BD -BO +Lr BO DY -lz +pu oU -Rd +pp zQ -Rd -Rd -Rd +pp +pp +pp cz dQ iY @@ -10052,10 +10089,10 @@ Co Co "} (27,1,1) = {" -BO +lz XB -BO -BO +PL +IZ Kh OG OG @@ -10111,18 +10148,18 @@ fU Co "} (28,1,1) = {" -BO +Rd BD BO -BO +xN Ph -RS -RS -RS +kJ +kJ +kJ Rf kJ -RS -RS +kJ +kJ Iw gh FO @@ -10172,8 +10209,8 @@ Co (29,1,1) = {" oh NW -BO -BO +RS +RS pn eO eO From 7cab53002c74e0468f918637f6859f9ad8ae0351 Mon Sep 17 00:00:00 2001 From: Astra Farera E'luna Awiarera Date: Sun, 24 Mar 2024 08:48:17 +0400 Subject: [PATCH 05/10] Tunguska and hidden dyne headset with id for cheeky miners. --- .../fluffy/icemoon_interdyne_base_ff.dmm | 307 +++++++++--------- .../fluffy/lavaland_interdyne_base_ff.dmm | 155 ++++----- 2 files changed, 240 insertions(+), 222 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm index 04abfcb2a2b..6544c22161c 100644 --- a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm +++ b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm @@ -977,6 +977,15 @@ /obj/effect/turf_decal/trimline/dark/filled/mid_joiner, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main) +"eB" = ( +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) "eC" = ( /obj/effect/turf_decal/trimline/dark/filled/corner{ dir = 1 @@ -1947,17 +1956,11 @@ }, /turf/open/floor/iron/dark/textured, /area/ruin/interdyne_planetary_base/main/dorms) -"lo" = ( -/obj/structure/flora/tree/pine/style_random, +"lq" = ( +/obj/structure/marker_beacon/burgundy, /obj/structure/flora/grass/brown/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) -"lp" = ( -/obj/effect/turf_decal/weather/snow{ - layer = 3 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/underground/explored) "lu" = ( /obj/effect/turf_decal/stripes/red/corner{ dir = 4 @@ -2013,6 +2016,10 @@ /obj/structure/flora/tree/jungle/small/style_random, /turf/open/floor/grass, /area/ruin/interdyne_planetary_base/main) +"lS" = ( +/obj/structure/flora/rock/pile/icy/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/ruin/interdyne_planetary_base) "lT" = ( /obj/effect/turf_decal/stripes/red/line, /obj/effect/turf_decal/trimline/dark/filled/line, @@ -2138,6 +2145,11 @@ }, /turf/open/floor/engine/hull/reinforced/icemoon, /area/icemoon/underground/explored) +"mT" = ( +/obj/structure/flora/tree/pine/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "mV" = ( /obj/effect/turf_decal/tile/dark/full, /obj/machinery/camera/xray/directional/north{ @@ -3100,10 +3112,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) -"sh" = ( -/obj/structure/flora/ash/chilly, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "sm" = ( /obj/effect/turf_decal/vg_decals/atmos/air, /obj/effect/turf_decal/trimline/dark/filled/line{ @@ -3216,7 +3224,7 @@ layer = 3 }, /obj/effect/turf_decal/weather/snow/corner{ - dir = 5 + dir = 4 }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) @@ -3449,6 +3457,10 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main) +"tP" = ( +/obj/structure/flora/bush/flowers_br/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "tS" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -3591,6 +3603,15 @@ /obj/structure/marker_beacon/purple, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/serv) +"uJ" = ( +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 5 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) "uM" = ( /obj/structure/railing{ dir = 4 @@ -3800,10 +3821,6 @@ /obj/effect/mob_spawn/ghost_role/human/interdyne_planetary_base/deck_officer/ice, /turf/open/floor/iron/dark/textured, /area/ruin/interdyne_planetary_base/main/dorms) -"wd" = ( -/obj/structure/flora/bush/flowers_br/style_random, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "wl" = ( /obj/structure/chair/sofa/bench/right{ dir = 8 @@ -3978,15 +3995,6 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) -"wS" = ( -/obj/effect/turf_decal/weather/snow{ - layer = 3 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/underground/explored) "wU" = ( /obj/structure/bookcase/random/religion, /turf/open/floor/wood/large, @@ -4019,11 +4027,6 @@ }, /turf/open/floor/iron/dark/textured, /area/ruin/interdyne_planetary_base/serv) -"xk" = ( -/obj/structure/marker_beacon/burgundy, -/obj/structure/flora/grass/brown/style_random, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "xl" = ( /obj/effect/turf_decal/trimline/dark/filled/corner{ dir = 4 @@ -4095,6 +4098,11 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/ruin/interdyne_planetary_base) +"xH" = ( +/obj/structure/flora/grass/both/style_random, +/obj/structure/flora/tree/pine/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "xP" = ( /obj/effect/turf_decal/trimline/dark/filled/line{ dir = 8 @@ -4169,6 +4177,15 @@ }, /turf/open/floor/iron/dark, /area/ruin/interdyne_planetary_base/main) +"yk" = ( +/obj/item/reagent_containers/cup/glass/bottle/vodka{ + pixel_x = -9 + }, +/obj/item/radio/headset/interdyne, +/obj/structure/marker_beacon/cerulean, +/obj/item/card/id/advanced/chameleon/black, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "yn" = ( /obj/effect/turf_decal/stripes/red/line, /obj/effect/turf_decal/stripes/red/line{ @@ -4370,6 +4387,11 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/med) +"zr" = ( +/obj/structure/flora/tree/pine/style_random, +/obj/structure/flora/grass/brown/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "zu" = ( /obj/machinery/vending/clothing{ onstation = 0 @@ -4476,22 +4498,6 @@ }, /turf/closed/mineral/random/snow/underground, /area/icemoon/underground/explored) -"Ay" = ( -/obj/effect/turf_decal/stripes/blue{ - dir = 1 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4; - layer = 3 - }, -/obj/effect/turf_decal/weather/snow{ - layer = 3 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/ruin/interdyne_planetary_base) "AF" = ( /obj/machinery/light/directional/north{ bulb_colour = "#AC3CFF"; @@ -5041,11 +5047,6 @@ /obj/effect/mapping_helpers/apc/syndicate_access, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) -"DM" = ( -/obj/structure/flora/grass/both/style_random, -/obj/structure/flora/tree/pine/style_random, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "DN" = ( /obj/structure/flora/grass/brown/style_random, /obj/structure/shipping_container/interdyne, @@ -5093,6 +5094,22 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) +"Eg" = ( +/obj/effect/turf_decal/stripes/blue{ + dir = 1 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4; + layer = 3 + }, +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/ruin/interdyne_planetary_base) "Eh" = ( /obj/effect/turf_decal/trimline/dark/filled/line, /obj/effect/turf_decal/trimline/dark/filled/line{ @@ -5839,6 +5856,12 @@ }, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/main) +"HW" = ( +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) "Ib" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/door/window/survival_pod/left/directional/north, @@ -6008,10 +6031,6 @@ /obj/structure/bookcase/random, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/serv) -"Ju" = ( -/obj/structure/flora/rock/pile/icy/style_random, -/turf/open/misc/asteroid/snow/icemoon, -/area/ruin/interdyne_planetary_base) "Jx" = ( /obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, @@ -6020,15 +6039,6 @@ /obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/ruin/interdyne_planetary_base/main) -"JC" = ( -/obj/effect/turf_decal/weather/snow{ - layer = 3 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/underground/explored) "JM" = ( /obj/structure/flora/grass/brown/style_random, /obj/structure/flora/grass/brown/style_random, @@ -6067,6 +6077,10 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) +"JR" = ( +/obj/structure/flora/ash/chilly, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "JV" = ( /obj/structure/flora/rock/pile/icy/style_random, /obj/structure/flora/tree/pine/style_random, @@ -6408,6 +6422,22 @@ }, /turf/open/water/hot_spring, /area/icemoon/underground/explored) +"LJ" = ( +/obj/effect/turf_decal/stripes/blue{ + dir = 1 + }, +/obj/effect/turf_decal/caution/blue, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/ruin/interdyne_planetary_base) "LK" = ( /obj/effect/turf_decal/trimline/dark/filled/mid_joiner, /obj/effect/turf_decal/trimline/dark/filled/line{ @@ -6773,6 +6803,15 @@ }, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/main) +"On" = ( +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 9 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) "Os" = ( /obj/machinery/chem_master{ name = "Interdyne ChemMaster"; @@ -7055,22 +7094,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main) -"PN" = ( -/obj/effect/turf_decal/stripes/blue{ - dir = 1 - }, -/obj/effect/turf_decal/caution/blue, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 10 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/obj/effect/turf_decal/weather/snow{ - layer = 3 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/ruin/interdyne_planetary_base) "PO" = ( /obj/structure/cable, /turf/open/floor/iron/dark/textured_large, @@ -7328,15 +7351,6 @@ }, /turf/open/floor/engine, /area/ruin/interdyne_planetary_base/science) -"Sy" = ( -/obj/effect/turf_decal/weather/snow{ - layer = 3 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 8 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/underground/explored) "SG" = ( /obj/effect/turf_decal/trimline/dark/filled/corner{ dir = 1 @@ -8135,11 +8149,6 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv) -"WO" = ( -/obj/structure/flora/tree/pine/style_random, -/obj/structure/flora/bush/flowers_br/style_random, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "WS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -8784,7 +8793,7 @@ ac ac SH Iy -lo +zr Im ac ac @@ -8911,7 +8920,7 @@ GV eE Iy dM -sh +JR Iy Iy uQ @@ -8956,18 +8965,18 @@ Iy eE Iy Iy -lo +zr Iy Se BM Iy SH -wd +tP ab ab Iy Se -wd +tP Se Iy SH @@ -8975,7 +8984,7 @@ Iy ab ab ab -wd +tP Iy JM Se @@ -9043,7 +9052,7 @@ Iy dM Iy Im -lo +zr ac ac ac @@ -9073,7 +9082,7 @@ SH Iy Se Iy -sh +JR Iy Iy Iy @@ -9099,7 +9108,7 @@ Se Iy SH Iy -sh +JR Iy Iy Iy @@ -9188,7 +9197,7 @@ Iy Iy eE Iy -wd +tP Iy Iy Iy @@ -9295,7 +9304,7 @@ ac ac eE AR -DM +xH Im Iy Iy @@ -9339,7 +9348,7 @@ ab ab ab ab -wd +tP Iy SM Ps @@ -9352,7 +9361,7 @@ aa ac ac JV -wd +tP dM Se LE @@ -9697,7 +9706,7 @@ ab ab dM Iy -sh +JR SH ac ac @@ -9714,8 +9723,8 @@ Iy Iy Iy Iy -sh -wd +JR +tP ab ab ab @@ -9765,7 +9774,7 @@ ac Lh Im Iy -WO +mT Iy SH BM @@ -9815,7 +9824,7 @@ ab ab ab ab -wd +tP Se ac ac @@ -10000,7 +10009,7 @@ ac (23,1,1) = {" Lh ac -sh +JR Se Iy Iy @@ -10060,7 +10069,7 @@ ac Au io Se -wd +tP mN ab ab @@ -10175,10 +10184,10 @@ ac ac "} (26,1,1) = {" -PN +LJ YZ -wS -Sy +On +eB wN jn Gh @@ -10234,10 +10243,10 @@ ac ac "} (27,1,1) = {" -Ay +Eg xF -JC -lp +sO +HW Tn ai ai @@ -10293,10 +10302,10 @@ ac ac "} (28,1,1) = {" -Ju +lS NF Iy -sO +uJ ME uM ma @@ -10346,7 +10355,7 @@ vt NS Se ab -wd +tP Iy ac ac @@ -10359,7 +10368,7 @@ Iy kr ab SH -sh +JR tT dM ab @@ -10415,7 +10424,7 @@ ac IS dT Iy -wd +tP ab ab ab @@ -10482,7 +10491,7 @@ ab ab Pv ab -sh +JR sP BF BF @@ -10531,7 +10540,7 @@ ac (32,1,1) = {" Lh ac -Iy +yk Iy SM Iy @@ -10589,7 +10598,7 @@ ac "} (33,1,1) = {" Lh -WO +mT Im SH eE @@ -10642,8 +10651,8 @@ ab ab dk ab -sh -xk +JR +lq ac "} (34,1,1) = {" @@ -10656,7 +10665,7 @@ Se SH Iy uQ -wd +tP ab ab ab @@ -10710,7 +10719,7 @@ Jb ac ac Jx -sh +JR Iy Iy Se @@ -10771,7 +10780,7 @@ ac eE Iy SH -lo +zr Iy Iy dM @@ -10889,7 +10898,7 @@ ac ac Iy Iy -WO +mT Se pv WU @@ -11009,10 +11018,10 @@ ac ac SM Iy -sh +JR Iy Iy -WO +mT Iy dM ab @@ -11051,7 +11060,7 @@ ab ab ab ab -wd +tP SH Iy ac @@ -11193,7 +11202,7 @@ Iy Iy Se Iy -sh +JR ab ab ab @@ -11253,7 +11262,7 @@ eE Iy Iy Iy -wd +tP ab ab ab @@ -11341,7 +11350,7 @@ ab ab ab SH -wd +tP Iy Iy Iy @@ -11389,7 +11398,7 @@ Iy ab ab ab -wd +tP SH ab ab @@ -11460,7 +11469,7 @@ Iy Iy Iy eE -sh +JR Im Iy uQ @@ -11489,11 +11498,11 @@ ac ac eE Se -sh +JR Iy dM DQ -wd +tP Iy dM ab @@ -11571,8 +11580,8 @@ ab Iy SH Iy -wd -sh +tP +JR Se Iy SH @@ -11618,7 +11627,7 @@ Iy Iy dM Iy -sh +JR ab ab ab @@ -11673,7 +11682,7 @@ ac ac ac ac -xk +lq SH ac ac diff --git a/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm b/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm index ce7048ab395..1d09dad768b 100644 --- a/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm +++ b/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm @@ -817,6 +817,16 @@ "eC" = ( /turf/closed/wall/r_wall/syndicate, /area/ruin/interdyne_planetary_base/science) +"eF" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/effect/turf_decal/sand/plating/volcanic, +/turf/open/floor/plating/reinforced/lavaland, +/area/lavaland/surface/outdoors) "eH" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/light/directional/north, @@ -1354,11 +1364,6 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) -"ir" = ( -/obj/structure/lattice, -/obj/structure/marker_beacon/cerulean, -/turf/open/misc/asteroid/basalt/lava_land_surface, -/area/ruin/interdyne_planetary_base) "it" = ( /obj/effect/turf_decal/stripes/red/line, /obj/structure/window/reinforced/survival_pod/spawner/directional/south{ @@ -1828,12 +1833,9 @@ /turf/open/floor/plating/reinforced, /area/ruin/interdyne_planetary_base/med) "kJ" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/lattice/catwalk/mining, -/turf/open/lava/smooth/lava_land_surface, -/area/lavaland/surface/outdoors) +/obj/structure/flora/rock/pile/style_random, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/interdyne_planetary_base) "kL" = ( /obj/effect/turf_decal/box/white/corners{ dir = 4 @@ -1952,15 +1954,14 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/interdyne_planetary_base) "lz" = ( -/obj/effect/turf_decal/stripes/blue{ - dir = 1 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 9 +/obj/item/reagent_containers/cup/glass/bottle/vodka{ + pixel_x = -9 }, -/obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/floor/plating/reinforced/lavaland, -/area/ruin/interdyne_planetary_base) +/obj/item/radio/headset/interdyne, +/obj/structure/marker_beacon/cerulean, +/obj/item/card/id/advanced/chameleon/black, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) "lA" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -3800,11 +3801,8 @@ /turf/open/floor/engine, /area/ruin/interdyne_planetary_base/science) "xN" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/floor/plating/reinforced/lavaland, +/obj/structure/lattice, +/turf/open/misc/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "xR" = ( /obj/effect/turf_decal/trimline/dark/filled/line, @@ -4110,9 +4108,12 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) "zn" = ( -/obj/structure/flora/rock/pile/style_random, -/turf/open/misc/asteroid/basalt/lava_land_surface, -/area/ruin/interdyne_planetary_base) +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/effect/turf_decal/sand/plating/volcanic, +/turf/open/floor/plating/reinforced/lavaland, +/area/lavaland/surface/outdoors) "zq" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -4870,6 +4871,16 @@ }, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/main) +"Er" = ( +/obj/effect/turf_decal/stripes/blue{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/effect/turf_decal/sand/plating/volcanic, +/turf/open/floor/plating/reinforced/lavaland, +/area/ruin/interdyne_planetary_base) "Et" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5609,13 +5620,6 @@ }, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/serv) -"IZ" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/floor/plating/reinforced/lavaland, -/area/lavaland/surface/outdoors) "Jb" = ( /obj/effect/turf_decal/trimline/dark/filled/line{ dir = 4 @@ -6068,15 +6072,16 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) "Lr" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 10 +/obj/effect/turf_decal/stripes/blue{ + dir = 1 }, +/obj/effect/turf_decal/caution/blue, /obj/effect/turf_decal/weather/dirt{ - dir = 1 + dir = 5 }, /obj/effect/turf_decal/sand/plating/volcanic, /turf/open/floor/plating/reinforced/lavaland, -/area/lavaland/surface/outdoors) +/area/ruin/interdyne_planetary_base) "Lu" = ( /obj/structure/marker_beacon/bronze, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -6871,13 +6876,6 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/med) -"PL" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/floor/plating/reinforced/lavaland, -/area/lavaland/surface/outdoors) "PP" = ( /obj/effect/turf_decal/trimline/dark/filled/line{ dir = 6 @@ -7030,6 +7028,13 @@ }, /turf/open/floor/iron/dark/textured, /area/ruin/interdyne_planetary_base/serv) +"QM" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/effect/turf_decal/sand/plating/volcanic, +/turf/open/floor/plating/reinforced/lavaland, +/area/lavaland/surface/outdoors) "QP" = ( /obj/effect/turf_decal/tile/dark/full, /obj/machinery/seed_extractor{ @@ -7067,16 +7072,12 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main) "Rd" = ( -/obj/effect/turf_decal/stripes/blue{ - dir = 1 - }, -/obj/effect/turf_decal/caution/blue, /obj/effect/turf_decal/weather/dirt{ - dir = 5 + dir = 4 }, /obj/effect/turf_decal/sand/plating/volcanic, /turf/open/floor/plating/reinforced/lavaland, -/area/ruin/interdyne_planetary_base) +/area/lavaland/surface/outdoors) "Rf" = ( /obj/structure/railing/corner{ dir = 4 @@ -7231,14 +7232,22 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv) "RS" = ( -/obj/structure/lattice, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) "RU" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/effect/turf_decal/tile/dark/full, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/med) +"RX" = ( +/obj/structure/lattice, +/obj/structure/marker_beacon/cerulean, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/interdyne_planetary_base) "Sc" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/effect/turf_decal/tile/dark/full, @@ -9743,7 +9752,7 @@ bX pu xB EE -kJ +RS rW eO eO @@ -9857,7 +9866,7 @@ Nm Co BO ZT -BO +lz MQ pN eO @@ -9971,10 +9980,10 @@ Co Co "} (25,1,1) = {" -ir +RX LI -RS -RS +xN +xN zr pu pN @@ -10030,9 +10039,9 @@ ZT Co "} (26,1,1) = {" -zn +kJ BD -Lr +eF BO DY pu @@ -10089,10 +10098,10 @@ Co Co "} (27,1,1) = {" -lz +Er XB -PL -IZ +Rd +QM Kh OG OG @@ -10148,18 +10157,18 @@ fU Co "} (28,1,1) = {" -Rd +Lr BD BO -xN +zn Ph -kJ -kJ -kJ +RS +RS +RS Rf -kJ -kJ -kJ +RS +RS +RS Iw gh FO @@ -10209,8 +10218,8 @@ Co (29,1,1) = {" oh NW -RS -RS +xN +xN pn eO eO From cacada2352dbae5522dd0173d218da4c560143c3 Mon Sep 17 00:00:00 2001 From: Astra Farera E'luna Awiarera Date: Sun, 24 Mar 2024 18:35:08 +0400 Subject: [PATCH 06/10] Tiny secrets, some random spawners --- .../fluffy/icemoon_interdyne_base_ff.dmm | 413 ++++++++++-------- .../fluffy/lavaland_interdyne_base_ff.dmm | 298 ++++++++----- 2 files changed, 407 insertions(+), 304 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm index 6544c22161c..c631028df8b 100644 --- a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm +++ b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm @@ -77,6 +77,7 @@ /area/ruin/interdyne_planetary_base/science) "ap" = ( /obj/structure/table/wood/fancy, +/obj/effect/spawner/random/exotic/languagebook, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/serv) "ar" = ( @@ -194,6 +195,7 @@ dir = 1 }, /obj/structure/table/wood/fancy/black, +/obj/effect/spawner/random/food_or_drink, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv) "bf" = ( @@ -387,6 +389,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured, /area/ruin/interdyne_planetary_base/serv/rstrm) +"bZ" = ( +/obj/structure/fluff/metalpole/end{ + dir = 1 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) "ce" = ( /obj/item/tank/internals/oxygen/yellow, /obj/item/tank/internals/oxygen/yellow, @@ -642,7 +650,6 @@ /obj/effect/turf_decal/weather/snow{ layer = 3 }, -/obj/structure/marker_beacon/cerulean, /turf/open/floor/plating/snowed/icemoon, /area/ruin/interdyne_planetary_base) "db" = ( @@ -952,6 +959,7 @@ pixel_x = -8; pixel_y = 6 }, +/obj/item/sharpener, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv) "ex" = ( @@ -977,15 +985,6 @@ /obj/effect/turf_decal/trimline/dark/filled/mid_joiner, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main) -"eB" = ( -/obj/effect/turf_decal/weather/snow{ - layer = 3 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 8 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/underground/explored) "eC" = ( /obj/effect/turf_decal/trimline/dark/filled/corner{ dir = 1 @@ -1193,6 +1192,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) +"gk" = ( +/obj/structure/marker_beacon/burgundy, +/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "gm" = ( /obj/structure/closet/secure_closet/freezer/meat{ req_access = list("syndicate"); @@ -1240,6 +1244,7 @@ dir = 5 }, /obj/structure/hedge, +/obj/item/decoration/new_year/garland, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/main) "gy" = ( @@ -1956,11 +1961,6 @@ }, /turf/open/floor/iron/dark/textured, /area/ruin/interdyne_planetary_base/main/dorms) -"lq" = ( -/obj/structure/marker_beacon/burgundy, -/obj/structure/flora/grass/brown/style_random, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "lu" = ( /obj/effect/turf_decal/stripes/red/corner{ dir = 4 @@ -2016,10 +2016,6 @@ /obj/structure/flora/tree/jungle/small/style_random, /turf/open/floor/grass, /area/ruin/interdyne_planetary_base/main) -"lS" = ( -/obj/structure/flora/rock/pile/icy/style_random, -/turf/open/misc/asteroid/snow/icemoon, -/area/ruin/interdyne_planetary_base) "lT" = ( /obj/effect/turf_decal/stripes/red/line, /obj/effect/turf_decal/trimline/dark/filled/line, @@ -2054,7 +2050,6 @@ /area/icemoon/underground/explored) "mg" = ( /obj/structure/flora/grass/both/style_random, -/obj/structure/marker_beacon/cerulean, /turf/open/misc/asteroid/snow/icemoon, /area/ruin/interdyne_planetary_base) "mp" = ( @@ -2145,11 +2140,6 @@ }, /turf/open/floor/engine/hull/reinforced/icemoon, /area/icemoon/underground/explored) -"mT" = ( -/obj/structure/flora/tree/pine/style_random, -/obj/structure/flora/bush/flowers_br/style_random, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "mV" = ( /obj/effect/turf_decal/tile/dark/full, /obj/machinery/camera/xray/directional/north{ @@ -2624,6 +2614,9 @@ }, /obj/item/towel, /obj/item/towel, +/obj/effect/spawner/random/bedsheet/double, +/obj/effect/spawner/random/contraband, +/obj/effect/spawner/random/clothing/syndie, /turf/open/floor/iron/dark/textured, /area/ruin/interdyne_planetary_base/serv/rstrm) "oU" = ( @@ -2793,6 +2786,11 @@ /obj/structure/cable, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/main) +"pJ" = ( +/obj/structure/flora/grass/both/style_random, +/obj/structure/flora/tree/pine/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "pK" = ( /obj/machinery/computer/pandemic{ name = "Interdyne PanD.E.M.I.C"; @@ -3184,6 +3182,12 @@ /obj/effect/turf_decal/trimline/dark/filled/mid_joiner, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main) +"sC" = ( +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) "sE" = ( /obj/effect/turf_decal/trimline/dark/filled/corner{ dir = 8 @@ -3224,7 +3228,7 @@ layer = 3 }, /obj/effect/turf_decal/weather/snow/corner{ - dir = 4 + dir = 5 }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) @@ -3457,10 +3461,6 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main) -"tP" = ( -/obj/structure/flora/bush/flowers_br/style_random, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "tS" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -3603,15 +3603,6 @@ /obj/structure/marker_beacon/purple, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/serv) -"uJ" = ( -/obj/effect/turf_decal/weather/snow{ - layer = 3 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/underground/explored) "uM" = ( /obj/structure/railing{ dir = 4 @@ -3624,6 +3615,7 @@ dir = 9 }, /obj/structure/hedge, +/obj/item/decoration/new_year/garland, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/main) "uQ" = ( @@ -3995,6 +3987,10 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) +"wQ" = ( +/obj/structure/fluff/metalpole/end, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) "wU" = ( /obj/structure/bookcase/random/religion, /turf/open/floor/wood/large, @@ -4098,11 +4094,6 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/ruin/interdyne_planetary_base) -"xH" = ( -/obj/structure/flora/grass/both/style_random, -/obj/structure/flora/tree/pine/style_random, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "xP" = ( /obj/effect/turf_decal/trimline/dark/filled/line{ dir = 8 @@ -4177,15 +4168,6 @@ }, /turf/open/floor/iron/dark, /area/ruin/interdyne_planetary_base/main) -"yk" = ( -/obj/item/reagent_containers/cup/glass/bottle/vodka{ - pixel_x = -9 - }, -/obj/item/radio/headset/interdyne, -/obj/structure/marker_beacon/cerulean, -/obj/item/card/id/advanced/chameleon/black, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "yn" = ( /obj/effect/turf_decal/stripes/red/line, /obj/effect/turf_decal/stripes/red/line{ @@ -4314,6 +4296,10 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) +"yH" = ( +/obj/structure/flora/ash/chilly, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "yJ" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -4371,6 +4357,11 @@ /obj/structure/cable, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/serv) +"zm" = ( +/obj/structure/marker_beacon/burgundy, +/obj/structure/flora/grass/brown/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "zp" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/stack/sheet/mineral/plasma{ @@ -4387,11 +4378,6 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/med) -"zr" = ( -/obj/structure/flora/tree/pine/style_random, -/obj/structure/flora/grass/brown/style_random, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "zu" = ( /obj/machinery/vending/clothing{ onstation = 0 @@ -4498,6 +4484,11 @@ }, /turf/closed/mineral/random/snow/underground, /area/icemoon/underground/explored) +"AE" = ( +/obj/structure/flora/tree/pine/style_random, +/obj/structure/flora/bush/flowers_br/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "AF" = ( /obj/machinery/light/directional/north{ bulb_colour = "#AC3CFF"; @@ -4516,14 +4507,13 @@ /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/serv) "AJ" = ( -/obj/structure/railing{ - dir = 8 +/obj/effect/turf_decal/weather/snow{ + layer = 3 }, -/obj/structure/lattice/catwalk/mining, /obj/effect/turf_decal/weather/snow/corner{ - dir = 8 + dir = 4 }, -/turf/open/lava/plasma/ice_moon, +/turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) "AR" = ( /obj/effect/decal/remains/human, @@ -4701,6 +4691,7 @@ /obj/effect/turf_decal/trimline/dark/filled/mid_joiner{ dir = 8 }, +/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner, /turf/open/floor/engine, /area/ruin/interdyne_planetary_base/med) "Cc" = ( @@ -4957,6 +4948,15 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) +"Du" = ( +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) "DA" = ( /obj/effect/turf_decal/trimline/dark/filled/line{ dir = 10 @@ -5094,22 +5094,6 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) -"Eg" = ( -/obj/effect/turf_decal/stripes/blue{ - dir = 1 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4; - layer = 3 - }, -/obj/effect/turf_decal/weather/snow{ - layer = 3 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/ruin/interdyne_planetary_base) "Eh" = ( /obj/effect/turf_decal/trimline/dark/filled/line, /obj/effect/turf_decal/trimline/dark/filled/line{ @@ -5443,6 +5427,22 @@ }, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/main) +"FN" = ( +/obj/effect/turf_decal/stripes/blue{ + dir = 1 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4; + layer = 3 + }, +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/ruin/interdyne_planetary_base) "FO" = ( /obj/effect/turf_decal/trimline/dark/filled/line{ dir = 4 @@ -5856,18 +5856,18 @@ }, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/main) -"HW" = ( -/obj/effect/turf_decal/weather/snow{ - layer = 3 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/underground/explored) "Ib" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/door/window/survival_pod/left/directional/north, /obj/effect/turf_decal/tile/dark/full, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/med) +"Id" = ( +/obj/structure/fluff/metalpole/end{ + dir = 4 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) "Ie" = ( /obj/effect/turf_decal/trimline/dark/filled/corner{ dir = 4 @@ -6022,6 +6022,20 @@ }, /turf/open/water/hot_spring, /area/icemoon/underground/explored) +"Jh" = ( +/obj/structure/flora/tree/pine/style_random, +/obj/structure/flora/grass/brown/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) +"Ji" = ( +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 9 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/underground/explored) "Jo" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /obj/structure/fans/tiny/forcefield, @@ -6077,15 +6091,16 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) -"JR" = ( -/obj/structure/flora/ash/chilly, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "JV" = ( /obj/structure/flora/rock/pile/icy/style_random, /obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) +"JY" = ( +/obj/effect/turf_decal/tile/dark/full, +/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner, +/turf/open/floor/plating/elevatorshaft, +/area/ruin/interdyne_planetary_base/cargo) "Kb" = ( /obj/effect/turf_decal/arrows/red, /obj/effect/turf_decal/box/red/corners, @@ -6215,6 +6230,10 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/med) +"KQ" = ( +/obj/structure/flora/bush/flowers_br/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "KS" = ( /obj/effect/turf_decal/trimline/dark/filled/corner{ dir = 8 @@ -6422,22 +6441,6 @@ }, /turf/open/water/hot_spring, /area/icemoon/underground/explored) -"LJ" = ( -/obj/effect/turf_decal/stripes/blue{ - dir = 1 - }, -/obj/effect/turf_decal/caution/blue, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 10 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 1 - }, -/obj/effect/turf_decal/weather/snow{ - layer = 3 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/ruin/interdyne_planetary_base) "LK" = ( /obj/effect/turf_decal/trimline/dark/filled/mid_joiner, /obj/effect/turf_decal/trimline/dark/filled/line{ @@ -6691,6 +6694,13 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv) +"NA" = ( +/obj/structure/flora/rock/pile/icy/style_random, +/obj/structure/fluff/metalpole/end{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "NB" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -6711,6 +6721,7 @@ dir = 5 }, /obj/effect/turf_decal/weather/snow/corner, +/obj/structure/marker_beacon/cerulean, /turf/open/floor/plating/snowed/icemoon, /area/ruin/interdyne_planetary_base) "NI" = ( @@ -6803,15 +6814,6 @@ }, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/main) -"On" = ( -/obj/effect/turf_decal/weather/snow{ - layer = 3 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 9 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/underground/explored) "Os" = ( /obj/machinery/chem_master{ name = "Interdyne ChemMaster"; @@ -6835,6 +6837,12 @@ }, /turf/open/floor/engine, /area/ruin/interdyne_planetary_base/science) +"Ox" = ( +/obj/structure/fluff/metalpole/end{ + dir = 8 + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) "Oz" = ( /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/flowers_pp/style_random, @@ -7122,6 +7130,22 @@ /obj/machinery/atmospherics/components/unary/portables_connector, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main) +"Qj" = ( +/obj/effect/turf_decal/stripes/blue{ + dir = 1 + }, +/obj/effect/turf_decal/caution/blue, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/obj/effect/turf_decal/weather/snow{ + layer = 3 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/ruin/interdyne_planetary_base) "Qq" = ( /obj/effect/turf_decal/tile/dark/full, /obj/machinery/seed_extractor{ @@ -7526,6 +7550,12 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) +"Tw" = ( +/obj/structure/fence/cut/large{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "TB" = ( /obj/machinery/biogenerator, /obj/machinery/door/window/survival_pod/left/directional/west{ @@ -7554,6 +7584,9 @@ }, /obj/item/towel, /obj/item/towel, +/obj/effect/spawner/random/bedsheet/double, +/obj/effect/spawner/random/contraband, +/obj/effect/spawner/random/clothing/syndie, /turf/open/floor/iron/dark/textured, /area/ruin/interdyne_planetary_base/serv/rstrm) "TI" = ( @@ -8404,6 +8437,10 @@ }, /turf/open/floor/grass, /area/ruin/interdyne_planetary_base/serv) +"Yw" = ( +/obj/structure/flora/rock/pile/icy/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/ruin/interdyne_planetary_base) "YA" = ( /obj/effect/turf_decal/trimline/dark/filled/corner{ dir = 1 @@ -8435,6 +8472,15 @@ }, /turf/open/floor/engine, /area/ruin/interdyne_planetary_base/science) +"YH" = ( +/obj/item/reagent_containers/cup/glass/bottle/vodka{ + pixel_x = -9 + }, +/obj/item/radio/headset/interdyne, +/obj/structure/marker_beacon/cerulean, +/obj/item/card/id/advanced/chameleon/black, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "YI" = ( /obj/effect/turf_decal/trimline/dark/filled/line{ dir = 1 @@ -8526,6 +8572,7 @@ /obj/structure/fence{ dir = 4 }, +/obj/structure/marker_beacon/cerulean, /turf/open/misc/asteroid/snow/icemoon, /area/ruin/interdyne_planetary_base) "Zg" = ( @@ -8793,7 +8840,7 @@ ac ac SH Iy -zr +Jh Im ac ac @@ -8920,7 +8967,7 @@ GV eE Iy dM -JR +yH Iy Iy uQ @@ -8965,18 +9012,18 @@ Iy eE Iy Iy -zr +Jh Iy Se BM Iy SH -tP +KQ ab ab Iy Se -tP +KQ Se Iy SH @@ -8984,7 +9031,7 @@ Iy ab ab ab -tP +KQ Iy JM Se @@ -9052,7 +9099,7 @@ Iy dM Iy Im -zr +Jh ac ac ac @@ -9082,7 +9129,7 @@ SH Iy Se Iy -JR +yH Iy Iy Iy @@ -9108,7 +9155,7 @@ Se Iy SH Iy -JR +yH Iy Iy Iy @@ -9197,7 +9244,7 @@ Iy Iy eE Iy -tP +KQ Iy Iy Iy @@ -9207,7 +9254,7 @@ ab ab ab ab -ab +Ox yP kf kf @@ -9219,7 +9266,7 @@ kf Fg dL Zr -ab +Ox ab ab ab @@ -9304,7 +9351,7 @@ ac ac eE AR -xH +pJ Im Iy Iy @@ -9348,7 +9395,7 @@ ab ab ab ab -tP +KQ Iy SM Ps @@ -9361,7 +9408,7 @@ aa ac ac JV -tP +KQ dM Se LE @@ -9706,7 +9753,7 @@ ab ab dM Iy -JR +yH SH ac ac @@ -9723,8 +9770,8 @@ Iy Iy Iy Iy -JR -tP +yH +KQ ab ab ab @@ -9774,7 +9821,7 @@ ac Lh Im Iy -mT +AE Iy SH BM @@ -9824,7 +9871,7 @@ ab ab ab ab -tP +KQ Se ac ac @@ -9903,7 +9950,7 @@ ab ab ab ab -ab +bZ GI kf kf @@ -9939,7 +9986,7 @@ ES ef Sm td -ab +wQ ab Pn ab @@ -10009,7 +10056,7 @@ ac (23,1,1) = {" Lh ac -JR +yH Se Iy Iy @@ -10069,7 +10116,7 @@ ac Au io Se -tP +KQ mN ab ab @@ -10184,18 +10231,18 @@ ac ac "} (26,1,1) = {" -LJ +Qj YZ -On -eB +Ji +Du wN jn Gh GZ Uj jn -AJ -AJ +jn +jn oB pp YS @@ -10243,10 +10290,10 @@ ac ac "} (27,1,1) = {" -Eg +FN xF -sO -HW +AJ +sC Tn ai ai @@ -10267,7 +10314,7 @@ PO Kb bv er -dP +JY dP ZU LC @@ -10302,10 +10349,10 @@ ac ac "} (28,1,1) = {" -lS +Yw NF Iy -uJ +sO ME uM ma @@ -10355,7 +10402,7 @@ vt NS Se ab -tP +KQ Iy ac ac @@ -10368,7 +10415,7 @@ Iy kr ab SH -JR +yH tT dM ab @@ -10424,7 +10471,7 @@ ac IS dT Iy -tP +KQ ab ab ab @@ -10491,7 +10538,7 @@ ab ab Pv ab -JR +Iy sP BF BF @@ -10540,7 +10587,7 @@ ac (32,1,1) = {" Lh ac -yk +YH Iy SM Iy @@ -10598,8 +10645,8 @@ ac "} (33,1,1) = {" Lh -mT -Im +AE +gk SH eE Iy @@ -10647,17 +10694,17 @@ GB tS jy td -ab +wQ ab dk ab -JR -lq +yH +zm ac "} (34,1,1) = {" -Lh -ac +Tw +Iy Iy eE Iy @@ -10665,7 +10712,7 @@ Se SH Iy uQ -tP +KQ ab ab ab @@ -10719,7 +10766,7 @@ Jb ac ac Jx -JR +yH Iy Iy Se @@ -10780,7 +10827,7 @@ ac eE Iy SH -zr +Jh Iy Iy dM @@ -10844,7 +10891,7 @@ SH NI lg Iy -Iy +yH ab ab ab @@ -10898,7 +10945,7 @@ ac ac Iy Iy -mT +AE Se pv WU @@ -11018,10 +11065,10 @@ ac ac SM Iy -JR +yH Iy Iy -mT +AE Iy dM ab @@ -11060,7 +11107,7 @@ ab ab ab ab -tP +KQ SH Iy ac @@ -11202,7 +11249,7 @@ Iy Iy Se Iy -JR +yH ab ab ab @@ -11262,7 +11309,7 @@ eE Iy Iy Iy -tP +KQ ab ab ab @@ -11270,7 +11317,7 @@ ab ab ab ab -SH +NA Mn yQ yQ @@ -11331,7 +11378,7 @@ ab ab ab ab -ab +Id Mn yQ yQ @@ -11343,14 +11390,14 @@ yQ NV zF Pw -ab +Id ab ab ab ab ab SH -tP +KQ Iy Iy Iy @@ -11398,7 +11445,7 @@ Iy ab ab ab -tP +KQ SH ab ab @@ -11469,7 +11516,7 @@ Iy Iy Iy eE -JR +yH Im Iy uQ @@ -11498,11 +11545,11 @@ ac ac eE Se -JR +yH Iy dM DQ -tP +KQ Iy dM ab @@ -11580,8 +11627,8 @@ ab Iy SH Iy -tP -JR +KQ +yH Se Iy SH @@ -11627,7 +11674,7 @@ Iy Iy dM Iy -JR +yH ab ab ab @@ -11682,7 +11729,7 @@ ac ac ac ac -lq +zm SH ac ac diff --git a/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm b/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm index 1d09dad768b..95b44251c24 100644 --- a/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm +++ b/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm @@ -112,6 +112,17 @@ }, /turf/open/floor/carpet/red, /area/ruin/interdyne_planetary_base/serv) +"aM" = ( +/obj/effect/turf_decal/stripes/blue{ + dir = 1 + }, +/obj/effect/turf_decal/caution/blue, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/effect/turf_decal/sand/plating/volcanic, +/turf/open/floor/plating/reinforced/lavaland, +/area/ruin/interdyne_planetary_base) "aP" = ( /obj/effect/baseturf_helper/reinforced_plating, /obj/structure/disposalpipe/segment, @@ -333,6 +344,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/med) +"bO" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/effect/turf_decal/sand/plating/volcanic, +/turf/open/floor/plating/reinforced/lavaland, +/area/lavaland/surface/outdoors) "bP" = ( /obj/effect/turf_decal/trimline/dark/filled/corner{ dir = 1 @@ -532,6 +550,7 @@ pixel_x = -8; pixel_y = 6 }, +/obj/item/sharpener, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv) "dd" = ( @@ -817,16 +836,6 @@ "eC" = ( /turf/closed/wall/r_wall/syndicate, /area/ruin/interdyne_planetary_base/science) -"eF" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/floor/plating/reinforced/lavaland, -/area/lavaland/surface/outdoors) "eH" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/light/directional/north, @@ -1688,6 +1697,9 @@ }, /obj/item/towel, /obj/item/towel, +/obj/effect/spawner/random/bedsheet/double, +/obj/effect/spawner/random/contraband, +/obj/effect/spawner/random/clothing/syndie, /turf/open/floor/iron/dark/textured, /area/ruin/interdyne_planetary_base/serv/rstrm) "jT" = ( @@ -1727,6 +1739,10 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv) +"kj" = ( +/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) "kk" = ( /obj/effect/turf_decal/loading_area/red, /obj/effect/turf_decal/trimline/dark/filled/corner{ @@ -1833,9 +1849,12 @@ /turf/open/floor/plating/reinforced, /area/ruin/interdyne_planetary_base/med) "kJ" = ( -/obj/structure/flora/rock/pile/style_random, -/turf/open/misc/asteroid/basalt/lava_land_surface, -/area/ruin/interdyne_planetary_base) +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/lattice/catwalk/mining, +/turf/open/lava/smooth/lava_land_surface, +/area/lavaland/surface/outdoors) "kL" = ( /obj/effect/turf_decal/box/white/corners{ dir = 4 @@ -1954,13 +1973,10 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/interdyne_planetary_base) "lz" = ( -/obj/item/reagent_containers/cup/glass/bottle/vodka{ - pixel_x = -9 +/obj/structure/fluff/metalpole/end{ + dir = 1 }, -/obj/item/radio/headset/interdyne, -/obj/structure/marker_beacon/cerulean, -/obj/item/card/id/advanced/chameleon/black, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) "lA" = ( /obj/effect/turf_decal/siding/wood{ @@ -2367,7 +2383,6 @@ }, /obj/structure/lattice, /obj/structure/flora/ash/cap_shroom, -/obj/structure/marker_beacon/cerulean, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/interdyne_planetary_base) "on" = ( @@ -2381,6 +2396,7 @@ /obj/effect/turf_decal/trimline/dark/filled/mid_joiner{ dir = 8 }, +/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner, /turf/open/floor/engine, /area/ruin/interdyne_planetary_base/med) "or" = ( @@ -2620,6 +2636,7 @@ /area/ruin/interdyne_planetary_base/main) "pK" = ( /obj/structure/table/wood/fancy, +/obj/effect/spawner/random/exotic/languagebook, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/serv) "pN" = ( @@ -2853,6 +2870,11 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/interdyne_planetary_base/science) +"qX" = ( +/obj/effect/turf_decal/tile/dark/full, +/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner, +/turf/open/floor/plating/elevatorshaft, +/area/ruin/interdyne_planetary_base/cargo) "rc" = ( /obj/effect/turf_decal/trimline/dark/filled/corner{ dir = 1 @@ -3049,6 +3071,7 @@ dir = 1 }, /obj/structure/table/wood/fancy/black, +/obj/effect/spawner/random/food_or_drink, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv) "sh" = ( @@ -3101,6 +3124,13 @@ }, /turf/open/floor/carpet/red, /area/ruin/interdyne_planetary_base/serv) +"sF" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/effect/turf_decal/sand/plating/volcanic, +/turf/open/floor/plating/reinforced/lavaland, +/area/lavaland/surface/outdoors) "sI" = ( /obj/structure/table/wood/fancy/black, /obj/item/flashlight/flare/candle/infinite, @@ -3318,6 +3348,13 @@ }, /turf/open/floor/engine, /area/ruin/interdyne_planetary_base/science) +"uO" = ( +/obj/structure/fence{ + dir = 4 + }, +/obj/structure/marker_beacon/cerulean, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/interdyne_planetary_base) "uQ" = ( /obj/effect/turf_decal/trimline/dark/filled/corner{ dir = 4 @@ -3801,7 +3838,7 @@ /turf/open/floor/engine, /area/ruin/interdyne_planetary_base/science) "xN" = ( -/obj/structure/lattice, +/obj/effect/decal/cleanable/ash, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "xR" = ( @@ -4108,11 +4145,10 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) "zn" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 5 +/obj/structure/fluff/metalpole/end{ + dir = 4 }, -/obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/floor/plating/reinforced/lavaland, +/turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) "zq" = ( /obj/effect/turf_decal/siding/wood/corner{ @@ -4450,7 +4486,7 @@ dir = 4 }, /turf/open/misc/asteroid/basalt/lava_land_surface, -/area/ruin/interdyne_planetary_base) +/area/lavaland/surface/outdoors) "BE" = ( /obj/effect/turf_decal/trimline/dark/filled/corner{ dir = 1 @@ -4470,6 +4506,10 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv) +"BN" = ( +/obj/structure/fluff/metalpole/end, +/turf/open/lava/smooth/lava_land_surface, +/area/lavaland/surface/outdoors) "BO" = ( /turf/open/misc/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) @@ -4790,6 +4830,7 @@ dir = 9 }, /obj/structure/hedge, +/obj/item/decoration/new_year/garland, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/main) "DW" = ( @@ -4871,16 +4912,6 @@ }, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/main) -"Er" = ( -/obj/effect/turf_decal/stripes/blue{ - dir = 1 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 9 - }, -/obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/floor/plating/reinforced/lavaland, -/area/ruin/interdyne_planetary_base) "Et" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5160,6 +5191,10 @@ /obj/structure/cable, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/main) +"Gl" = ( +/obj/structure/flora/rock/pile/style_random, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/interdyne_planetary_base) "Gr" = ( /obj/structure/marker_beacon/purple, /obj/effect/turf_decal/trimline/dark/filled/line{ @@ -6072,16 +6107,9 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) "Lr" = ( -/obj/effect/turf_decal/stripes/blue{ - dir = 1 - }, -/obj/effect/turf_decal/caution/blue, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/floor/plating/reinforced/lavaland, -/area/ruin/interdyne_planetary_base) +/obj/effect/decal/cleanable/ash/large, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) "Lu" = ( /obj/structure/marker_beacon/bronze, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -6201,6 +6229,16 @@ /obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark, /area/ruin/interdyne_planetary_base/main) +"Mb" = ( +/obj/effect/turf_decal/stripes/blue{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/effect/turf_decal/sand/plating/volcanic, +/turf/open/floor/plating/reinforced/lavaland, +/area/ruin/interdyne_planetary_base) "Md" = ( /obj/effect/turf_decal/trimline/dark/filled/mid_joiner, /obj/effect/turf_decal/box/white/corners{ @@ -6271,11 +6309,16 @@ /obj/item/storage/box/beakers/bluespace, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv) +"Mv" = ( +/obj/structure/lattice, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) "MF" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 }, /obj/structure/hedge, +/obj/item/decoration/new_year/garland, /turf/open/floor/wood/large, /area/ruin/interdyne_planetary_base/main) "MJ" = ( @@ -6876,6 +6919,16 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/med) +"PN" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/effect/turf_decal/sand/plating/volcanic, +/turf/open/floor/plating/reinforced/lavaland, +/area/lavaland/surface/outdoors) "PP" = ( /obj/effect/turf_decal/trimline/dark/filled/line{ dir = 6 @@ -6958,7 +7011,7 @@ /obj/structure/fence/cut/large{ dir = 4 }, -/turf/closed/mineral/random/volcanic, +/turf/open/misc/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "Qi" = ( /obj/effect/turf_decal/trimline/dark/filled/line{ @@ -7028,13 +7081,6 @@ }, /turf/open/floor/iron/dark/textured, /area/ruin/interdyne_planetary_base/serv) -"QM" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/floor/plating/reinforced/lavaland, -/area/lavaland/surface/outdoors) "QP" = ( /obj/effect/turf_decal/tile/dark/full, /obj/machinery/seed_extractor{ @@ -7072,12 +7118,9 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main) "Rd" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/obj/effect/turf_decal/sand/plating/volcanic, -/turf/open/floor/plating/reinforced/lavaland, -/area/lavaland/surface/outdoors) +/obj/structure/lattice, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/interdyne_planetary_base) "Rf" = ( /obj/structure/railing/corner{ dir = 4 @@ -7232,10 +7275,9 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv) "RS" = ( -/obj/structure/railing{ - dir = 4 +/obj/structure/fluff/metalpole/end{ + dir = 8 }, -/obj/structure/lattice/catwalk/mining, /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) "RU" = ( @@ -7243,11 +7285,6 @@ /obj/effect/turf_decal/tile/dark/full, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/med) -"RX" = ( -/obj/structure/lattice, -/obj/structure/marker_beacon/cerulean, -/turf/open/misc/asteroid/basalt/lava_land_surface, -/area/ruin/interdyne_planetary_base) "Sc" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/effect/turf_decal/tile/dark/full, @@ -7546,6 +7583,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main) +"TW" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/effect/turf_decal/sand/plating/volcanic, +/turf/open/floor/plating/reinforced/lavaland, +/area/lavaland/surface/outdoors) "Ub" = ( /obj/structure/fans/tiny, /obj/effect/turf_decal/trimline/dark/filled/line, @@ -8013,6 +8057,9 @@ }, /obj/item/towel, /obj/item/towel, +/obj/effect/spawner/random/bedsheet/double, +/obj/effect/spawner/random/contraband, +/obj/effect/spawner/random/clothing/syndie, /turf/open/floor/iron/dark/textured, /area/ruin/interdyne_planetary_base/serv/rstrm) "WS" = ( @@ -8129,6 +8176,15 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main) +"Xp" = ( +/obj/item/reagent_containers/cup/glass/bottle/vodka{ + pixel_x = -9 + }, +/obj/item/radio/headset/interdyne, +/obj/structure/marker_beacon/cerulean, +/obj/item/card/id/advanced/chameleon/black, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) "Xr" = ( /obj/machinery/computer/order_console/mining/interdyne, /obj/effect/turf_decal/tile/dark/full, @@ -8717,7 +8773,7 @@ BO BO BO BO -BO +xN BO BO ZT @@ -8770,7 +8826,7 @@ eO eO eO BO -BO +xN ZT BO eO @@ -8965,7 +9021,7 @@ ZT eO eO BO -BO +xN BO Co Co @@ -9054,8 +9110,7 @@ eO eO eO BO -BO -eO +xN eO eO eO @@ -9063,6 +9118,7 @@ eO eO eO eO +RS eC JV JV @@ -9074,7 +9130,7 @@ JV kg ST Du -eO +RS eO eO eO @@ -9272,7 +9328,7 @@ Co CH "} (13,1,1) = {" -Nm +BD ZT Bx nr @@ -9323,7 +9379,7 @@ eO eO eO eO -BO +xN BO BO fU @@ -9343,7 +9399,7 @@ jT DW ZT BO -BO +xN BO ZT eO @@ -9390,7 +9446,7 @@ Co Co "} (15,1,1) = {" -Nm +BD Jt yt nr @@ -9502,7 +9558,7 @@ eO BO eO eO -BO +xN BO BO Co @@ -9579,7 +9635,7 @@ uH DW eO BO -BO +xN eO eO eO @@ -9752,13 +9808,13 @@ bX pu xB EE -RS +kJ rW eO eO eO eO -eO +lz JV JV JV @@ -9794,7 +9850,7 @@ RQ rP ZJ eg -eO +BN eO UO eO @@ -9864,9 +9920,9 @@ Co (23,1,1) = {" Nm Co -BO +xN ZT -lz +Xp MQ pN eO @@ -9925,7 +9981,7 @@ JC dU ZT BO -BO +kj MQ pN eO @@ -9980,10 +10036,10 @@ Co Co "} (25,1,1) = {" -RX +Rd LI -xN -xN +Mv +Mv zr pu pN @@ -10039,9 +10095,9 @@ ZT Co "} (26,1,1) = {" -kJ -BD -eF +Gl +uO +PN BO DY pu @@ -10098,10 +10154,10 @@ Co Co "} (27,1,1) = {" -Er +Mb XB -Rd -QM +sF +TW Kh OG OG @@ -10122,7 +10178,7 @@ mj SR iu kk -Qy +qX Qy CM wA @@ -10157,18 +10213,18 @@ fU Co "} (28,1,1) = {" -Lr -BD +aM +uO BO -zn +bO Ph -RS -RS -RS +kJ +kJ +kJ Rf -RS -RS -RS +kJ +kJ +kJ Iw gh FO @@ -10218,8 +10274,8 @@ Co (29,1,1) = {" oh NW -xN -xN +Mv +Mv pn eO eO @@ -10278,7 +10334,7 @@ Co yB Vr Nv -BO +xN eO eO eO @@ -10339,7 +10395,7 @@ Co BO BO BO -BO +Lr eO eO eO @@ -10502,7 +10558,7 @@ wU iT ot eg -eO +BN eO co eO @@ -10694,7 +10750,7 @@ Co Co fU BO -BO +xN ZT BO BO @@ -10860,7 +10916,7 @@ eO BO eO eO -BO +xN cS Co "} @@ -10937,7 +10993,7 @@ BO BO Jt BO -BO +xN eO eO eO @@ -11173,7 +11229,7 @@ Co Co Co Co -BO +xN BO Nv BO @@ -11186,7 +11242,7 @@ eO eO eO eO -eO +zn Qx VP VP @@ -11198,7 +11254,7 @@ VP kt Pv lS -eO +zn ZT BO eO @@ -11210,7 +11266,7 @@ eO eO eO eO -BO +xN BO fU Co @@ -11357,7 +11413,7 @@ Co ZT BO fO -BO +xN BO eO eO @@ -11431,7 +11487,7 @@ eO eO BO BO -BO +xN eO eO eO @@ -11480,7 +11536,7 @@ Co ZT eO eO -BO +xN ZT Nv BO @@ -11495,7 +11551,7 @@ uy BO eO ZT -BO +xN eO Co Co From 080cee45fbeee9086af44fd7144371c9a821eaba Mon Sep 17 00:00:00 2001 From: Astra Farera E'luna Awiarera Date: Sun, 24 Mar 2024 19:47:46 +0400 Subject: [PATCH 07/10] Awa id fix. --- .../fluffy/icemoon_interdyne_base_ff.dmm | 23 ++++++++++++------- .../fluffy/lavaland_interdyne_base_ff.dmm | 9 +++----- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm index c631028df8b..5aaa976b55e 100644 --- a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm +++ b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm @@ -1994,8 +1994,7 @@ name = "Interdyne exosuit fabricator"; color = "#adadcd"; light_color = "#adadcd"; - hacked = 1; - id = awa + hacked = 1 }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) @@ -2456,8 +2455,7 @@ name = "Interdyne circuit imprinter"; color = "#adadcd"; light_color = "#adadcd"; - hacked = 1; - id = awa + hacked = 1 }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) @@ -4418,14 +4416,13 @@ /area/ruin/interdyne_planetary_base/main) "Ac" = ( /obj/effect/turf_decal/tile/dark/full, +/obj/structure/marker_beacon/burgundy, /obj/machinery/rnd/production/protolathe/offstation{ name = "Interdyne protolathe"; color = "#adadcd"; light_color = "#adadcd"; - hacked = 1; - id = awa + hacked = 1 }, -/obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) "Ad" = ( @@ -4532,6 +4529,16 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) +"Bk" = ( +/obj/machinery/rnd/production/protolathe/offstation{ + name = "Interdyne protolathe"; + color = "#adadcd"; + light_color = "#adadcd"; + hacked = 1; + id = awa + }, +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/interdyne_planetary_base/med) "Bn" = ( /obj/effect/turf_decal/trimline/dark/filled/line{ dir = 1 @@ -10606,7 +10613,7 @@ ce Vr Bf sP -yQ +Bk yQ Vz Er diff --git a/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm b/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm index 95b44251c24..a8d51f30dac 100644 --- a/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm +++ b/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm @@ -1953,8 +1953,7 @@ name = "Interdyne exosuit fabricator"; color = "#adadcd"; light_color = "#adadcd"; - hacked = 1; - id = awa + hacked = 1 }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) @@ -6752,8 +6751,7 @@ name = "Interdyne protolathe"; color = "#adadcd"; light_color = "#adadcd"; - hacked = 1; - id = awa + hacked = 1 }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) @@ -8362,8 +8360,7 @@ name = "Interdyne circuit imprinter"; color = "#adadcd"; light_color = "#adadcd"; - hacked = 1; - id = awa + hacked = 1 }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) From ac37089485c13ab7150390eeea69e8b8b3ba56c4 Mon Sep 17 00:00:00 2001 From: Astra Farera E'luna Awiarera Date: Sun, 24 Mar 2024 19:58:56 +0400 Subject: [PATCH 08/10] Clear awa. --- .../IceRuins/fluffy/icemoon_interdyne_base_ff.dmm | 14 ++------------ .../fluffy/lavaland_interdyne_base_ff.dmm | 4 ++-- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm index 5aaa976b55e..3ef88b64646 100644 --- a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm +++ b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm @@ -4529,16 +4529,6 @@ }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) -"Bk" = ( -/obj/machinery/rnd/production/protolathe/offstation{ - name = "Interdyne protolathe"; - color = "#adadcd"; - light_color = "#adadcd"; - hacked = 1; - id = awa - }, -/turf/closed/wall/r_wall/syndicate/nodiagonal, -/area/ruin/interdyne_planetary_base/med) "Bn" = ( /obj/effect/turf_decal/trimline/dark/filled/line{ dir = 1 @@ -10125,7 +10115,7 @@ io Se KQ mN -ab +Iy ab ab ab @@ -10613,7 +10603,7 @@ ce Vr Bf sP -Bk +yQ yQ Vz Er diff --git a/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm b/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm index a8d51f30dac..8a5a4f247d0 100644 --- a/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm +++ b/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm @@ -11434,7 +11434,7 @@ eO eO eO eO -eO +BO hY BO eO @@ -11493,7 +11493,7 @@ eO eO eO ZT -eO +BO BO Co fU From c4b70db1076386584a905b4409ca35b23d56a72f Mon Sep 17 00:00:00 2001 From: Astra Farera E'luna Awiarera Date: Sun, 24 Mar 2024 20:06:44 +0400 Subject: [PATCH 09/10] Float range fix. --- .../IceRuins/fluffy/icemoon_interdyne_base_ff.dmm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm index 3ef88b64646..5404035301e 100644 --- a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm +++ b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm @@ -7540,10 +7540,8 @@ /obj/effect/turf_decal/trimline/dark/filled/line, /obj/effect/turf_decal/trimline/dark/filled/mid_joiner, /obj/effect/turf_decal/stripes/red/line, -/obj/structure/sign/poster/contraband/syndicate_medical/directional/south{ - name = "Interdyne Pharmaceutics"; - desc = "Beware of perimeter turrets.'"; - pixel_y = 32 +/obj/structure/sign/poster/contraband/syndicate_medical/directional/north{ + name = "Interdyne Pharmaceutics" }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) From 4c4e6d736b9d40032ec390938bb8711a2c853fdf Mon Sep 17 00:00:00 2001 From: Astra Farera E'luna Awiarera Date: Sun, 24 Mar 2024 20:23:39 +0400 Subject: [PATCH 10/10] Tags fix. --- .../IceRuins/fluffy/icemoon_interdyne_base_ff.dmm | 9 +++------ .../LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm index 5404035301e..33f8a94c09a 100644 --- a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm +++ b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm @@ -1993,8 +1993,7 @@ /obj/machinery/mecha_part_fabricator{ name = "Interdyne exosuit fabricator"; color = "#adadcd"; - light_color = "#adadcd"; - hacked = 1 + light_color = "#adadcd" }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) @@ -2454,8 +2453,7 @@ /obj/machinery/rnd/production/circuit_imprinter/offstation{ name = "Interdyne circuit imprinter"; color = "#adadcd"; - light_color = "#adadcd"; - hacked = 1 + light_color = "#adadcd" }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) @@ -4420,8 +4418,7 @@ /obj/machinery/rnd/production/protolathe/offstation{ name = "Interdyne protolathe"; color = "#adadcd"; - light_color = "#adadcd"; - hacked = 1 + light_color = "#adadcd" }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) diff --git a/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm b/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm index 8a5a4f247d0..0e90571b7ae 100644 --- a/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm +++ b/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm @@ -1952,8 +1952,7 @@ /obj/machinery/mecha_part_fabricator{ name = "Interdyne exosuit fabricator"; color = "#adadcd"; - light_color = "#adadcd"; - hacked = 1 + light_color = "#adadcd" }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) @@ -6750,8 +6749,7 @@ /obj/machinery/rnd/production/protolathe/offstation{ name = "Interdyne protolathe"; color = "#adadcd"; - light_color = "#adadcd"; - hacked = 1 + light_color = "#adadcd" }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science) @@ -8359,8 +8357,7 @@ /obj/machinery/rnd/production/circuit_imprinter/offstation{ name = "Interdyne circuit imprinter"; color = "#adadcd"; - light_color = "#adadcd"; - hacked = 1 + light_color = "#adadcd" }, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/science)