cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makes radiation shielded an area flag

Browse Source
This commit is contained in:
Ravensdale
2015-03-17 18:54:45 -07:00
parent 961272817f
commit 2201ab21d4
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/area/Space Station 13 areas.dm
View File

@@ -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/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/sound/forced_ambience = null
var/rad_shielded = 0
/*Adding a wizard area teleport list because motherfucking lag -- Urist*/ /*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*/ /*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() var/list/teleportlocs = list()
@@ -474,7 +472,7 @@ area/space/atmosalert()
icon_state = "yellow" icon_state = "yellow"
requires_power = 0 requires_power = 0
unlimited_power = 1 unlimited_power = 1
rad_shielded = 1 flags = RAD_SHIELDED
/area/syndicate_station/start /area/syndicate_station/start
name = "\improper Mercenary Forward Operating Base" name = "\improper Mercenary Forward Operating Base"
@@ -531,7 +529,7 @@ area/space/atmosalert()
/area/vox_station /area/vox_station
requires_power = 0 requires_power = 0
rad_shielded = 1 flags = RAD_SHIELDED
/area/vox_station/transit /area/vox_station/transit
name = "\improper hyperspace" name = "\improper hyperspace"
@@ -647,7 +645,7 @@ area/space/atmosalert()
//Maintenance //Maintenance
/area/maintenance /area/maintenance
rad_shielded = 1 flags = RAD_SHIELDED
/area/maintenance/aft /area/maintenance/aft
name = "Aft Maintenance" name = "Aft Maintenance"
@@ -922,7 +920,7 @@ area/space/atmosalert()
/area/crew_quarters /area/crew_quarters
name = "\improper Dormitories" name = "\improper Dormitories"
icon_state = "Sleep" icon_state = "Sleep"
rad_shielded = 1 flags = RAD_SHIELDED
/area/crew_quarters/toilet /area/crew_quarters/toilet
name = "\improper Dormitory Toilets" name = "\improper Dormitory Toilets"

2
code/modules/events/radiation_storm.dm
View File

@@ -35,7 +35,7 @@
continue continue
if(!(A.z in config.station_levels)) if(!(A.z in config.station_levels))
continue continue
if(A.rad_shielded) if(A.flags & RAD_SHIELDED)
continue continue
if(istype(C,/mob/living/carbon/human)) if(istype(C,/mob/living/carbon/human))

5
code/setup.dm
View File

@@ -800,4 +800,7 @@ var/list/be_special_flags = list(
#define APPEARANCE_ALL 511 #define APPEARANCE_ALL 511
#define MIN_SUPPLIED_LAW_NUMBER 15 #define MIN_SUPPLIED_LAW_NUMBER 15
#define MAX_SUPPLIED_LAW_NUMBER 50 #define MAX_SUPPLIED_LAW_NUMBER 50
//Area flags, possibly more to come
#define RAD_SHIELDED 1 //shielded from radiation, clearly