From c024c101f6ccb39e3b2e4c5ff59091d78134fa69 Mon Sep 17 00:00:00 2001 From: Yobrocharlie <126765898+Yobrocharlie@users.noreply.github.com> Date: Thu, 11 Jul 2024 15:05:15 -0700 Subject: [PATCH] Outpost45 runtime fix (#84864) ## About The Pull Request fixes a few runtimes ## Why It's Good For The Game makes outpost 45 cause less lag and adds a new tile, asteroid gravel which is mechanically identical, but adds nothing actually new to the outpost ## Changelog adds a new tile, asteroid gravel which is mechanically identical to the old var eddited asteroid sand. :cl: fix: makes outpost45 cause less lag /:cl: --- _maps/RandomZLevels/undergroundoutpost45.dmm | 268 +++++-------------- code/game/turfs/open/asteroid.dm | 15 ++ 2 files changed, 76 insertions(+), 207 deletions(-) diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index 5eeed451765..7d8b1cd028d 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -17,13 +17,6 @@ "ag" = ( /turf/closed/wall/mineral/titanium, /area/awaymission/undergroundoutpost45/central) -"ah" = ( -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "ai" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -451,11 +444,7 @@ /area/awaymission/undergroundoutpost45/central) "ci" = ( /obj/effect/decal/cleanable/blood/gibs/limb, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "cm" = ( /obj/effect/decal/cleanable/dirt, @@ -6396,11 +6385,7 @@ "zb" = ( /obj/structure/alien/weeds, /obj/structure/alien/resin/wall, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "ze" = ( /obj/structure/table, @@ -6430,11 +6415,7 @@ /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "zq" = ( -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "zr" = ( /obj/machinery/door/firedoor, @@ -6470,19 +6451,11 @@ "zK" = ( /obj/structure/alien/weeds, /obj/structure/bed/nest, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "zO" = ( /obj/effect/decal/cleanable/blood/gibs/up, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "zX" = ( /obj/structure/closet/secure_closet{ @@ -6604,11 +6577,7 @@ /obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/gibs/down, /obj/effect/mob_spawn/corpse/human, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "BN" = ( /obj/machinery/computer/monitor{ @@ -6621,21 +6590,13 @@ /area/awaymission/undergroundoutpost45/engineering) "BQ" = ( /obj/effect/decal/cleanable/blood/splatter, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "Cd" = ( /obj/structure/alien/weeds, /obj/structure/glowshroom/single, /obj/effect/decal/cleanable/blood/gibs/down, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "Cj" = ( /obj/structure/table/reinforced, @@ -6760,14 +6721,10 @@ /turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "DJ" = ( -/obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/asteroid/line{ dir = 6 }, -/turf/open/floor/plating{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "DL" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -6907,11 +6864,7 @@ /area/awaymission/undergroundoutpost45/central) "Gn" = ( /obj/structure/alien/weeds, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "Gp" = ( /obj/structure/table/reinforced, @@ -6963,11 +6916,7 @@ "HW" = ( /obj/structure/alien/weeds, /obj/structure/glowshroom/single, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "Ic" = ( /obj/structure/cable, @@ -7018,11 +6967,7 @@ "IT" = ( /obj/structure/alien/weeds, /obj/effect/mob_spawn/corpse/human, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "IV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7115,11 +7060,7 @@ "KN" = ( /obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/splatter, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "KO" = ( /obj/machinery/door/firedoor, @@ -7139,11 +7080,7 @@ /area/awaymission/undergroundoutpost45/crew_quarters) "KU" = ( /obj/structure/closet/crate, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "KW" = ( /obj/machinery/airalarm/directional/north, @@ -7167,37 +7104,18 @@ /obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/splatter, /obj/effect/mob_spawn/corpse/human, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "Lk" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/effect/mob_spawn/corpse/human, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "Lo" = ( /obj/machinery/atmospherics/components/unary/passive_vent/layer2{ dir = 4 }, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) -"Lz" = ( -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 351.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "LT" = ( /obj/structure/table/reinforced, @@ -7247,19 +7165,11 @@ /area/awaymission/undergroundoutpost45/crew_quarters) "Mx" = ( /obj/machinery/light/small/directional/east, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "MC" = ( /obj/machinery/light/small/directional/west, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "MJ" = ( /obj/machinery/light/blacklight/directional/west, @@ -7375,12 +7285,8 @@ /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "OF" = ( -/obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/asteroid/line, -/turf/open/floor/plating{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "OL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/green, @@ -7476,11 +7382,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "Qw" = ( /obj/structure/disposalpipe/segment{ @@ -7541,11 +7443,7 @@ /area/awaymission/undergroundoutpost45/gateway) "RA" = ( /obj/machinery/light/small/directional/south, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "RC" = ( /obj/machinery/airalarm/directional/west, @@ -7652,11 +7550,7 @@ /area/awaymission/undergroundoutpost45/crew_quarters) "Tr" = ( /obj/structure/alien/resin/membrane, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "Tu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -7709,21 +7603,13 @@ "UH" = ( /obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/gibs/down, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "UM" = ( -/obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/asteroid/line{ dir = 10 }, -/turf/open/floor/plating{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "UU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7787,11 +7673,7 @@ "Wd" = ( /obj/structure/alien/resin/wall, /obj/structure/alien/weeds, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "Wk" = ( /obj/structure/cable, @@ -7819,14 +7701,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) -"WE" = ( -/obj/structure/glowshroom/single, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 351.9 - }, -/area/awaymission/undergroundoutpost45/caves) "WG" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -7889,11 +7763,7 @@ /area/awaymission/undergroundoutpost45/research) "XF" = ( /obj/structure/ore_box, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "XJ" = ( /obj/structure/table/reinforced, @@ -7911,11 +7781,7 @@ /area/awaymission/undergroundoutpost45/engineering) "XQ" = ( /obj/structure/glowshroom/single, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "XU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -7925,11 +7791,7 @@ /obj/structure/alien/weeds, /obj/structure/bed/nest, /obj/effect/mob_spawn/corpse/human, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "Yf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7987,20 +7849,12 @@ /area/awaymission/undergroundoutpost45/engineering) "Zs" = ( /obj/machinery/light/small/directional/north, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "ZD" = ( /obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/gibs/core, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "ZH" = ( /obj/machinery/airalarm/directional/east, @@ -36710,7 +36564,7 @@ tT gy uN hH -ah +zq zq ad ad @@ -36967,7 +36821,7 @@ tP gc uO vk -ah +zq zq zq ad @@ -37224,7 +37078,7 @@ tV gy uP hH -ah +zq zq zq zq @@ -42062,7 +41916,7 @@ ad ad ad ad -Lz +zq an bq aC @@ -42318,8 +42172,8 @@ ad ad ad ad -Lz -WE +zq +XQ ae bq aD @@ -42574,9 +42428,9 @@ ad ad ad ad -WE -Lz -Lz +XQ +zq +zq an bq aC @@ -42831,9 +42685,9 @@ ad ad ad ad -Lz -Lz -Lz +zq +zq +zq an al aD @@ -43088,9 +42942,9 @@ ad ad ad ad -Lz -Lz -Lz +zq +zq +zq aP bY aD @@ -43346,8 +43200,8 @@ ad ad ad ad -WE -Lz +XQ +zq aP bq cX @@ -43603,8 +43457,8 @@ ad ad ad ad -Lz -Lz +zq +zq an bZ bq @@ -43860,8 +43714,8 @@ ad ad ad ad -Lz -Lz +zq +zq an cS al @@ -44117,8 +43971,8 @@ ad ad ad ad -WE -Lz +XQ +zq an cT bq @@ -44374,8 +44228,8 @@ ad ad ad ad -Lz -Lz +zq +zq ae cU bq @@ -45410,9 +45264,9 @@ ad ad ad ad -ah -ah -ah +zq +zq +zq MC zq zq @@ -45688,7 +45542,7 @@ zq zq zq zq -ad +zq zq zq zq @@ -48325,7 +48179,7 @@ zq zq zq zq -ad +zq ad ad ad diff --git a/code/game/turfs/open/asteroid.dm b/code/game/turfs/open/asteroid.dm index 8db5753a719..cf28cdc3a46 100644 --- a/code/game/turfs/open/asteroid.dm +++ b/code/game/turfs/open/asteroid.dm @@ -311,3 +311,18 @@ GLOBAL_LIST_EMPTY(dug_up_basalt) floor_variance = 0 base_icon_state = "moon_dug" icon_state = "moon_dug" + + //used in outpost45 + +/turf/open/misc/asteroid/plasma //floor piece + gender = PLURAL + name = "asteroid gravel" + desc = "It's coarse and rough and gets everywhere." + baseturfs = /turf/open/misc/asteroid + icon = 'icons/turf/floors.dmi' + damaged_dmi = 'icons/turf/floors.dmi' + icon_state = "asteroid" + base_icon_state = "asteroid" + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9" + planetary_atmos = TRUE +