From ead0180057000bc4d2095cfbddfbf28a480befb6 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Wed, 4 Dec 2024 22:21:38 +0100 Subject: [PATCH] converts area vars to flags --- code/__defines/misc.dm | 19 +- code/__defines/misc_vr.dm | 2 - code/__defines/species_languages_vr.dm | 1 + code/_helpers/unsorted_vr.dm | 2 +- code/controllers/subsystems/persistence.dm | 2 +- code/controllers/subsystems/radiation.dm | 2 +- code/datums/components/resize_guard.dm | 9 +- code/datums/repositories/crew.dm | 2 +- code/game/area/CC_areas_vr.dm | 3 +- code/game/area/Space Station 13 areas.dm | 24 +- code/game/area/areas.dm | 20 +- code/game/area/areas_vr.dm | 5 +- code/game/machinery/camera/tracking.dm | 2 +- code/game/objects/items/blueprints_vr.dm | 8 +- code/game/sound.dm | 2 +- code/modules/clothing/glasses/glasses.dm | 2 +- code/modules/events/disease_outbreak.dm | 2 +- code/modules/events/grubinfestation_vr.dm | 2 +- code/modules/events/ian_storm_vr.dm | 2 +- code/modules/events/ion_storm.dm | 2 +- code/modules/events/radiation_storm.dm | 2 +- code/modules/events/spider_infestation.dm | 2 +- .../events/spontaneous_appendicitis_vr.dm | 2 +- code/modules/events/wallrot.dm | 4 +- code/modules/gamemaster/event2/event.dm | 2 +- code/modules/mob/dead/observer/observer.dm | 4 +- code/modules/mob/living/carbon/human/life.dm | 2 +- .../species/shadekin/shadekin_abilities.dm | 2 +- code/modules/mob/living/silicon/robot/life.dm | 2 +- .../subtypes/animal/sif/grafadreka.dm | 2 +- .../subtypes/vore/shadekin/ability_procs.dm | 2 +- code/modules/mob/mob_movement.dm | 6 +- .../persistence/datum/persistence_datum.dm | 2 +- code/modules/power/singularity/singularity.dm | 2 +- .../projectiles/guns/energy/bsharpoon_vr.dm | 2 +- code/modules/telesci/telesci_computer.dm | 2 +- code/modules/tgui/modules/camera.dm | 4 +- code/modules/vore/resizing/resize_vr.dm | 4 +- code/modules/xenoarcheaology/effect.dm | 2 +- maps/expedition_vr/space/_debrisfield.dm | 4 +- maps/groundbase/groundbase_areas.dm | 23 +- maps/stellar_delight/stellar_delight_areas.dm | 21 +- .../admin_use_vr/event_autonomous_drone.dm | 2 +- .../wilderness/wilderness_areas.dm | 6 +- maps/tether/tether_areas.dm | 234 +++--------------- 45 files changed, 142 insertions(+), 311 deletions(-) diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index 3d2e7bdd02..7f5933d200 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -48,10 +48,6 @@ #define CLIENT_FROM_VAR(I) (ismob(I) ? I:client : (isclient(I) ? I : null)) - -//Persistence -#define AREA_FLAG_IS_NOT_PERSISTENT 8 // SSpersistence will not track values from this area. - // Shuttles. // These define the time taken for the shuttle to get to the space station, and the time before it leaves again. @@ -99,7 +95,20 @@ #define DEFAULT_JOB_TYPE /datum/job/assistant //Area flags, possibly more to come -#define RAD_SHIELDED 1 //shielded from radiation, clearly +#define RAD_SHIELDED 0x1 //shielded from radiation, clearly +#define BLUE_SHIELDED 0x2 // Shield from bluespace teleportation (telescience) +// unknown? 0x4 +#define AREA_FLAG_IS_NOT_PERSISTENT 0x8 // SSpersistence will not track values from this area. +#define AREA_FORBID_EVENTS 0x10 // random events will not start inside this area. +#define AREA_FORBID_SINGULO 0x20 // singulo will not move in. +#define AREA_NO_SPOILERS 0x40 // makes it much more difficult to see what is inside an area with things like mesons. +#define AREA_SOUNDPROOF 0x80 // blocks sounds from other areas and prevents hearers on other areas from hearing the sounds within. +#define AREA_BLOCK_PHASE_SHIFT 0x100 // Stops phase shifted mobs from entering +#define AREA_BLOCK_GHOSTS 0x200 // Stops ghosts from entering +#define AREA_ALLOW_LARGE_SIZE 0x400 // If mob size is limited in the area. +#define AREA_BLOCK_SUIT_SENSORS 0x800 // If suit sensors are blocked in the area. +#define AREA_BLOCK_TRACKING 0x1000 // If camera tracking is blocked in the area. +#define AREA_SECRET_NAME 0x2000 // This tells certain things that display areas' names that they shouldn't display this area's name. // OnTopic return values #define TOPIC_NOACTION 0 diff --git a/code/__defines/misc_vr.dm b/code/__defines/misc_vr.dm index 1efab42616..ab083010b1 100644 --- a/code/__defines/misc_vr.dm +++ b/code/__defines/misc_vr.dm @@ -40,8 +40,6 @@ //Shuttle madness! #define SHUTTLE_CRASHED 3 // Yup that can happen now -#define BLUE_SHIELDED 2 // Shield from bluespace teleportation (telescience) - //Herm Gender #define HERM "herm" diff --git a/code/__defines/species_languages_vr.dm b/code/__defines/species_languages_vr.dm index 146fcb86ab..8e9a54569e 100644 --- a/code/__defines/species_languages_vr.dm +++ b/code/__defines/species_languages_vr.dm @@ -15,6 +15,7 @@ #define LANGUAGE_ANIMAL "Animal" #define LANGUAGE_TEPPI "Teppi" #define LANGUAGE_MOUSE "Mouse" +#define LANNGUAGE_DRAKE "Drake" #define LANGUAGE_SHADEKIN "Shadekin Empathy" #define LANGUAGE_LLEILL "Glamour Speak" diff --git a/code/_helpers/unsorted_vr.dm b/code/_helpers/unsorted_vr.dm index 88c6dba1b2..a21466983d 100644 --- a/code/_helpers/unsorted_vr.dm +++ b/code/_helpers/unsorted_vr.dm @@ -19,7 +19,7 @@ if(vent.welded) continue var/area/A = get_area(vent) - if(A.forbid_events) + if(A.flag_check(AREA_FORBID_EVENTS)) continue vent_list += vent if(!vent_list.len) diff --git a/code/controllers/subsystems/persistence.dm b/code/controllers/subsystems/persistence.dm index bd7e978363..1950e90e14 100644 --- a/code/controllers/subsystems/persistence.dm +++ b/code/controllers/subsystems/persistence.dm @@ -33,7 +33,7 @@ SUBSYSTEM_DEF(persistence) return var/area/A = get_area(T) - if(!A || (A.flags & AREA_FLAG_IS_NOT_PERSISTENT)) + if(!A || (A.flag_check(AREA_FLAG_IS_NOT_PERSISTENT))) return if(!(T.z in using_map.persist_levels)) diff --git a/code/controllers/subsystems/radiation.dm b/code/controllers/subsystems/radiation.dm index 167dc9314c..624d6f4279 100644 --- a/code/controllers/subsystems/radiation.dm +++ b/code/controllers/subsystems/radiation.dm @@ -73,7 +73,7 @@ SUBSYSTEM_DEF(radiation) if(source.respect_maint) var/area/A = T.loc - if(A.flags & RAD_SHIELDED) + if(A.flag_check(RAD_SHIELDED)) continue // In shielded area var/dist = get_dist(source.source_turf, T) diff --git a/code/datums/components/resize_guard.dm b/code/datums/components/resize_guard.dm index d708002cc1..bc75a9438c 100644 --- a/code/datums/components/resize_guard.dm +++ b/code/datums/components/resize_guard.dm @@ -13,7 +13,8 @@ /datum/component/resize_guard/proc/check_resize() var/area/A = get_area(parent) - if(A?.limit_mob_size) - var/mob/living/L = parent - L.resize(L.size_multiplier, ignore_prefs = TRUE) - qdel(src) + if(!A?.flag_check(AREA_ALLOW_LARGE_SIZE)) + return + var/mob/living/L = parent + L.resize(L.size_multiplier, ignore_prefs = TRUE) + qdel(src) diff --git a/code/datums/repositories/crew.dm b/code/datums/repositories/crew.dm index 861e02ae4b..ae94e78726 100644 --- a/code/datums/repositories/crew.dm +++ b/code/datums/repositories/crew.dm @@ -25,7 +25,7 @@ var/global/datum/repository/crew/crew_repository = new() for(var/obj/item/clothing/under/C in tracked) var/turf/pos = get_turf(C) var/area/B = pos?.loc //VOREStation Add: No sensor in Dorm - if((C.has_sensor) && (pos?.z == zLevel) && (C.sensor_mode != SUIT_SENSOR_OFF) && !(B.block_suit_sensors) && !(is_jammed(C)) && !(is_vore_jammed(C))) //VOREStation Edit + if((C.has_sensor) && (pos?.z == zLevel) && (C.sensor_mode != SUIT_SENSOR_OFF) && !(B.flag_check(AREA_BLOCK_SUIT_SENSORS)) && !(is_jammed(C)) && !(is_vore_jammed(C))) //VOREStation Edit if(istype(C.loc, /mob/living/carbon/human)) var/mob/living/carbon/human/H = C.loc if(H.w_uniform != C) diff --git a/code/game/area/CC_areas_vr.dm b/code/game/area/CC_areas_vr.dm index b4853bd081..4bc526807b 100644 --- a/code/game/area/CC_areas_vr.dm +++ b/code/game/area/CC_areas_vr.dm @@ -13,9 +13,8 @@ //////// Abductor Areas //////// /area/unknown requires_power = 0 - flags = RAD_SHIELDED + flags = RAD_SHIELDED | AREA_ALLOW_LARGE_SIZE icon_state = "red2" - limit_mob_size = FALSE /area/unknown/dorm1 name = "Unknown Dorm 1" diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 3a66c9ade6..f3e35ccb0b 100755 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -69,10 +69,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" @@ -830,7 +829,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" @@ -1007,10 +1006,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 + 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" @@ -1313,8 +1310,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" @@ -1390,10 +1386,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station ambience = AMBIENCE_ENGINEERING /area/engineering/atmos - name = "\improper Atmospherics" - icon_state = "atmos" - sound_env = LARGE_ENCLOSED - ambience = AMBIENCE_ATMOS + name = "\improper Atmospherics" + icon_state = "atmos" + sound_env = LARGE_ENCLOSED + ambience = AMBIENCE_ATMOS /area/engineering/atmos/monitoring name = "\improper Atmospherics Monitoring Room" @@ -1419,7 +1415,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" @@ -2633,4 +2629,4 @@ var/list/the_station_areas = list ( icon_state = "yellow" luminosity = 1 dynamic_lighting = 0 - requires_power = 0 \ No newline at end of file + requires_power = 0 diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 47b29898af..3af919882b 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -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 diff --git a/code/game/area/areas_vr.dm b/code/game/area/areas_vr.dm index b2b67b089f..8a067d08a8 100644 --- a/code/game/area/areas_vr.dm +++ b/code/game/area/areas_vr.dm @@ -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) diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 54fdfbdba4..80f65a3c22 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -230,7 +230,7 @@ return TRACKING_TERMINATE var/turf/pos = get_turf(src) var/area/B = pos?.loc // No cam tracking in dorms! - if(InvalidPlayerTurf(pos) || B.block_tracking) + if(InvalidPlayerTurf(pos) || B.flag_check(AREA_BLOCK_TRACKING)) return TRACKING_TERMINATE if(invisibility >= INVISIBILITY_LEVEL_ONE) //cloaked return TRACKING_TERMINATE diff --git a/code/game/objects/items/blueprints_vr.dm b/code/game/objects/items/blueprints_vr.dm index 214bbff518..3d1cfcc4c8 100644 --- a/code/game/objects/items/blueprints_vr.dm +++ b/code/game/objects/items/blueprints_vr.dm @@ -145,7 +145,7 @@ if(in_use) return var/area/A = get_area(usr) - if(A.flags & BLUE_SHIELDED) + if(A.flag_check(BLUE_SHIELDED)) to_chat(usr, span_warning("You cannot edit restricted areas.")) return in_use = TRUE @@ -156,7 +156,7 @@ return in_use = TRUE var/area/A = create_area_whole(usr, src) - if(A && (A.flags & BLUE_SHIELDED)) + if(A?.flag_check(BLUE_SHIELDED)) to_chat(usr, span_warning("You cannot edit restricted areas.")) in_use = FALSE return @@ -485,7 +485,7 @@ var/area/place = get_area(turfs[i]) if(blacklisted_areas[place.type]) continue - if(!place.requires_power || (place.flags & BLUE_SHIELDED)) + if(!place.requires_power || (place.flag_check(BLUE_SHIELDED))) continue // No expanding powerless rooms etc areas[place.name] = place @@ -587,7 +587,7 @@ continue if(!BUILDABLE_AREA_TYPES[place.type]) //TODOTODOTODO can_make_new_area = 0 - if(!place.requires_power || (place.flags & BLUE_SHIELDED)) + if(!place.requires_power || (place.flag_check(BLUE_SHIELDED))) continue // No expanding powerless rooms etc areas[place.name] = place diff --git a/code/game/sound.dm b/code/game/sound.dm index 40722e5359..bf178e5156 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -25,7 +25,7 @@ if(!T) continue var/area/A = T.loc - if((A.soundproofed || area_source.soundproofed) && (A != area_source)) + if((A.flag_check(AREA_SOUNDPROOF) || area_source.flag_check(AREA_SOUNDPROOF)) && (A != area_source)) continue var/distance = get_dist(T, turf_source) diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index f2002c95c6..28c2b41a28 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -48,7 +48,7 @@ BLIND // can't see anything // Prevent people from just turning their goggles back on. if(!active && (vision_flags & (SEE_TURFS|SEE_OBJS))) var/area/A = get_area(src) - if(A.no_spoilers) + if(A.flag_check(AREA_NO_SPOILERS)) return FALSE return TRUE diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index 6f5e2b9497..f07c1a7ff1 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -44,7 +44,7 @@ GLOBAL_LIST_EMPTY(current_pending_diseases) continue if(!(A.z in using_map.station_levels)) continue - if(A.flags & RAD_SHIELDED) + if(A.flag_check(RAD_SHIELDED)) continue if(isbelly(G.loc)) continue diff --git a/code/modules/events/grubinfestation_vr.dm b/code/modules/events/grubinfestation_vr.dm index c73c8feea3..b256b1d7e4 100644 --- a/code/modules/events/grubinfestation_vr.dm +++ b/code/modules/events/grubinfestation_vr.dm @@ -12,7 +12,7 @@ for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in machines) var/area/A = get_area(temp_vent) - if(A.forbid_events) + if(A.flag_check(AREA_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 > 50) diff --git a/code/modules/events/ian_storm_vr.dm b/code/modules/events/ian_storm_vr.dm index 4cf60640cb..179832d8cd 100644 --- a/code/modules/events/ian_storm_vr.dm +++ b/code/modules/events/ian_storm_vr.dm @@ -17,7 +17,7 @@ if(!(T.z in using_map.station_levels)) continue var/area/A = get_area(T) - if(A.flags & RAD_SHIELDED || A.flags & BLUE_SHIELDED) + if(A.flag_check(RAD_SHIELDED | BLUE_SHIELDED)) continue place_ian(T) diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index 9cc232a449..f264baca00 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -37,7 +37,7 @@ if(!(S.z in affecting_z)) continue var/area/A = get_area(S) - if(!A || A.flags & RAD_SHIELDED) // Rad shielding will protect from ions too + if(!A || A.flag_check(RAD_SHIELDED)) // Rad shielding will protect from ions too continue to_chat(S, span_warning("Your integrated sensors detect an ionospheric anomaly. Your systems will be impacted as you begin a partial restart.")) var/ionbug = rand(3, 9) diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index 1223b8afe0..487c80c289 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -39,7 +39,7 @@ var/area/A = get_area(C) if(!A) continue - if(A.flags & RAD_SHIELDED) + if(A.flag_check(RAD_SHIELDED)) continue if(istype(C,/mob/living/carbon/human)) var/mob/living/carbon/human/H = C diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm index ad6b02c81e..8ba825464d 100644 --- a/code/modules/events/spider_infestation.dm +++ b/code/modules/events/spider_infestation.dm @@ -20,7 +20,7 @@ if(!temp_vent.welded && temp_vent.network && (temp_vent.loc.z in using_map.station_levels)) if(temp_vent.network.normal_members.len > 50) var/area/A = get_area(temp_vent) - if(!(A.forbid_events)) + if(!(A.flag_check(AREA_FORBID_EVENTS))) vents += temp_vent while((spawncount >= 1) && vents.len) diff --git a/code/modules/events/spontaneous_appendicitis_vr.dm b/code/modules/events/spontaneous_appendicitis_vr.dm index d4d34894b9..0d5cf212e9 100644 --- a/code/modules/events/spontaneous_appendicitis_vr.dm +++ b/code/modules/events/spontaneous_appendicitis_vr.dm @@ -5,7 +5,7 @@ continue if(!(A.z in using_map.station_levels)) continue - if(A.flags & RAD_SHIELDED) + if(A.flag_check(RAD_SHIELDED)) continue if(isbelly(H.loc)) continue diff --git a/code/modules/events/wallrot.dm b/code/modules/events/wallrot.dm index 6c87fb8572..677a4698a6 100644 --- a/code/modules/events/wallrot.dm +++ b/code/modules/events/wallrot.dm @@ -12,7 +12,7 @@ if(istype(candidate, /turf/simulated/wall)) center = candidate var/area/A = get_area(candidate) - if(!A.forbid_events) + if(!A.flag_check(AREA_FORBID_EVENTS)) return 1 return 0 @@ -35,4 +35,4 @@ // Only rot up to severity walls if(rotcount >= actual_severity) - break \ No newline at end of file + break diff --git a/code/modules/gamemaster/event2/event.dm b/code/modules/gamemaster/event2/event.dm index 50be78a14b..bc99179f17 100644 --- a/code/modules/gamemaster/event2/event.dm +++ b/code/modules/gamemaster/event2/event.dm @@ -107,7 +107,7 @@ This allows for events that have their announcement happen after the end itself. var/list/area/grand_list_of_areas = get_all_existing_areas_of_types(specific_areas) . = list() for(var/area/A as anything in shuffle(grand_list_of_areas)) - if(A.forbid_events) + if(A.flag_check(AREA_FORBID_EVENTS)) continue if(!(A.z in get_location_z_levels())) continue diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index cea6d48983..375e4aea72 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -196,7 +196,7 @@ Works together with spawning an observer, noted above. if(!isturf(loc)) return var/area/A = get_area(src) - if(A.block_ghosts) + if(A.flag_check(AREA_BLOCK_GHOSTS)) to_chat(src, span_warning("Ghosts can't enter this location.")) return_to_spawn() @@ -452,7 +452,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp //RS Port #658 Start var/area/A = get_area(destination) - if(A.block_ghosts) + if(A.flag_check(AREA_BLOCK_GHOSTS)) to_chat(src,span_warning("Sorry, that area does not allow ghosts.")) if(following) stop_following() diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 7f7b2d7aad..4a11af321f 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1631,7 +1631,7 @@ // Do this early so certain stuff gets turned off before vision is assigned. var/area/A = get_area(src) - if(A?.no_spoilers) + if(A?.flag_check(AREA_NO_SPOILERS)) disable_spoiler_vision() if(XRAY in mutations) diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm index d0eb62be53..1054e4fec7 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm @@ -33,7 +33,7 @@ //RS Port #658 Start var/area/A = get_area(src) - if(!client?.holder && A.block_phase_shift) + if(!client?.holder && A.flag_check(AREA_BLOCK_PHASE_SHIFT)) to_chat(src, span_warning("You can't do that here!")) return //RS Port #658 End diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index fdc3060a44..bbf89baf3a 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -157,7 +157,7 @@ var/seejanhud = src.sight_mode & BORGJAN var/area/A = get_area(src) - if(A?.no_spoilers) + if(A?.flag_check(AREA_NO_SPOILERS)) disable_spoiler_vision() if (src.stat == DEAD || (XRAY in mutations) || (src.sight_mode & BORGXRAY)) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm index 127295f615..3d05b68abb 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm @@ -135,7 +135,7 @@ Field studies suggest analytical abilities on par with some species of cepholapo bitesize = 10 gender = NEUTER - has_langs = list("Drake") + has_langs = list(LANNGUAGE_DRAKE) see_in_dark = 8 // on par with Taj diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm index b45c3608b7..552060e313 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm @@ -6,7 +6,7 @@ to_chat(src,span_warning("You can't use that here!")) return FALSE //RS Port #658 Start - if(!client?.holder && A.block_phase_shift) + if(!client?.holder && A.flag_check(AREA_BLOCK_PHASE_SHIFT)) to_chat(src,span_warning("You can't use that here!")) return FALSE //RS Port #658 End diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index a942c55849..1b2c1571d7 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -358,13 +358,13 @@ return //RS Port #658 Start if(!holder) - if(isliving(mob) && A.block_phase_shift) + if(isliving(mob) && A.flag_check(AREA_BLOCK_PHASE_SHIFT)) to_chat(mob, span_warning("Something blocks you from entering this location while phased out.")) return - if(isobserver(mob) && A.block_ghosts) + if(isobserver(mob) && A.flag_check(AREA_BLOCK_GHOSTS)) to_chat(mob, span_warning("Ghosts can't enter this location.")) var/area/our_area = mobloc.loc - if(our_area.block_ghosts) + if(our_area.flag_check(AREA_BLOCK_GHOSTS)) var/mob/observer/dead/D = mob D.return_to_spawn() return diff --git a/code/modules/persistence/datum/persistence_datum.dm b/code/modules/persistence/datum/persistence_datum.dm index c3c154cce4..0f35c7af3d 100644 --- a/code/modules/persistence/datum/persistence_datum.dm +++ b/code/modules/persistence/datum/persistence_datum.dm @@ -85,7 +85,7 @@ if(!T || !(T.z in using_map.persist_levels) ) return FALSE var/area/A = get_area(T) - if(!A || (A.flags & AREA_FLAG_IS_NOT_PERSISTENT)) + if(!A || (A.flag_check(AREA_FLAG_IS_NOT_PERSISTENT))) return FALSE return TRUE diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 6d7da776df..a8c47362de 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -366,7 +366,7 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity) // VOREStation Edit Start var/area/A = get_area(T) - if(A.forbid_singulo) //No going to dorms + if(A.flag_check(AREA_FORBID_SINGULO)) //No going to dorms return 0 // VOREStation Edit End diff --git a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm index c1238f820b..6a4a4764df 100644 --- a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm +++ b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm @@ -90,7 +90,7 @@ if(ownturf.z != T.z || get_dist(T,ownturf) > world.view) to_chat(user, span_warning("The target is out of range!")) return - if(get_area(A).flags & BLUE_SHIELDED) + if(get_area(A).flag_check(BLUE_SHIELDED)) to_chat(user, span_warning("The target area protected by bluespace shielding!")) return if(!(A in view(user, world.view))) diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index e966c6e1b6..423c07e585 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -273,7 +273,7 @@ S.set_up(5, 1, get_turf(telepad)) S.start() - if(!A || (A.flags & BLUE_SHIELDED)) + if(!A || (A.flag_check(BLUE_SHIELDED))) telefail() temp_msg = "ERROR! Target is shielded from bluespace intersection!" return diff --git a/code/modules/tgui/modules/camera.dm b/code/modules/tgui/modules/camera.dm index e66d4bc96d..793029a601 100644 --- a/code/modules/tgui/modules/camera.dm +++ b/code/modules/tgui/modules/camera.dm @@ -83,7 +83,7 @@ var/turf/newturf = get_turf(active_camera) var/area/B = newturf?.loc // No cam tracking in dorms! // Show static if can't use the camera - if(!active_camera?.can_use() || B.block_tracking) + if(!active_camera?.can_use() || B.flag_check(AREA_BLOCK_TRACKING)) show_camera_static() if(!ui) var/user_ref = REF(user) @@ -182,7 +182,7 @@ var/turf/newturf = get_turf(active_camera) var/area/B = newturf?.loc // No cam tracking in dorms! // Show static if can't use the camera - if(!active_camera?.can_use() || B.block_tracking) + if(!active_camera?.can_use() || B.flag_check(AREA_BLOCK_TRACKING)) show_camera_static() return TRUE diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index 9a0a59047d..933e770a45 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -62,13 +62,13 @@ /atom/movable/proc/size_range_check(size_select) //both objects and mobs needs to have that var/area/A = get_area(src) //Get the atom's area to check for size limit. - if((A?.limit_mob_size && (size_select > 200 || size_select < 25)) || (size_select > 600 || size_select <1)) + if((!A?.flag_check(AREA_ALLOW_LARGE_SIZE) && (size_select > 200 || size_select < 25)) || (size_select > 600 || size_select <1)) return FALSE return TRUE /atom/movable/proc/has_large_resize_bounds() var/area/A = get_area(src) //Get the atom's area to check for size limit. - return !A.limit_mob_size + return A.flag_check(AREA_ALLOW_LARGE_SIZE) /proc/is_extreme_size(size) return (size < RESIZE_MINIMUM || size > RESIZE_MAXIMUM) diff --git a/code/modules/xenoarcheaology/effect.dm b/code/modules/xenoarcheaology/effect.dm index f17f0d7b17..c19c0592d4 100644 --- a/code/modules/xenoarcheaology/effect.dm +++ b/code/modules/xenoarcheaology/effect.dm @@ -159,7 +159,7 @@ if(!istype(H)) return 1 var/area/A = get_area(H) - if(A.forbid_events) + if(A.flag_check(AREA_FORBID_EVENTS)) return 0 var/protected = 0 diff --git a/maps/expedition_vr/space/_debrisfield.dm b/maps/expedition_vr/space/_debrisfield.dm index 47a90bd0b2..1a3269790f 100644 --- a/maps/expedition_vr/space/_debrisfield.dm +++ b/maps/expedition_vr/space/_debrisfield.dm @@ -121,7 +121,7 @@ /area/submap/debrisfield/luxury_boat - secret_name = 0 + flags = RAD_SHIELDED | AREA_FORBID_EVENTS /area/submap/debrisfield/luxury_boat/bridge name = "Captain's Quarters" @@ -212,7 +212,7 @@ name = "POI - Destroyed Mining Outpost" /area/submap/debrisfield/tinyshuttle - secret_name = 0 + flags = RAD_SHIELDED | AREA_FORBID_EVENTS /area/submap/debrisfield/tinyshuttle/crew name = "Crew Bay" diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm index 4831ef8750..a32e5727c1 100644 --- a/maps/groundbase/groundbase_areas.dm +++ b/maps/groundbase/groundbase_areas.dm @@ -359,18 +359,21 @@ icon_state = "grewhisqu" ambience = AMBIENCE_FOREBODING lightswitch = 0 + /area/groundbase/civilian/arrivals name = "Arrivals" lightswitch = 1 - forbid_events = TRUE - forbid_singulo = TRUE + flags = AREA_FORBID_EVENTS | AREA_FORBID_SINGULO + /area/groundbase/civilian/toolstorage name = "Tool Storage" lightswitch = 1 + /area/groundbase/civilian/bar name = "Bar" sound_env = LARGE_ENCLOSED lightswitch = 1 + /area/groundbase/civilian/bar/upper name = "Bar Balcony" base_turf = /turf/simulated/open/virgo3c @@ -379,14 +382,17 @@ name = "Cafe" sound_env = SMALL_SOFTFLOOR lightswitch = 1 + /area/groundbase/civilian/hydroponics name = "Hydroponics" lightswitch = 1 + /area/groundbase/civilian/hydroponics/out name = "Hydroponics Animal Pen" /area/groundbase/civilian/kitchen name = "Kitchen" lightswitch = 1 + /area/groundbase/civilian/kitchen/freezer name = "Kitchen Freezer" /area/groundbase/civilian/kitchen/backroom @@ -420,14 +426,15 @@ sound_env = SMALL_SOFTFLOOR /area/groundbase/civilian/mensrestroom name = "Men's Restroom" + flags = AREA_FORBID_EVENTS sound_env = SOUND_ENVIRONMENT_BATHROOM lightswitch = 1 - forbid_events = TRUE + /area/groundbase/civilian/womensrestroom name = "Women's Restroom" + flags = AREA_FORBID_EVENTS sound_env = SOUND_ENVIRONMENT_BATHROOM lightswitch = 1 - forbid_events = TRUE /area/groundbase/civilian/entrepreneur name = "\improper Shared Office" @@ -456,13 +463,7 @@ holomap_color = HOLOMAP_AREACOLOR_DORMS icon_state = "grawhisqu" ambience = AMBIENCE_GENERIC - flags = RAD_SHIELDED| BLUE_SHIELDED |AREA_FLAG_IS_NOT_PERSISTENT - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE - forbid_events = TRUE - forbid_singulo = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/groundbase/dorms/bathroom name = "Dormitory Bathroom" diff --git a/maps/stellar_delight/stellar_delight_areas.dm b/maps/stellar_delight/stellar_delight_areas.dm index 8af4a0b4b6..762cb74700 100644 --- a/maps/stellar_delight/stellar_delight_areas.dm +++ b/maps/stellar_delight/stellar_delight_areas.dm @@ -125,13 +125,7 @@ /area/stellardelight/deck1/dorms name = "Dormitory" sound_env = SMALL_SOFTFLOOR - flags = RAD_SHIELDED| BLUE_SHIELDED |AREA_FLAG_IS_NOT_PERSISTENT - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE - forbid_events = TRUE - forbid_singulo = TRUE + flags = RAD_SHIELDED| BLUE_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/stellardelight/deck1/dorms/dorm1 name = "Dormitory One" @@ -274,21 +268,16 @@ /area/stellardelight/deck3/transitgateway name = "Transit Gateway" - forbid_events = TRUE - forbid_singulo = TRUE + flags = AREA_FORBID_EVENTS | AREA_FORBID_SINGULO + /area/stellardelight/deck3/cryo name = "Cryogenic Storage" - forbid_events = TRUE - forbid_singulo = TRUE + flags = AREA_FORBID_EVENTS | AREA_FORBID_SINGULO /area/stellardelight/deck3/readingroom name = "Reading Rooms" sound_env = SMALL_SOFTFLOOR - flags = RAD_SHIELDED| BLUE_SHIELDED |AREA_FLAG_IS_NOT_PERSISTENT - soundproofed = TRUE - block_suit_sensors = TRUE - block_tracking = TRUE - forbid_events = TRUE + flags = RAD_SHIELDED| BLUE_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT | AREA_FORBID_EVENTS | AREA_SOUNDPROOF | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/stellardelight/deck3/portdock name = "Port Dock" diff --git a/maps/submaps/admin_use_vr/event_autonomous_drone.dm b/maps/submaps/admin_use_vr/event_autonomous_drone.dm index 2bdb6e59af..aad643108b 100644 --- a/maps/submaps/admin_use_vr/event_autonomous_drone.dm +++ b/maps/submaps/admin_use_vr/event_autonomous_drone.dm @@ -73,7 +73,7 @@ req_one_access = list() /area/submap/event_autonomous_drone - secret_name = FALSE + flags = RAD_SHIELDED | AREA_FORBID_EVENTS /area/submap/event_autonomous_drone/engineering name = "Engine Bay" diff --git a/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm b/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm index a710a77fa0..fa5e1482d5 100644 --- a/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm +++ b/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm @@ -1,10 +1,8 @@ /area/submap name = "Submap Area" icon_state = "submap" - flags = RAD_SHIELDED + flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_SECRET_NAME ambience = AMBIENCE_RUINS - secret_name = TRUE - forbid_events = TRUE flags = AREA_FLAG_IS_NOT_PERSISTENT /area/submap/event //To be used for Events not for regular PoIs @@ -210,4 +208,4 @@ /area/submap/drgnplateu name = "POI - Dragon Plateu" - ambience = AMBIENCE_SIF \ No newline at end of file + ambience = AMBIENCE_SIF diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index aedc4ef9f7..3087f997c5 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -1000,192 +1000,88 @@ /area/crew_quarters/sleep/maintDorm1 name = "\improper Construction Dorm 1" icon_state = "Sleep" - flags = RAD_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/maintDorm2 name = "\improper Construction Dorm 2" icon_state = "Sleep" - flags = RAD_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/maintDorm3 name = "\improper Construction Dorm 3" icon_state = "Sleep" - flags = RAD_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/maintDorm4 name = "\improper Construction Dorm 4" icon_state = "Sleep" - flags = RAD_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/vistor_room_1 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/vistor_room_2 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/vistor_room_3 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/vistor_room_4 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/vistor_room_5 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/vistor_room_6 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/vistor_room_7 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/vistor_room_8 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/vistor_room_9 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/vistor_room_10 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/vistor_room_11 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/vistor_room_12 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/Dorm_1 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/Dorm_2 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/Dorm_3 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/Dorm_4 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/Dorm_5 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/Dorm_6 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/Dorm_7 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/Dorm_8 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/Dorm_9 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/Dorm_10 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/Dorm_1/holo name = "\improper Dorm 1 Holodeck" @@ -1207,113 +1103,61 @@ name = "\improper Visitor Lodging 1" icon_state = "dk_yellow" lightswitch = 0 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/spacedorm2 name = "\improper Visitor Lodging 2" icon_state = "dk_yellow" lightswitch = 0 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/spacedorm3 name = "\improper Visitor Lodging 3" icon_state = "dk_yellow" lightswitch = 0 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/crew_quarters/sleep/spacedorm4 name = "\improper Visitor Lodging 4" icon_state = "dk_yellow" lightswitch = 0 - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/holodeck/holodorm/source_basic name = "\improper Holodeck Source" - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/holodeck/holodorm/source_desert name = "\improper Holodeck Source" - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/holodeck/holodorm/source_seating name = "\improper Holodeck Source" - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/holodeck/holodorm/source_beach name = "\improper Holodeck Source" - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/holodeck/holodorm/source_garden name = "\improper Holodeck Source" - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/holodeck/holodorm/source_boxing name = "\improper Holodeck Source" - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/holodeck/holodorm/source_snow name = "\improper Holodeck Source" - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/holodeck/holodorm/source_space name = "\improper Holodeck Source" - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/holodeck/holodorm/source_off name = "\improper Holodeck Source" - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE - limit_mob_size = FALSE - block_suit_sensors = TRUE - block_tracking = TRUE + flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING /area/ai_core_foyer name = "\improper AI Core Access"