mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-11 10:11:09 +00:00
fixes seed ruin logic preventing forced ruins from spawning when budget is zero, fixes map_logging CI test (#87910)
## About The Pull Request The ruins get added to forced_ruins, quite often after all ruin budget is exhausted and thus they don't get spawned. This adjusts the logic to ignore the budget when there's forced_ruins to be had. Also apparently fixes map_logging CI test which was broken by the logic, and makes the stacked_lights test scream at you with the area name for the sake of easier debugging as it can proc on the ruins now ## Why It's Good For The Game Adjusts some logic to allow multi-ruins to spawn correctly, and to make sure our mappers make good space ruins too ## Changelog 🆑 fix: Ruins will now correctly spawn their tied ruins in fix: The map_logging test now runs proper code: The stacked_lights test now screams with area names too. /🆑
This commit is contained in:
@@ -30,7 +30,6 @@
|
|||||||
/area/ruin/space/djstation)
|
/area/ruin/space/djstation)
|
||||||
"t" = (
|
"t" = (
|
||||||
/obj/structure/closet/secure_closet/freezer/fridge/all_access,
|
/obj/structure/closet/secure_closet/freezer/fridge/all_access,
|
||||||
/obj/machinery/light/directional/south,
|
|
||||||
/obj/effect/turf_decal/tile/bar/opposingcorners,
|
/obj/effect/turf_decal/tile/bar/opposingcorners,
|
||||||
/obj/machinery/light/small/directional/south,
|
/obj/machinery/light/small/directional/south,
|
||||||
/turf/open/floor/iron,
|
/turf/open/floor/iron,
|
||||||
|
|||||||
@@ -351,7 +351,7 @@
|
|||||||
"kp" = (
|
"kp" = (
|
||||||
/obj/effect/spawner/random/environmentally_safe_anomaly/immobile,
|
/obj/effect/spawner/random/environmentally_safe_anomaly/immobile,
|
||||||
/turf/template_noop,
|
/turf/template_noop,
|
||||||
/area/space)
|
/area/space/nearstation)
|
||||||
"kt" = (
|
"kt" = (
|
||||||
/obj/effect/turf_decal/tile/purple/half/contrasted{
|
/obj/effect/turf_decal/tile/purple/half/contrasted{
|
||||||
dir = 1
|
dir = 1
|
||||||
|
|||||||
@@ -285,7 +285,7 @@
|
|||||||
/turf/open/misc/asteroid/airless,
|
/turf/open/misc/asteroid/airless,
|
||||||
/area/ruin/space)
|
/area/ruin/space)
|
||||||
"ET" = (
|
"ET" = (
|
||||||
/mob/living/basic/lizard,
|
/mob/living/basic/lizard/space,
|
||||||
/turf/open/misc/asteroid/airless,
|
/turf/open/misc/asteroid/airless,
|
||||||
/area/ruin/space)
|
/area/ruin/space)
|
||||||
"Fo" = (
|
"Fo" = (
|
||||||
|
|||||||
@@ -122,7 +122,6 @@
|
|||||||
/area/ruin/space/has_grav/garbagetruck/toystore)
|
/area/ruin/space/has_grav/garbagetruck/toystore)
|
||||||
"lm" = (
|
"lm" = (
|
||||||
/obj/structure/spider/stickyweb,
|
/obj/structure/spider/stickyweb,
|
||||||
/obj/structure/spider/stickyweb/very_sticky,
|
|
||||||
/turf/open/floor/plating,
|
/turf/open/floor/plating,
|
||||||
/area/ruin/space/has_grav/garbagetruck/toystore)
|
/area/ruin/space/has_grav/garbagetruck/toystore)
|
||||||
"mf" = (
|
"mf" = (
|
||||||
@@ -182,7 +181,6 @@
|
|||||||
/turf/open/floor/plating,
|
/turf/open/floor/plating,
|
||||||
/area/ruin/space/has_grav/garbagetruck/toystore)
|
/area/ruin/space/has_grav/garbagetruck/toystore)
|
||||||
"qX" = (
|
"qX" = (
|
||||||
/obj/structure/spider/stickyweb/very_sticky,
|
|
||||||
/obj/item/food/badrecipe/moldy,
|
/obj/item/food/badrecipe/moldy,
|
||||||
/obj/structure/spider/stickyweb,
|
/obj/structure/spider/stickyweb,
|
||||||
/obj/item/food/spidereggs{
|
/obj/item/food/spidereggs{
|
||||||
|
|||||||
@@ -147,8 +147,8 @@
|
|||||||
/turf/open/floor/iron/dark/airless,
|
/turf/open/floor/iron/dark/airless,
|
||||||
/area/ruin/space/prison_shuttle)
|
/area/ruin/space/prison_shuttle)
|
||||||
"O" = (
|
"O" = (
|
||||||
/mob/living/basic/cockroach,
|
|
||||||
/obj/effect/turf_decal/tile/brown/fourcorners,
|
/obj/effect/turf_decal/tile/brown/fourcorners,
|
||||||
|
/obj/effect/decal/cleanable/xenoblood/xsplatter,
|
||||||
/turf/open/floor/iron/dark/airless,
|
/turf/open/floor/iron/dark/airless,
|
||||||
/area/ruin/space/prison_shuttle)
|
/area/ruin/space/prison_shuttle)
|
||||||
"P" = (
|
"P" = (
|
||||||
|
|||||||
@@ -736,7 +736,6 @@
|
|||||||
/turf/open/floor/iron/grimy,
|
/turf/open/floor/iron/grimy,
|
||||||
/area/shuttle/abandoned/crew)
|
/area/shuttle/abandoned/crew)
|
||||||
"yM" = (
|
"yM" = (
|
||||||
/obj/machinery/light/cold/directional/south,
|
|
||||||
/obj/effect/decal/cleanable/dirt,
|
/obj/effect/decal/cleanable/dirt,
|
||||||
/obj/machinery/light/broken/directional/south,
|
/obj/machinery/light/broken/directional/south,
|
||||||
/obj/machinery/firealarm/directional/east,
|
/obj/machinery/firealarm/directional/east,
|
||||||
@@ -1084,15 +1083,6 @@
|
|||||||
},
|
},
|
||||||
/turf/open/floor/iron/small,
|
/turf/open/floor/iron/small,
|
||||||
/area/shuttle/abandoned/pod)
|
/area/shuttle/abandoned/pod)
|
||||||
"Jk" = (
|
|
||||||
/obj/effect/decal/cleanable/dirt,
|
|
||||||
/obj/machinery/power/apc/auto_name/directional/south,
|
|
||||||
/obj/structure/cable,
|
|
||||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
|
|
||||||
dir = 4
|
|
||||||
},
|
|
||||||
/turf/open/floor/iron/smooth_large,
|
|
||||||
/area/shuttle/abandoned/cargo)
|
|
||||||
"Jn" = (
|
"Jn" = (
|
||||||
/obj/structure/dresser,
|
/obj/structure/dresser,
|
||||||
/obj/effect/decal/cleanable/dirt,
|
/obj/effect/decal/cleanable/dirt,
|
||||||
@@ -1712,7 +1702,7 @@ wE
|
|||||||
RX
|
RX
|
||||||
gV
|
gV
|
||||||
EX
|
EX
|
||||||
Jk
|
Ui
|
||||||
kQ
|
kQ
|
||||||
Jn
|
Jn
|
||||||
iS
|
iS
|
||||||
|
|||||||
@@ -115,7 +115,7 @@
|
|||||||
if(R.unpickable)
|
if(R.unpickable)
|
||||||
continue
|
continue
|
||||||
ruins_available[R] = R.placement_weight
|
ruins_available[R] = R.placement_weight
|
||||||
while((budget > 0 || mineral_budget > 0) && (ruins_available.len || forced_ruins.len))
|
while(((budget > 0 || mineral_budget > 0) && ruins_available.len) || forced_ruins.len)
|
||||||
var/datum/map_template/ruin/current_pick
|
var/datum/map_template/ruin/current_pick
|
||||||
var/forced = FALSE
|
var/forced = FALSE
|
||||||
var/forced_z //If set we won't pick z level and use this one instead.
|
var/forced_z //If set we won't pick z level and use this one instead.
|
||||||
|
|||||||
@@ -99,7 +99,7 @@
|
|||||||
continue
|
continue
|
||||||
if(on_turf.dir != dir)
|
if(on_turf.dir != dir)
|
||||||
continue
|
continue
|
||||||
stack_trace("Conflicting double stacked light [on_turf.type] found at ([our_location.x],[our_location.y],[our_location.z])")
|
stack_trace("Conflicting double stacked light [on_turf.type] found at [get_area(our_location)] ([our_location.x],[our_location.y],[our_location.z])")
|
||||||
qdel(on_turf)
|
qdel(on_turf)
|
||||||
|
|
||||||
if(!mapload) //sync up nightshift lighting for player made lights
|
if(!mapload) //sync up nightshift lighting for player made lights
|
||||||
|
|||||||
Reference in New Issue
Block a user