From 2201ab21d4d73f4fdc16b8dccff33645c907348a Mon Sep 17 00:00:00 2001 From: Ravensdale Date: Tue, 17 Mar 2015 18:54:45 -0700 Subject: [PATCH] Makes radiation shielded an area flag --- code/game/area/Space Station 13 areas.dm | 10 ++++------ code/modules/events/radiation_storm.dm | 2 +- code/setup.dm | 5 ++++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index f1a7f8ffb6..4be5e53a42 100755 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -57,8 +57,6 @@ 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() @@ -474,7 +472,7 @@ area/space/atmosalert() icon_state = "yellow" requires_power = 0 unlimited_power = 1 - rad_shielded = 1 + flags = RAD_SHIELDED /area/syndicate_station/start name = "\improper Mercenary Forward Operating Base" @@ -531,7 +529,7 @@ area/space/atmosalert() /area/vox_station requires_power = 0 - rad_shielded = 1 + flags = RAD_SHIELDED /area/vox_station/transit name = "\improper hyperspace" @@ -647,7 +645,7 @@ area/space/atmosalert() //Maintenance /area/maintenance - rad_shielded = 1 + flags = RAD_SHIELDED /area/maintenance/aft name = "Aft Maintenance" @@ -922,7 +920,7 @@ area/space/atmosalert() /area/crew_quarters name = "\improper Dormitories" icon_state = "Sleep" - rad_shielded = 1 + flags = RAD_SHIELDED /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 a288752ff7..87720ca63d 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -35,7 +35,7 @@ continue if(!(A.z in config.station_levels)) continue - if(A.rad_shielded) + if(A.flags & RAD_SHIELDED) continue if(istype(C,/mob/living/carbon/human)) diff --git a/code/setup.dm b/code/setup.dm index 155414e66b..141734a030 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -800,4 +800,7 @@ var/list/be_special_flags = list( #define APPEARANCE_ALL 511 #define MIN_SUPPLIED_LAW_NUMBER 15 -#define MAX_SUPPLIED_LAW_NUMBER 50 \ No newline at end of file +#define MAX_SUPPLIED_LAW_NUMBER 50 + +//Area flags, possibly more to come +#define RAD_SHIELDED 1 //shielded from radiation, clearly \ No newline at end of file