From 78032dd3b203ada264fb04697fa83ef4dd8e16e5 Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Tue, 19 Mar 2024 23:36:14 +0100 Subject: [PATCH] fixes wrong fake stairs on miaphus beach (#6352) ## About The Pull Request Fixes a couple runtimes that frequently occure during IntTests ## Why It's Good For The Game ## Changelog :cl: fix: fixes wrong fake stairs on miaphus beach fix: fixes duplicate lattice on debris14.dmm fix: adds extra check to submap seeding, checking if the tiles are empty fix: adds check when adding blood writing, to make sure we arent using to many instances per tile fix: fix rename_areas for the tiny carrier should happen during lateload to avoid not finding the shuttle /:cl: --- .../objects/effects/debris/cleanable/blood.dm | 3 +++ code/modules/mapping/submaps_legacy.dm | 5 ++++- .../modules/maps/overmap/space/debrisfield.dm | 6 +++++- .../miaphus_192/levels/miaphus_192_beach.dmm | 21 ++++++++----------- .../debrisfield_vr/debris14.dmm | 1 - 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/code/game/objects/effects/debris/cleanable/blood.dm b/code/game/objects/effects/debris/cleanable/blood.dm index 34a13789bf5..f87cbc9d534 100644 --- a/code/game/objects/effects/debris/cleanable/blood.dm +++ b/code/game/objects/effects/debris/cleanable/blood.dm @@ -184,6 +184,9 @@ var/global/list/image/splatter_cache=list() if(random_icon_states.len) for(var/obj/effect/debris/cleanable/blood/writing/W in loc) random_icon_states.Remove(W.icon_state) + if(!LAZYLEN(random_icon_states))//If all iconstates are already in used by someone else on our tile, delete yourself + qdel(src) + return icon_state = pick(random_icon_states) else icon_state = "writing1" diff --git a/code/modules/mapping/submaps_legacy.dm b/code/modules/mapping/submaps_legacy.dm index e4b1e43cf9f..da7b7554e26 100644 --- a/code/modules/mapping/submaps_legacy.dm +++ b/code/modules/mapping/submaps_legacy.dm @@ -83,7 +83,10 @@ // to_chat(world, "Invalid due to overlapping with area [new_area.type] at ([check.x], [check.y], [check.z]), when attempting to place at ([T.x], [T.y], [T.z]).") break CHECK_TICK - + if(LAZYLEN(check.contents))//The default space tile has no contents, so if there is something there, we shouldnt overwrite it + valid = FALSE + break + CHECK_TICK CHECK_TICK if(!valid) diff --git a/code/modules/maps/overmap/space/debrisfield.dm b/code/modules/maps/overmap/space/debrisfield.dm index f061cb34316..fc0806d6daf 100644 --- a/code/modules/maps/overmap/space/debrisfield.dm +++ b/code/modules/maps/overmap/space/debrisfield.dm @@ -186,7 +186,11 @@ \[i\]Class\[/i\]: Light Escort Carrier \[i\]Transponder\[/i\]: Transmitting (MIL), Weak Signal \[b\]Notice\[/b\]: Registration Expired"} - rename_areas(newname) + return INITIALIZE_HINT_LATELOAD + +/obj/overmap/entity/visitable/ship/landable/tinycarrier/LateInitialize() + . = ..() + rename_areas(scanner_name) /obj/overmap/entity/visitable/ship/landable/tinycarrier/proc/rename_areas(newname) var/datum/shuttle/S = SSshuttle.shuttles[shuttle] diff --git a/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm b/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm index c1175bccb68..b4ee05195d4 100644 --- a/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm +++ b/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm @@ -807,8 +807,8 @@ /turf/simulated/floor/wood, /area/tether_away/beach/mineshaft) "eZ" = ( -/obj/structure/stairs/middle{ - dir = 2 +/obj/effect/floor_decal/industrial/halfstair{ + dir = 1 }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/desalinator) @@ -963,8 +963,8 @@ /turf/simulated/floor/wood, /area/tether_away/beach/resort/canteen) "gC" = ( -/obj/structure/stairs/middle{ - dir = 4 +/obj/effect/floor_decal/industrial/halfstair{ + dir = 8 }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/desalinator) @@ -1414,8 +1414,8 @@ }, /area/tether_away/beach/mineshaft) "jJ" = ( -/obj/structure/stairs/middle{ - dir = 4 +/obj/effect/floor_decal/industrial/halfstair{ + dir = 8 }, /turf/simulated/floor/outdoors/beach/sand/desert, /area/tether_away/beach/desalinator) @@ -1601,9 +1601,7 @@ /turf/simulated/floor/wood/broken, /area/tether_away/beach/resort/dorm2) "la" = ( -/obj/structure/stairs/middle{ - dir = 1 - }, +/obj/effect/floor_decal/industrial/halfstair, /turf/simulated/mineral/floor/cave{ name = "dirt" }, @@ -2325,8 +2323,8 @@ /turf/simulated/floor/wood, /area/tether_away/beach/resort/dorm1) "rM" = ( -/obj/structure/stairs/middle{ - dir = 2 +/obj/effect/floor_decal/industrial/halfstair{ + dir = 1 }, /turf/simulated/floor/tiled/asteroid_steel{ outdoors = 1 @@ -5942,7 +5940,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ desc = "Its bone dry."; - dir = 2; name = "water pipe" }, /turf/simulated/floor/tiled/steel_dirty, diff --git a/maps/submaps/level_specific/debrisfield_vr/debris14.dmm b/maps/submaps/level_specific/debrisfield_vr/debris14.dmm index a6e10fddebe..0b0a55241ff 100644 --- a/maps/submaps/level_specific/debrisfield_vr/debris14.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/debris14.dmm @@ -31,7 +31,6 @@ /area/tether_away/debrisfield_vr/shuttle_buffer) "h" = ( /obj/structure/lattice, -/obj/structure/lattice, /turf/space, /area/tether_away/debrisfield_vr/shuttle_buffer) "i" = (