From a2827b7767f9dfd13cfbd97e7cb0703617cb469c Mon Sep 17 00:00:00 2001 From: Cenrus <31044876+Cenrus@users.noreply.github.com> Date: Tue, 19 Apr 2022 18:06:21 +0100 Subject: [PATCH] Fixes several issues with the Skyrat maps (#12780) * initial * rewire cruiser * iron floor * apply to map * touch up * h --- .../lavaland_surface_ash_walker1_skyrat.dmm | 58 ++------ .../SpaceRuins/skyrat/port_tarkon.dmm | 2 +- _maps/map_files/generic/CentCom_skyrat.dmm | 126 +++++++++------- _maps/map_files/generic/CentCom_skyrat_z2.dmm | 139 +++++++++++------- _maps/shuttles/skyrat/goldeneye_cruiser.dmm | 31 ++-- .../code/game/turfs/open/floor/iron_floor.dm | 2 + tgstation.dme | 1 + 7 files changed, 184 insertions(+), 175 deletions(-) create mode 100644 modular_skyrat/master_files/code/game/turfs/open/floor/iron_floor.dm diff --git a/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_ash_walker1_skyrat.dmm b/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_ash_walker1_skyrat.dmm index fc5d4c119db..325cc5f017e 100644 --- a/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_ash_walker1_skyrat.dmm +++ b/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_ash_walker1_skyrat.dmm @@ -15,9 +15,7 @@ /area/ruin/unpowered/ash_walkers) "aV" = ( /obj/machinery/griddle, -/turf/open/floor/iron{ - initial_gas_mix = "LAVALAND_ATMOS" - }, +/turf/open/floor/iron/lavaland_atmos, /area/service/kitchen/ashwalker) "bc" = ( /obj/structure/stone_tile/surrounding_tile/cracked, @@ -362,9 +360,7 @@ /obj/structure/table, /obj/item/storage/bag/tray, /obj/effect/spawner/random/food_or_drink/donkpockets, -/turf/open/floor/iron{ - initial_gas_mix = "LAVALAND_ATMOS" - }, +/turf/open/floor/iron/lavaland_atmos, /area/service/kitchen/ashwalker) "px" = ( /obj/structure/stone_tile, @@ -535,9 +531,7 @@ /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) "sS" = ( -/turf/open/floor/iron{ - initial_gas_mix = "LAVALAND_ATMOS" - }, +/turf/open/floor/iron/lavaland_atmos, /area/service/kitchen/ashwalker) "tg" = ( /obj/structure/stone_tile/block/cracked, @@ -671,9 +665,7 @@ /area/ruin/unpowered/ash_walkers) "xl" = ( /obj/machinery/oven, -/turf/open/floor/iron{ - initial_gas_mix = "LAVALAND_ATMOS" - }, +/turf/open/floor/iron/lavaland_atmos, /area/service/kitchen/ashwalker) "xW" = ( /obj/structure/stone_tile/block{ @@ -735,9 +727,7 @@ /area/ruin/unpowered/ash_walkers) "zV" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/iron{ - initial_gas_mix = "LAVALAND_ATMOS" - }, +/turf/open/floor/iron/lavaland_atmos, /area/service/kitchen/ashwalker) "Ao" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -795,9 +785,7 @@ idle_power_usage = 0; use_power = 0 }, -/turf/open/floor/iron{ - initial_gas_mix = "LAVALAND_ATMOS" - }, +/turf/open/floor/iron/lavaland_atmos, /area/service/kitchen/ashwalker) "BJ" = ( /obj/structure/stone_tile/cracked, @@ -853,9 +841,7 @@ /obj/item/knife/combat/bone{ pixel_x = 5 }, -/turf/open/floor/iron{ - initial_gas_mix = "LAVALAND_ATMOS" - }, +/turf/open/floor/iron/lavaland_atmos, /area/service/kitchen/ashwalker) "DP" = ( /obj/structure/stone_tile/block, @@ -888,9 +874,7 @@ /obj/machinery/processor{ pixel_y = 12 }, -/turf/open/floor/iron{ - initial_gas_mix = "LAVALAND_ATMOS" - }, +/turf/open/floor/iron/lavaland_atmos, /area/service/kitchen/ashwalker) "Fz" = ( /obj/structure/stone_tile/block{ @@ -1075,9 +1059,7 @@ "Mk" = ( /obj/structure/table, /obj/machinery/microwave, -/turf/open/floor/iron{ - initial_gas_mix = "LAVALAND_ATMOS" - }, +/turf/open/floor/iron/lavaland_atmos, /area/service/kitchen/ashwalker) "Mn" = ( /obj/structure/statue/bone/rib, @@ -1236,9 +1218,7 @@ /obj/structure/table, /obj/machinery/reagentgrinder, /obj/machinery/light/directional/east, -/turf/open/floor/iron{ - initial_gas_mix = "LAVALAND_ATMOS" - }, +/turf/open/floor/iron/lavaland_atmos, /area/service/kitchen/ashwalker) "Ol" = ( /obj/item/stack/sheet/mineral/coal/ten, @@ -1336,9 +1316,7 @@ /area/ruin/unpowered/ash_walkers) "PG" = ( /obj/machinery/light/directional/south, -/turf/open/floor/iron{ - initial_gas_mix = "LAVALAND_ATMOS" - }, +/turf/open/floor/iron/lavaland_atmos, /area/service/kitchen/ashwalker) "PJ" = ( /obj/structure/chair/wood{ @@ -1536,9 +1514,7 @@ /area/service/kitchen/ashwalker) "UL" = ( /obj/machinery/power/apc/auto_name/directional/west, -/turf/open/floor/iron{ - initial_gas_mix = "LAVALAND_ATMOS" - }, +/turf/open/floor/iron/lavaland_atmos, /area/service/kitchen/ashwalker) "Vr" = ( /turf/closed/wall/mineral/wood, @@ -1615,7 +1591,7 @@ "WN" = ( /obj/structure/curtain/bounty, /obj/structure/table, -/turf/open/floor/iron, +/turf/open/floor/iron/lavaland_atmos, /area/service/kitchen/ashwalker) "WT" = ( /obj/structure/stone_tile/surrounding_tile/cracked{ @@ -1645,9 +1621,7 @@ /obj/machinery/door/airlock{ name = "Abandoned Kitchen" }, -/turf/open/floor/iron{ - initial_gas_mix = "LAVALAND_ATMOS" - }, +/turf/open/floor/iron/lavaland_atmos, /area/service/kitchen/ashwalker) "Xs" = ( /obj/structure/stone_tile/block/cracked{ @@ -1694,9 +1668,7 @@ /area/ruin/unpowered/ash_walkers) "ZW" = ( /obj/machinery/light/small/directional/west, -/turf/open/floor/iron{ - initial_gas_mix = "LAVALAND_ATMOS" - }, +/turf/open/floor/iron/lavaland_atmos, /area/service/kitchen/ashwalker) (1,1,1) = {" diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm index 1062df585b3..8346f7e95bc 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm @@ -7235,7 +7235,7 @@ opacity = 1 }, /obj/machinery/door/airlock/atmos/glass, -/turf/open/floor/iron, +/turf/open/floor/plating/airless, /area/ruin/space/has_grav/port_tarkon/atmos) "PM" = ( /obj/structure/bed/nest, diff --git a/_maps/map_files/generic/CentCom_skyrat.dmm b/_maps/map_files/generic/CentCom_skyrat.dmm index 17bccea91be..f85487918b2 100644 --- a/_maps/map_files/generic/CentCom_skyrat.dmm +++ b/_maps/map_files/generic/CentCom_skyrat.dmm @@ -160,7 +160,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/centcom/admin/storage) +/area/centcom/armory) "cw" = ( /obj/machinery/limbgrower/fullupgrade, /turf/open/floor/plating/abductor, @@ -6678,7 +6678,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/centcom/admin/storage) +/area/centcom/armory) "vA" = ( /obj/structure/closet/emcloset, /obj/item/tank/internals/emergency_oxygen/engi, @@ -8059,7 +8059,7 @@ }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, -/area/centcom/admin/storage) +/area/centcom/armory) "zf" = ( /obj/structure/closet/secure_closet/ert_engi, /obj/machinery/airalarm/directional/north, @@ -8067,7 +8067,7 @@ dir = 6 }, /turf/open/floor/iron, -/area/centcom/admin/storage) +/area/centcom/armory) "zg" = ( /obj/structure/table/reinforced, /obj/item/gun/ballistic/automatic/wt550, @@ -8075,7 +8075,7 @@ /obj/structure/noticeboard/directional/north, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, -/area/centcom/admin/storage) +/area/centcom/armory) "zh" = ( /obj/structure/table/reinforced, /obj/item/grenade/c4{ @@ -8087,7 +8087,7 @@ /obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, -/area/centcom/admin/storage) +/area/centcom/armory) "zi" = ( /obj/structure/rack, /obj/item/gun/energy/e_gun{ @@ -8102,7 +8102,7 @@ dir = 10 }, /turf/open/floor/iron, -/area/centcom/admin/storage) +/area/centcom/armory) "zj" = ( /obj/structure/closet/secure_closet/ert_com, /obj/structure/sign/directions/command{ @@ -8111,7 +8111,7 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/status_display/ai/directional/east, /turf/open/floor/iron, -/area/centcom/admin/storage) +/area/centcom/armory) "zk" = ( /obj/machinery/door/airlock/medical/glass{ name = "Infirmary" @@ -8235,7 +8235,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/centcom/admin/storage) +/area/centcom/armory) "zE" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -8468,7 +8468,7 @@ /obj/machinery/door/poddoor/ert, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, -/area/centcom/admin/storage) +/area/centcom/armory) "Aj" = ( /obj/structure/table/reinforced, /obj/item/restraints/handcuffs, @@ -8477,7 +8477,7 @@ dir = 9 }, /turf/open/floor/iron, -/area/centcom/admin/storage) +/area/centcom/armory) "Ak" = ( /obj/structure/table/reinforced, /obj/item/storage/medkit/regular{ @@ -8498,7 +8498,7 @@ pixel_x = 7 }, /turf/open/floor/iron, -/area/centcom/admin/storage) +/area/centcom/armory) "Al" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/tile/neutral{ @@ -8512,7 +8512,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/centcom/admin/storage) +/area/centcom/armory) "Am" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -8690,7 +8690,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/centcom/admin/storage) +/area/centcom/armory) "AR" = ( /obj/structure/table/reinforced, /obj/item/storage/box/zipties, @@ -8699,7 +8699,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/centcom/admin/storage) +/area/centcom/armory) "AS" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/effect/turf_decal/tile/neutral{ @@ -8714,7 +8714,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/centcom/admin/storage) +/area/centcom/armory) "AT" = ( /obj/structure/sign/departments/medbay/alt, /turf/closed/indestructible/riveted, @@ -8930,7 +8930,7 @@ dir = 10 }, /turf/open/floor/iron, -/area/centcom/admin/storage) +/area/centcom/armory) "BC" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, @@ -8939,7 +8939,7 @@ dir = 6 }, /turf/open/floor/iron, -/area/centcom/admin/storage) +/area/centcom/armory) "BD" = ( /obj/machinery/newscaster{ pixel_x = 32 @@ -8955,7 +8955,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/centcom/admin/storage) +/area/centcom/armory) "BE" = ( /obj/machinery/door/poddoor/shutters{ id = "XCCsec3"; @@ -9483,7 +9483,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/centcom/admin/storage) +/area/centcom/armory) "CC" = ( /obj/structure/closet/secure_closet/ert_med, /obj/machinery/vending/wallmed/directional/south{ @@ -9493,7 +9493,7 @@ dir = 5 }, /turf/open/floor/iron, -/area/centcom/admin/storage) +/area/centcom/armory) "CD" = ( /obj/structure/table/reinforced, /obj/item/storage/box/emps, @@ -9505,7 +9505,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/centcom/admin/storage) +/area/centcom/armory) "CE" = ( /obj/structure/table/reinforced, /obj/item/storage/box/syringes, @@ -9515,7 +9515,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/centcom/admin/storage) +/area/centcom/armory) "CF" = ( /obj/structure/closet/secure_closet/ert_sec, /obj/effect/turf_decal/stripes/line{ @@ -9523,7 +9523,7 @@ }, /obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron, -/area/centcom/admin/storage) +/area/centcom/armory) "CG" = ( /obj/structure/closet/secure_closet/ert_sec, /obj/structure/sign/directions/security{ @@ -9535,7 +9535,7 @@ }, /obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron, -/area/centcom/admin/storage) +/area/centcom/armory) "CH" = ( /obj/structure/table/reinforced, /obj/item/book/manual/wiki/security_space_law, @@ -13979,6 +13979,10 @@ }, /turf/open/floor/iron, /area/centcom/control) +"Od" = ( +/obj/structure/sign/warning/securearea, +/turf/closed/indestructible/riveted, +/area/centcom/armory) "Oj" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ @@ -14040,7 +14044,7 @@ /obj/effect/turf_decal/delivery, /obj/structure/cable, /turf/open/floor/iron, -/area/centcom/admin/storage) +/area/centcom/armory) "OD" = ( /obj/machinery/microwave{ desc = "Cooks and boils stuff, somehow."; @@ -14421,6 +14425,19 @@ }, /turf/open/floor/iron/white, /area/centcom/holding) +"Rk" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/centcom/armory) "Rm" = ( /obj/structure/chair/wood/wings{ dir = 3 @@ -15089,6 +15106,9 @@ }, /turf/open/floor/iron, /area/centcom/supplypod/loading/one) +"XF" = ( +/turf/closed/indestructible/riveted, +/area/centcom/armory) "XL" = ( /obj/machinery/door/airlock/wood, /turf/open/floor/wood, @@ -54520,14 +54540,14 @@ su ws ts mD -et -Tk +XF +Od Ai OC Ai -Tk -et -et +Od +XF +XF aa aa aa @@ -54779,12 +54799,12 @@ ts mD ze zD -TO +Rk vy -TO +Rk zD CB -et +XF aa aa aa @@ -55038,10 +55058,10 @@ zf vy vy vy -TO -TO +Rk +Rk CC -et +XF aa aa aa @@ -55296,9 +55316,9 @@ vy Aj AQ BB -TO +Rk CD -et +XF aa aa aa @@ -55553,9 +55573,9 @@ vy Ak AR BC -TO +Rk CE -et +XF aa aa aa @@ -55809,10 +55829,10 @@ zi vy vy vy -TO -TO +Rk +Rk CF -et +XF aa aa aa @@ -56069,7 +56089,7 @@ AS BD ct CG -et +XF aa aa aa @@ -56319,14 +56339,14 @@ wu xh wu mD -et -Tk -et -et -et -Tk -et -et +XF +Od +XF +XF +XF +Od +XF +XF Dq io io diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index 9775476bad5..837daabff28 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -1243,7 +1243,7 @@ /area/centcom/holding/cafepark) "aoi" = ( /obj/structure/fans/tiny/invisible, -/turf/open/water/beach, +/turf/open/water/beach/biodome, /area/centcom/holding/cafepark) "aon" = ( /obj/structure/flora/ausbushes/stalkybush, @@ -3114,7 +3114,7 @@ /area/centcom/holding/cafe) "aDx" = ( /obj/structure/spacevine, -/turf/open/water/beach, +/turf/open/water/beach/biodome, /area/centcom/holding/cafepark) "aDA" = ( /obj/effect/turf_decal/tile/blue{ @@ -3953,7 +3953,7 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding/cafedorms) "aLx" = ( -/turf/open/water/beach, +/turf/open/water/beach/biodome, /area/centcom/holding/cafepark) "aLz" = ( /obj/structure/chair/sofa/corp/corner{ @@ -4284,7 +4284,7 @@ name = "thick vines"; opacity = 1 }, -/turf/open/water/beach, +/turf/open/water/beach/biodome, /area/centcom/holding/cafepark) "aNN" = ( /obj/structure/chair/stool/bar{ @@ -6549,6 +6549,11 @@ /obj/effect/turf_decal/vg_decals/numbers/six, /turf/open/floor/iron/dark, /area/cruiser_dock) +"dWZ" = ( +/turf/open/misc/beach/coastline_b{ + dir = 1 + }, +/area/centcom/holding/cafepark) "dXR" = ( /obj/structure/flora/rock, /turf/open/misc/asteroid, @@ -9059,6 +9064,11 @@ "oVj" = ( /turf/open/floor/carpet/green, /area/centcom/interlink) +"oXj" = ( +/turf/open/misc/beach/coastline_b{ + dir = 10 + }, +/area/centcom/holding/cafepark) "oZx" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -9099,6 +9109,11 @@ }, /turf/open/misc/grass/planet, /area/centcom/holding/cafepark) +"pum" = ( +/turf/open/misc/beach/coastline_b{ + dir = 8 + }, +/area/centcom/holding/cafepark) "puo" = ( /obj/effect/turf_decal/sand, /obj/machinery/light{ @@ -9432,6 +9447,11 @@ }, /turf/open/floor/iron/cafeteria, /area/centcom/interlink) +"qvR" = ( +/turf/open/misc/beach/coastline_b{ + dir = 4 + }, +/area/centcom/holding/cafepark) "qwo" = ( /obj/effect/turf_decal/sand, /obj/machinery/vending/snack, @@ -10568,6 +10588,11 @@ /obj/effect/landmark/start/assaultop, /turf/open/floor/carpet/royalblack, /area/cruiser_dock) +"uUH" = ( +/turf/open/misc/beach/coastline_b{ + dir = 6 + }, +/area/centcom/holding/cafepark) "uWe" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "ghostcafesec" @@ -62346,9 +62371,9 @@ aDa aUm aSq apX +aHZ aLx -aLx -aLx +dWZ aGw aUm aUm @@ -62605,7 +62630,7 @@ aVo aVv aLx aLx -aLx +dWZ axa aUm aUm @@ -62862,7 +62887,7 @@ aqQ aHZ aLx aLx -aLx +uUH axa aUm aDa @@ -63116,9 +63141,9 @@ aUm aUm aSq apX -aLD -aLx +aHZ aLx +dWZ aOO aRS aUm @@ -63372,10 +63397,10 @@ aUm aUm aSq apX +aVv aLx aLx -aLx -aLx +uUH axa aUm aUm @@ -63631,7 +63656,7 @@ aVo aVv aLx aLx -aLx +dWZ aOO aRS aUm @@ -63888,7 +63913,7 @@ aVo aHZ aLx aLx -aLx +dWZ axa sQX aUm @@ -64145,7 +64170,7 @@ aqQ aHZ aLx aLx -aLx +dWZ aGw aUm aDa @@ -64402,7 +64427,7 @@ aVo aLD aLx aLx -aLx +dWZ aJh aCv aUm @@ -64660,7 +64685,7 @@ aLQ aHZ aLx aLx -aLx +oXj axa aUm aUm @@ -64917,7 +64942,7 @@ aVo aHZ aLx aLx -aLx +dWZ aGw aUm aUm @@ -65174,7 +65199,7 @@ aVo aLD aLx aLx -aLx +dWZ aJh aCv sQX @@ -65429,10 +65454,10 @@ aUm aUm aKP aLQ -aVv -aLx +aHZ aLx aLx +oXj axa aUm aDa @@ -65689,7 +65714,7 @@ aVo aHZ aLx aLx -aLx +dWZ axa aUm aUm @@ -65946,7 +65971,7 @@ aqQ aHZ aLx aLx -aLx +dWZ aJh aCv aUm @@ -66204,7 +66229,7 @@ aHZ aLx aLx aLx -aLx +oXj axa aUm aUm @@ -66461,7 +66486,7 @@ aHZ aLx aLx aLx -aLx +uUH axa aUm vYR @@ -66717,7 +66742,7 @@ aVo aHZ aLx aLx -aLx +dWZ aOO aRS aUm @@ -66971,10 +66996,10 @@ aUm aUm aSq apX -aLD -aLx +aHZ aLx aLx +dWZ axa aUm aUm @@ -67230,8 +67255,8 @@ aVo aVv aLx aLx -aLx -aLx +pum +uUH aGw aUm nap @@ -67486,7 +67511,7 @@ aUm aqQ aHZ aLx -aLx +dWZ aOO aUr aRS @@ -68254,10 +68279,10 @@ aUm aUm aSq apX +aHZ aLx aLx -aLx -aLx +uUH axa aUm xFU @@ -68510,10 +68535,10 @@ aUm aUm aSq apX +aVv aLx aLx -aLx -aLx +dWZ aHD aRS aUm @@ -68766,11 +68791,11 @@ aUm aRe sQX aVo +aVv aLx aLx aLx -aLx -aLx +uUH axa aUm aUm @@ -69023,10 +69048,10 @@ aSq axJ axJ anQ +aHZ aLx aLx -aLx -aLx +uUH aOO aRS aUm @@ -69277,12 +69302,12 @@ ajj ajj aSq apX +aVv +qvR +qvR aLx aLx -aLx -aLx -aLx -aLx +dWZ aOO aRS aUm @@ -69533,13 +69558,13 @@ ajj ajj aSq apX +aVv aLx aLx aLx aLx aLx -aLx -aLx +dWZ aGw aUm aUm @@ -69789,14 +69814,14 @@ ajj aSq axJ apX +aVv aLx aLx aLx aLx aLx aLx -aLx -aLx +dWZ axa rPh dOC @@ -70044,16 +70069,16 @@ ajj ajj ajj apX +aVv +qvR aLx aLx aLx -aLx -aLx -aLx -aLx -aLx -aLx -aLx +pum +pum +pum +pum +uUH axa lCi vgx @@ -70305,7 +70330,7 @@ aLx aLx aLx aLx -aLx +uUH aOO aUr aUr @@ -70560,8 +70585,8 @@ aNM aDx aOO aLQ -aLx -aLx +aLD +uUH aOO aRS eEg diff --git a/_maps/shuttles/skyrat/goldeneye_cruiser.dmm b/_maps/shuttles/skyrat/goldeneye_cruiser.dmm index fcff70ac8e3..0aadf8ea2ba 100644 --- a/_maps/shuttles/skyrat/goldeneye_cruiser.dmm +++ b/_maps/shuttles/skyrat/goldeneye_cruiser.dmm @@ -747,12 +747,6 @@ /obj/item/stack/sheet/glass/fifty, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/syndicate/cruiser/armory) -"qf" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/shuttle/syndicate/cruiser/hallway) "qw" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -1154,6 +1148,12 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/iron/dark, /area/shuttle/syndicate/cruiser/eva) +"zF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/shuttle/syndicate/cruiser/hallway) "zV" = ( /obj/structure/closet/crate, /obj/item/reagent_containers/glass/bowl, @@ -1299,7 +1299,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/cable, /obj/effect/mapping_helpers/airlock/cutaiwire, /obj/machinery/door/airlock/highsecurity{ name = "Interrogation" @@ -1476,10 +1475,10 @@ /turf/open/floor/iron/dark, /area/shuttle/syndicate/cruiser/bridge) "Gq" = ( -/obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south{ req_access = list(150) }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/shuttle/syndicate/cruiser/hallway) "Gw" = ( @@ -2248,15 +2247,6 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/syndicate/cruiser/bridge) -"Sx" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/power/apc/auto_name/directional/north{ - req_access = list(150) - }, -/turf/open/floor/iron/dark, -/area/shuttle/syndicate/cruiser/hallway) "Sz" = ( /obj/machinery/light/cold/no_nightlight/directional/south, /obj/machinery/airalarm/directional/south, @@ -2518,7 +2508,6 @@ /turf/open/floor/circuit/red, /area/shuttle/syndicate/cruiser/hallway) "Wx" = ( -/obj/structure/cable, /obj/effect/turf_decal/stripes/red/box, /obj/machinery/porta_turret/syndicate/assaultops/internal, /turf/open/floor/iron/dark, @@ -2931,7 +2920,7 @@ Er BO Fh Er -Sx +HJ fg Yx HC @@ -2995,7 +2984,7 @@ Qq Rv Qq mw -qf +HJ ZP ZP ZP @@ -3026,7 +3015,7 @@ RF RF Rv RF -HJ +zF Gq ZP Od diff --git a/modular_skyrat/master_files/code/game/turfs/open/floor/iron_floor.dm b/modular_skyrat/master_files/code/game/turfs/open/floor/iron_floor.dm new file mode 100644 index 00000000000..56ced3b1d8f --- /dev/null +++ b/modular_skyrat/master_files/code/game/turfs/open/floor/iron_floor.dm @@ -0,0 +1,2 @@ +/turf/open/floor/iron/lavaland_atmos + initial_gas_mix = "LAVALAND_ATMOS" diff --git a/tgstation.dme b/tgstation.dme index 523402ced58..bc80b9451af 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4505,6 +4505,7 @@ #include "modular_skyrat\master_files\code\game\objects\structures\sauna_oven.dm" #include "modular_skyrat\master_files\code\game\objects\structures\tables_racks.dm" #include "modular_skyrat\master_files\code\game\objects\structures\trash_pile.dm" +#include "modular_skyrat\master_files\code\game\turfs\open\floor\iron_floor.dm" #include "modular_skyrat\master_files\code\modules\admin\admin.dm" #include "modular_skyrat\master_files\code\modules\antagonists\_common\antag_datum.dm" #include "modular_skyrat\master_files\code\modules\antagonists\ert\ert.dm"