From 8232e9cf93c8064df8e5415971da3bfeba1a75b2 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Mon, 20 Jun 2016 12:34:42 -0400 Subject: [PATCH 1/2] Nuclear bombs now explode the station as long as they're on the station zlevel --- code/game/gamemodes/nuclear/nuclearbomb.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index a1eda87c2f9..706feca24bb 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -347,7 +347,7 @@ var/bomb_set return -#define NUKERANGE 80 +#define NUKERANGE 127 /obj/machinery/nuclearbomb/proc/explode() if (safety) timing = 0 From d5ce2a7dfb752bf64ebfa3ae4af743292f10f516 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Mon, 20 Jun 2016 12:49:45 -0400 Subject: [PATCH 2/2] spacenukes --- code/game/gamemodes/nuclear/nuclearbomb.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 706feca24bb..c9ace208f13 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -372,8 +372,11 @@ var/bomb_set var/off_station = 0 var/turf/bomb_location = get_turf(src) - if( bomb_location && (bomb_location.z == ZLEVEL_STATION) ) - if( (bomb_location.x < (128-NUKERANGE)) || (bomb_location.x > (128+NUKERANGE)) || (bomb_location.y < (128-NUKERANGE)) || (bomb_location.y > (128+NUKERANGE)) ) + if(bomb_location && (bomb_location.z == ZLEVEL_STATION)) + var/area/A = get_area(bomb_location) + if(istype(A, /area/space)) + off_station = 1 + if((bomb_location.x < (128-NUKERANGE)) || (bomb_location.x > (128+NUKERANGE)) || (bomb_location.y < (128-NUKERANGE)) || (bomb_location.y > (128+NUKERANGE))) off_station = 1 else off_station = 2