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

Merge pull request #13332 from Heroman3003/teslamove

Browse Source 
Separates Forbids Events from Forbids Singulo
This commit is contained in:
Casey
2022-07-15 18:32:21 -04:00
committed by CHOMPStation2
parent 494be6adef
commit 95158e98ce
5 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -966,6 +966,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "Sleep" icon_state = "Sleep"
ambience = AMBIENCE_GENERIC ambience = AMBIENCE_GENERIC
forbid_events = TRUE forbid_events = TRUE
forbid_singulo = TRUE
/area/crew_quarters/toilet /area/crew_quarters/toilet
name = "\improper Dormitory Toilets" name = "\improper Dormitory Toilets"

3
code/game/area/areas.dm
View File

@@ -51,6 +51,7 @@
var/sound_env = STANDARD_STATION 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/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_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/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. 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) /area/Entered(mob/M)
if(!istype(M) || !M.ckey) if(!istype(M) || !M.ckey)
return return
if(!isliving(M)) if(!isliving(M))
M.lastarea = src M.lastarea = src
return return

2
code/modules/power/singularity/singularity.dm
View File

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

2
maps/groundbase/groundbase_areas.dm
View File

@@ -358,6 +358,7 @@
name = "Arrivals" name = "Arrivals"
lightswitch = 1 lightswitch = 1
forbid_events = TRUE forbid_events = TRUE
forbid_singulo = TRUE
/area/groundbase/civilian/toolstorage /area/groundbase/civilian/toolstorage
name = "Tool Storage" name = "Tool Storage"
lightswitch = 1 lightswitch = 1
@@ -441,6 +442,7 @@
limit_mob_size = FALSE limit_mob_size = FALSE
block_suit_sensors = TRUE block_suit_sensors = TRUE
forbid_events = TRUE forbid_events = TRUE
forbid_singulo = TRUE
/area/groundbase/dorms/bathroom /area/groundbase/dorms/bathroom
name = "Dormitory Bathroom" name = "Dormitory Bathroom"

3
maps/stellar_delight/stellar_delight_areas.dm
View File

@@ -130,6 +130,7 @@
limit_mob_size = FALSE limit_mob_size = FALSE
block_suit_sensors = TRUE block_suit_sensors = TRUE
forbid_events = TRUE forbid_events = TRUE
forbid_singulo = TRUE
/area/stellardelight/deck1/dorms/dorm1 /area/stellardelight/deck1/dorms/dorm1
name = "Dormitory One" name = "Dormitory One"
@@ -273,9 +274,11 @@
/area/stellardelight/deck3/transitgateway /area/stellardelight/deck3/transitgateway
name = "Transit Gateway" name = "Transit Gateway"
forbid_events = TRUE forbid_events = TRUE
forbid_singulo = TRUE
/area/stellardelight/deck3/cryo /area/stellardelight/deck3/cryo
name = "Cryogenic Storage" name = "Cryogenic Storage"
forbid_events = TRUE forbid_events = TRUE
forbid_singulo = TRUE
/area/stellardelight/deck3/readingroom /area/stellardelight/deck3/readingroom
name = "Reading Rooms" name = "Reading Rooms"