From 4a68f6097d4a8ee9f59ef8555bebdc7f8dda57ec Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Sun, 11 Jan 2015 10:49:29 +0100
Subject: [PATCH] Fixes #7743.

Makes syndicate and vox shuttle areas radiation safe.
---
 code/game/area/Space Station 13 areas.dm | 17 +++++++++++------
 code/modules/events/radiation_storm.dm   |  8 ++++----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm
index f875b9975c5..c793ecb857c 100755
--- a/code/game/area/Space Station 13 areas.dm	
+++ b/code/game/area/Space Station 13 areas.dm	
@@ -57,6 +57,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	var/list/ambience = list('sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg')
 	var/sound/forced_ambience = null
 
+	var/rad_shielded = 0
+
 /*Adding a wizard area teleport list because motherfucking lag -- Urist*/
 /*I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game*/
 var/list/teleportlocs = list()
@@ -458,6 +460,7 @@ var/list/ghostteleportlocs = list()
 	icon_state = "yellow"
 	requires_power = 0
 	unlimited_power = 1
+	rad_shielded = 1
 
 /area/syndicate_station/start
 	name = "\improper Mercenary Forward Operating Base"
@@ -512,35 +515,33 @@ var/list/ghostteleportlocs = list()
 	icon_state = "yellow"
 	requires_power = 0
 
+/area/vox_station
+	requires_power = 0
+	rad_shielded = 1
+
 /area/vox_station/transit
 	name = "\improper hyperspace"
 	icon_state = "shuttle"
-	requires_power = 0
 
 /area/vox_station/southwest_solars
 	name = "\improper aft port solars"
 	icon_state = "southwest"
-	requires_power = 0
 
 /area/vox_station/northwest_solars
 	name = "\improper fore port solars"
 	icon_state = "northwest"
-	requires_power = 0
 
 /area/vox_station/northeast_solars
 	name = "\improper fore starboard solars"
 	icon_state = "northeast"
-	requires_power = 0
 
 /area/vox_station/southeast_solars
 	name = "\improper aft starboard solars"
 	icon_state = "southeast"
-	requires_power = 0
 
 /area/vox_station/mining
 	name = "\improper nearby mining asteroid"
 	icon_state = "north"
-	requires_power = 0
 
 //PRISON
 /area/prison
@@ -633,6 +634,9 @@ var/list/ghostteleportlocs = list()
 
 //Maintenance
 
+/area/maintenance
+	rad_shielded = 1
+
 /area/maintenance/aft
 	name = "Aft Maintenance"
 	icon_state = "amaint"
@@ -906,6 +910,7 @@ var/list/ghostteleportlocs = list()
 /area/crew_quarters
 	name = "\improper Dormitories"
 	icon_state = "Sleep"
+	rad_shielded = 1
 
 /area/crew_quarters/toilet
 	name = "\improper Dormitory Toilets"
diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm
index a5b6c6be558..a288752ff78 100644
--- a/code/modules/events/radiation_storm.dm
+++ b/code/modules/events/radiation_storm.dm
@@ -30,12 +30,12 @@
 
 /datum/event/radiation_storm/proc/radiate()
 	for(var/mob/living/carbon/C in living_mob_list)
-		var/turf/T = get_turf(C)
-		if(!T)
+		var/area/A = get_area(C)
+		if(!A)
 			continue
-		if(!(T.z in config.station_levels))
+		if(!(A.z in config.station_levels))
 			continue
-		if(istype(T.loc, /area/maintenance) || istype(T.loc, /area/crew_quarters))
+		if(A.rad_shielded)
 			continue
 
 		if(istype(C,/mob/living/carbon/human))