From b85384c0adc11f0817aa1d3a2415f902738508b6 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 2 Jun 2017 23:36:45 -0500 Subject: [PATCH] Fixes meteor and immoveable rods hitting Centcomm (#1252) --- code/game/gamemodes/meteor/meteors.dm | 8 ++++---- code/modules/events/immovable_rod.dm | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 9def30992e..3ce5a01cfa 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -31,15 +31,15 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event var/max_i = 10//number of tries to spawn meteor. while(!isspaceturf(pickedstart)) var/startSide = pick(GLOB.cardinal) - pickedstart = spaceDebrisStartLoc(startSide, 1) - pickedgoal = spaceDebrisFinishLoc(startSide, 1) + pickedstart = spaceDebrisStartLoc(startSide, ZLEVEL_STATION) + pickedgoal = spaceDebrisFinishLoc(startSide, ZLEVEL_STATION) max_i-- if(max_i<=0) return var/Me = pickweight(meteortypes) var/obj/effect/meteor/M = new Me(pickedstart) M.dest = pickedgoal - M.z_original = 1 + M.z_original = ZLEVEL_STATION spawn(0) walk_towards(M, M.dest, 1) @@ -96,7 +96,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event pass_flags = PASSTABLE var/heavy = 0 var/meteorsound = 'sound/effects/meteorimpact.ogg' - var/z_original = 1 + var/z_original = ZLEVEL_STATION var/threat = 0 // used for determining which meteors are most interesting var/lifetime = DEFAULT_METEOR_LIFETIME diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm index a7a7d70720..2b46d82df1 100644 --- a/code/modules/events/immovable_rod.dm +++ b/code/modules/events/immovable_rod.dm @@ -21,8 +21,8 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 /datum/round_event/immovable_rod/start() var/startside = pick(GLOB.cardinal) - var/turf/startT = spaceDebrisStartLoc(startside, 1) - var/turf/endT = spaceDebrisFinishLoc(startside, 1) + var/turf/startT = spaceDebrisStartLoc(startside, ZLEVEL_STATION) + var/turf/endT = spaceDebrisFinishLoc(startside, ZLEVEL_STATION) new /obj/effect/immovablerod(startT, endT) /obj/effect/immovablerod