cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 05:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] converts area booleans to flags (#9595)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-12-08 15:57:55 +01:00
committed by GitHub
co-authored by Heroman3003 Kashargul
parent 7131e4602e
commit 893b4e2ac0
64 changed files with 221 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/area/CC_areas_vr.dm
+24
View File
@@ -9,3 +9,27 @@
icon_state = "centcom_dock"
ambience = AMBIENCE_ARRIVALS
base_turf = /turf/simulated/floor/reinforced
//////// Abductor Areas ////////
/area/unknown
requires_power = 0
flags = RAD_SHIELDED | AREA_ALLOW_LARGE_SIZE
icon_state = "red2"
/area/unknown/dorm1
name = "Unknown Dorm 1"
/area/unknown/dorm2
name = "Unknown Dorm 2"
/area/unknown/dorm3
name = "Unknown Dorm 3"
/area/unknown/dorm4
name = "Unknown Dorm 4"
/area/unknown/dorm5
name = "Unknown Dorm 5"
/area/unknown/dorm6
name = "Unknown Dorm 6"
code/game/area/Space Station 13 areas.dm
+8 -12
View File
@@ -70,10 +70,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/shuttle
requires_power = 0
flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT
flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT | AREA_FORBID_EVENTS
sound_env = SMALL_ENCLOSED
base_turf = /turf/space
forbid_events = TRUE
/area/shuttle/arrival
name = "\improper Arrival Shuttle"
@@ -784,7 +783,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "construction"
/area/hallway/secondary/entry
forbid_events = TRUE
flags = AREA_FORBID_EVENTS
/area/hallway/secondary/entry/fore
name = "\improper Shuttle Dock Hallway - Mid"
@@ -806,13 +805,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "\improper Shuttle Dock Hallway - Dock One"
icon_state = "entry_D1"
base_turf = /turf/space
forbid_events = TRUE
flags = AREA_FORBID_EVENTS
/area/hallway/secondary/entry/D2
name = "\improper Shuttle Dock Hallway - Dock Two"
icon_state = "entry_D2"
base_turf = /turf/space
forbid_events = TRUE
flags = AREA_FORBID_EVENTS
/area/hallway/secondary/entry/D2/arrivals
name = "\improper Shuttle Dock Hallway - Dock Two"
@@ -824,7 +823,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "\improper Shuttle Dock Hallway - Dock Three"
icon_state = "entry_D3"
base_turf = /turf/space
forbid_events = TRUE
flags = AREA_FORBID_EVENTS
/area/hallway/secondary/entry/D4
name = "\improper Shuttle Dock Hallway - Dock Four"
@@ -964,9 +963,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/crew_quarters
name = "\improper Dormitories"
icon_state = "Sleep"
flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO
ambience = AMBIENCE_GENERIC
forbid_events = TRUE
forbid_singulo = TRUE
/area/crew_quarters/toilet
name = "\improper Dormitory Toilets"
@@ -976,7 +974,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/crew_quarters/sleep
name = "\improper Dormitories"
icon_state = "Sleep"
flags = RAD_SHIELDED
/area/crew_quarters/sleep/Apartment_A1
name = "\improper Apartment A1"
@@ -1282,8 +1279,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "Holodeck"
dynamic_lighting = 0
sound_env = LARGE_ENCLOSED
forbid_events = TRUE
flags = AREA_FLAG_IS_NOT_PERSISTENT
flags = AREA_FLAG_IS_NOT_PERSISTENT | AREA_FORBID_EVENTS
/area/holodeck/alphadeck
name = "\improper Holodeck Alpha"
@@ -1388,7 +1384,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "\improper Engine Room"
icon_state = "engine"
sound_env = LARGE_ENCLOSED
forbid_events = TRUE
flags = AREA_FORBID_EVENTS
/area/engineering/engine_airlock
name = "\improper Engine Room Airlock"
code/game/area/Space Station 13 areas_ch.dm
+4 -80
View File
@@ -1,49 +1,24 @@
/area/surface/outpost/main/dorms
name = "\improper Main Outpost Dorms"
soundproofed = TRUE
forbid_events = TRUE
flags = RAD_SHIELDED | AREA_SOUNDPROOF | AREA_FORBID_EVENTS | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/surface/outpost/main/dorms/dorm_1
name = "\improper Main Outpost Dorm One"
flags = RAD_SHIELDED
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/surface/outpost/main/dorms/dorm_2
name = "\improper Main Outpost Dorm Two"
flags = RAD_SHIELDED
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/surface/outpost/main/dorms/dorm_3
name = "\improper Main Outpost Dorm Three"
flags = RAD_SHIELDED
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/surface/outpost/main/dorms/dorm_4
name = "\improper Main Outpost Dorm Four"
flags = RAD_SHIELDED
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/surface/outpost/main/dorms/dorm_5
name = "\improper Main Outpost Dorm Five"
flags = RAD_SHIELDED
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/surface/outpost/main/dorms/dorm_6
name = "\improper Main Outpost Dorm Six"
flags = RAD_SHIELDED
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/cafeteria
flags = RAD_SHIELDED
@@ -61,84 +36,35 @@
flags = RAD_SHIELDED
/area/crew_quarters/sleep
soundproofed = TRUE
forbid_events = TRUE
flags = RAD_SHIELDED | AREA_SOUNDPROOF | AREA_FORBID_EVENTS | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/crew_quarters/sleep/vistor_room_1
flags = RAD_SHIELDED
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/vistor_room_2
flags = RAD_SHIELDED
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/vistor_room_3
flags = RAD_SHIELDED
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/vistor_room_4
flags = RAD_SHIELDED
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/vistor_room_5
flags = RAD_SHIELDED
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/vistor_room_6
flags = RAD_SHIELDED
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/vistor_room_7
flags = RAD_SHIELDED
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/vistor_room_8
flags = RAD_SHIELDED
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/vistor_room_9
flags = RAD_SHIELDED
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/vistor_room_10
flags = RAD_SHIELDED
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/vistor_room_11
flags = RAD_SHIELDED
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/vistor_room_12
flags = RAD_SHIELDED
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/medical/cryo/autoresleeve
name = "\improper Medical Autoresleeving"
forbid_events = TRUE
flags = AREA_FORBID_EVENTS
/area/rnd/research/particleaccelerator
name = "\improper Particle Accelerator Lab"
@@ -148,10 +74,8 @@
name = "\improper Shadekin Retreat"
icon_state = "blue"
requires_power = 0
limit_dark_respite = TRUE
limit_mob_size = FALSE
ambience = AMBIENCE_OTHERWORLDLY
flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT | BLUE_SHIELDED
flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT | BLUE_SHIELDED | AREA_ALLOW_LARGE_SIZE | AREA_LIMIT_DARK_RESPITE
/area/security/nuke_storage
flags = PHASE_SHIELDED
code/game/area/areas.dm
+9 -11
View File
@@ -40,7 +40,6 @@ GLOBAL_LIST_EMPTY(areas_by_type)
var/music = null
var/has_gravity = 1 // Don't check this var directly; use get_gravity() instead
var/secret_name = FALSE // This tells certain things that display areas' names that they shouldn't display this area's name.
var/obj/machinery/power/apc/apc = null
var/no_air = null
// var/list/lights // list of all lights on this area
@@ -52,12 +51,6 @@ GLOBAL_LIST_EMPTY(areas_by_type)
var/list/forced_ambience = null
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.
var/block_phase_shift = FALSE //Stops phase shifted mobs from entering // RS Port #658
var/block_ghosts = FALSE //Stops ghosts from entering //RS Port #658
/area/New()
// Used by the maploader, this must be done in New, not init
@@ -76,7 +69,7 @@ GLOBAL_LIST_EMPTY(areas_by_type)
power_equip = 0
power_environ = 0
power_change() // all machines set to current power level, also updates lighting icon
if(no_spoilers)
if(flag_check(AREA_NO_SPOILERS))
set_spoiler_obfuscation(TRUE)
// Changes the area of T to A. Do not do this manually.
@@ -398,7 +391,7 @@ var/list/mob/living/forced_ambiance_list = new
L.lastarea = src
L.lastareachange = world.time
play_ambience(L, initial = TRUE)
if(no_spoilers)
if(flag_check(AREA_NO_SPOILERS))
L.disable_spoiler_vision()
check_phase_shift(M) //RS Port #658
@@ -542,7 +535,7 @@ var/list/ghostteleportlocs = list()
return 1
/area/proc/get_name()
if(secret_name)
if(flag_check(AREA_SECRET_NAME))
return "Unknown Area"
return name
@@ -558,9 +551,14 @@ GLOBAL_DATUM(spoiler_obfuscation_image, /image)
else
cut_overlay(GLOB.spoiler_obfuscation_image)
/area/proc/flag_check(var/flag, var/match_all = FALSE)
if(match_all)
return (flags & flag) == flag
return flags & flag
// RS Port #658 Start
/area/proc/check_phase_shift(var/mob/ourmob)
if(!block_phase_shift || !ourmob.incorporeal_move)
if(!flag_check(AREA_BLOCK_PHASE_SHIFT) || !ourmob.incorporeal_move)
return
if(!isliving(ourmob))
return
code/game/area/areas_ch.dm
-2
View File
@@ -1,2 +0,0 @@
/area
var/limit_dark_respite = FALSE // Shadekin will die normally in an area where this is set to true
code/game/area/areas_vr.dm
+1 -4
View File
@@ -1,9 +1,6 @@
/area
var/enter_message
var/exit_message
var/limit_mob_size = TRUE //If mob size is limited in the area.
var/block_suit_sensors = FALSE //If suit sensors are blocked in the area.
var/block_tracking = FALSE //If camera tracking is blocked in the area.
var/turf/ceiling_type
// Size of the area in open turfs, only calculated for indoors areas.
@@ -71,5 +68,5 @@
power_equip = 0
power_environ = 0
power_change() // all machines set to current power level, also updates lighting icon
if(no_spoilers)
if(flag_check(AREA_NO_SPOILERS))
set_spoiler_obfuscation(TRUE)