Merge pull request #13332 from Heroman3003/teslamove

Separates Forbids Events from Forbids Singulo
This commit is contained in:
Casey
2022-07-15 18:32:21 -04:00
committed by GitHub
5 changed files with 9 additions and 2 deletions
+1
View File
@@ -1010,6 +1010,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
flags = RAD_SHIELDED
ambience = AMBIENCE_GENERIC
forbid_events = TRUE
forbid_singulo = TRUE
/area/crew_quarters/toilet
name = "\improper Dormitory Toilets"
+2 -1
View File
@@ -51,6 +51,7 @@
var/sound_env = STANDARD_STATION
var/turf/base_turf //The base turf type of the area, which can be used to override the z-level's base turf
var/forbid_events = FALSE // If true, random events will not start inside this area.
var/forbid_singulo = FALSE // If true singulo will not move in.
var/no_spoilers = FALSE // If true, makes it much more difficult to see what is inside an area with things like mesons.
var/soundproofed = FALSE // If true, blocks sounds from other areas and prevents hearers on other areas from hearing the sounds within.
@@ -379,7 +380,7 @@ var/list/mob/living/forced_ambiance_list = new
/area/Entered(mob/M)
if(!istype(M) || !M.ckey)
return
if(!isliving(M))
M.lastarea = src
return
@@ -366,7 +366,7 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
// VOREStation Edit Start
var/area/A = get_area(T)
if(A.forbid_events) //No going to dorms
if(A.forbid_singulo) //No going to dorms
return 0
// VOREStation Edit End
+2
View File
@@ -360,6 +360,7 @@
name = "Arrivals"
lightswitch = 1
forbid_events = TRUE
forbid_singulo = TRUE
/area/groundbase/civilian/toolstorage
name = "Tool Storage"
lightswitch = 1
@@ -446,6 +447,7 @@
limit_mob_size = FALSE
block_suit_sensors = TRUE
forbid_events = TRUE
forbid_singulo = TRUE
/area/groundbase/dorms/bathroom
name = "Dormitory Bathroom"
@@ -130,6 +130,7 @@
limit_mob_size = FALSE
block_suit_sensors = TRUE
forbid_events = TRUE
forbid_singulo = TRUE
/area/stellardelight/deck1/dorms/dorm1
name = "Dormitory One"
@@ -273,9 +274,11 @@
/area/stellardelight/deck3/transitgateway
name = "Transit Gateway"
forbid_events = TRUE
forbid_singulo = TRUE
/area/stellardelight/deck3/cryo
name = "Cryogenic Storage"
forbid_events = TRUE
forbid_singulo = TRUE
/area/stellardelight/deck3/readingroom
name = "Reading Rooms"