From cf0b1bbac640ac03b35c91f2776853791705a04b Mon Sep 17 00:00:00 2001 From: BlackMajor Date: Fri, 21 Feb 2020 00:22:50 +1300 Subject: [PATCH] Replace ablative bat with spear. Give ruins a max distance from the transit edge, to dissuade spawning too close to the station. --- _maps/RandomRuins/SpaceRuinsStation/roid6.dmm | 2 +- code/modules/mapping/ruins.dm | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuinsStation/roid6.dmm b/_maps/RandomRuins/SpaceRuinsStation/roid6.dmm index c6cd96ef07..0b5fedd672 100644 --- a/_maps/RandomRuins/SpaceRuinsStation/roid6.dmm +++ b/_maps/RandomRuins/SpaceRuinsStation/roid6.dmm @@ -20,7 +20,6 @@ icon_state = "medium" }, /obj/item/reagent_containers/food/snacks/meat/slab/spider, -/obj/item/melee/baseball_bat/ablative, /turf/open/floor/mineral/titanium/blue, /area/ruin/unpowered) "q" = ( @@ -45,6 +44,7 @@ /area/ruin/unpowered) "C" = ( /obj/effect/decal/remains/human, +/obj/item/twohanded/spear, /turf/open/floor/mineral/titanium/blue, /area/ruin/unpowered) "F" = ( diff --git a/code/modules/mapping/ruins.dm b/code/modules/mapping/ruins.dm index 34ce6ef35c..833629dd52 100644 --- a/code/modules/mapping/ruins.dm +++ b/code/modules/mapping/ruins.dm @@ -6,7 +6,11 @@ sanity-- var/width_border = TRANSITIONEDGE + SPACERUIN_MAP_EDGE_PAD + round(width / 2) var/height_border = TRANSITIONEDGE + SPACERUIN_MAP_EDGE_PAD + round(height / 2) - var/turf/central_turf = forced_turf ? forced_turf : locate(rand(width_border, world.maxx - width_border), rand(height_border, world.maxy - height_border), z) + var/turf/central_turf + if(is_station_level(z)) //used to make a square around the station for generating station side ruins without getting too close. + central_turf = pick(block(locate(10,10,z), locate((world.maxx - 10), (world.maxy - 10), z)) - block(locate(45,45,z), locate(210,210,z))) //FIGURE OUT A BETTER WAY TO DO THIS + else + central_turf = forced_turf ? forced_turf : locate(rand(width_border, world.maxx - width_border), rand(height_border, world.maxy - height_border), z) var/valid = TRUE for(var/turf/check in get_affected_turfs(central_turf,1))