Makes all things that check for dorms check for forbid events var

This commit is contained in:
Casey
2022-06-30 17:02:10 -04:00
committed by CHOMPStation2
parent a34b97046c
commit 84e6bfd922
7 changed files with 28 additions and 4 deletions

View File

@@ -18,7 +18,8 @@
continue
if(vent.welded)
continue
if(istype(get_area(vent), /area/crew_quarters/sleep)) //No going to dorms
var/area/A = get_area(vent)
if(A.forbid_events)
continue
vent_list += vent
if(!vent_list.len)

View File

@@ -11,9 +11,14 @@
spawncount = rand(2 * severity, 6 * severity)
for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in machines)
<<<<<<< HEAD
//CHOMPEdit: Added a couple areas to the exclusion. Also made this actually work.
var/in_area = get_area(temp_vent)
if(istype(in_area, /area/crew_quarters/sleep) || istype(in_area, /area/hallway/secondary/entry))
=======
var/area/A = get_area(temp_vent)
if(A.forbid_events)
>>>>>>> eb06a4b9e2... Merge pull request #13220 from Heroman3003/forbid-events
continue
if(!temp_vent.welded && temp_vent.network && (temp_vent.loc.z in using_map.station_levels))
if(temp_vent.network.normal_members.len > 10) //CHOMP Edit: Most our networks are 40. SM is 4 and toxins is 2. This needed to change in order to spawn.

View File

@@ -22,8 +22,15 @@
if(istype(in_area, /area/crew_quarters/sleep) || istype(in_area, /area/hallway/secondary/entry))
continue
if(!temp_vent.welded && temp_vent.network && (temp_vent.loc.z in using_map.station_levels))
<<<<<<< HEAD
if(temp_vent.network.normal_members.len > 10) //CHOMP Edit: Most our networks are 40. SM is 4 and toxins is 2. This needed to change in order to spawn.
vents += temp_vent
=======
if(temp_vent.network.normal_members.len > 50)
var/area/A = get_area(temp_vent)
if(!(A.forbid_events))
vents += temp_vent
>>>>>>> eb06a4b9e2... Merge pull request #13220 from Heroman3003/forbid-events
while((spawncount >= 1) && vents.len)
var/obj/vent = pick(vents)

View File

@@ -365,7 +365,8 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
return 0
// VOREStation Edit Start
if(istype(get_area(T), /area/crew_quarters/sleep)) //No going to dorms
var/area/A = get_area(T)
if(A.forbid_events) //No going to dorms
return 0
// VOREStation Edit End

View File

@@ -158,7 +158,9 @@
/proc/GetAnomalySusceptibility(var/mob/living/carbon/human/H)
if(!istype(H))
return 1
if(istype(get_area(H),/area/crew_quarters/sleep)) return 0 //VOREStation Edit - Dorms are protected from anomalies
var/area/A = get_area(H)
if(A.forbid_events)
return 0
var/protected = 0
//anomaly suits give best protection, but excavation suits are almost as good

View File

@@ -357,6 +357,7 @@
/area/groundbase/civilian/arrivals
name = "Arrivals"
lightswitch = 1
forbid_events = TRUE
/area/groundbase/civilian/toolstorage
name = "Tool Storage"
lightswitch = 1
@@ -414,11 +415,16 @@
name = "Men's Restroom"
sound_env = SOUND_ENVIRONMENT_BATHROOM
lightswitch = 1
forbid_events = TRUE
/area/groundbase/civilian/womensrestroom
name = "Women's Restroom"
sound_env = SOUND_ENVIRONMENT_BATHROOM
lightswitch = 1
<<<<<<< HEAD
>>>>>>> d8515387bc... Merge pull request #12695 from Very-Soft/gbtweaks
=======
forbid_events = TRUE
>>>>>>> eb06a4b9e2... Merge pull request #13220 from Heroman3003/forbid-events
/area/groundbase/exploration
name = "Exploration"

View File

@@ -272,8 +272,10 @@
/area/stellardelight/deck3/transitgateway
name = "Transit Gateway"
forbid_events = TRUE
/area/stellardelight/deck3/cryo
name = "Cryogenic Storage"
forbid_events = TRUE
/area/stellardelight/deck3/readingroom
name = "Reading Rooms"
@@ -281,7 +283,7 @@
flags = RAD_SHIELDED| BLUE_SHIELDED |AREA_FLAG_IS_NOT_PERSISTENT
soundproofed = TRUE
block_suit_sensors = TRUE
forbid_events = TRUE
forbid_events = TRUE
/area/stellardelight/deck3/portdock
name = "Port Dock"