cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-12 08:43:26 +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 07:57:55 -07:00
committed by GitHub
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/__defines/misc.dm
+18 -5
View File
@@ -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,24 @@
#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)
#define AREA_SECRET_NAME 0x4 // This tells certain things that display areas' names that they shouldn't display this area's name.
#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.
// CHOMPAdd Start/area
#define PHASE_SHIELDED 0x200000 // A less rough way to prevent phase shifting without blocking access
#define AREA_LIMIT_DARK_RESPITE 0x400000// Shadekin will die normally in those areas
// CHOMPAdd End
// OnTopic return values
#define TOPIC_NOACTION 0
code/__defines/misc_ch.dm
-2
View File
@@ -17,8 +17,6 @@
#define MAT_CARPET_PURPLE "purple carpet"
#define MAT_CARPET_ORANGE "orange carpet"
#define PHASE_SHIELDED 16 // Prevents shadekin phasing in/out in this area
#define RCD_FIRELOCK "Firelock" // Builds an emergency glass shutter
#define RCD_WINDOOR "Windoor" // Build a window door
#define RCD_FRAME "Frame" // Build a Machine or Computer frame
code/__defines/misc_vr.dm
-2
View File
@@ -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"
code/__defines/species_languages_vr.dm
+1
View File
@@ -16,6 +16,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"
code/_helpers/unsorted_vr.dm
+1 -1
View File
@@ -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)
code/controllers/subsystems/persistence.dm
+1 -1
View File
@@ -35,7 +35,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))
code/controllers/subsystems/radiation.dm
+1 -1
View File
@@ -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)
code/datums/components/resize_guard.dm
+5 -4
View File
@@ -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)
code/datums/repositories/crew.dm
+1 -1
View File
@@ -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)
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)
code/game/machinery/camera/tracking.dm
+1 -1
View File
@@ -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
code/game/objects/items/blueprints_vr.dm
+4 -4
View File
@@ -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
code/game/sound.dm
+1 -1
View File
@@ -26,7 +26,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) Save get_dist for later because it's more expensive
code/modules/clothing/glasses/glasses.dm
+1 -1
View File
@@ -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
code/modules/events/disease_outbreak.dm
+1 -1
View File
@@ -45,7 +45,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
code/modules/events/grubinfestation_vr.dm
+1 -1
View File
@@ -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 > 10) //CHOMP Edit: Most our networks are 40. SM is 4 and toxins is 2. This needed to change in order to spawn.
code/modules/events/horde_infestation.dm
+1 -1
View File
@@ -51,7 +51,7 @@
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 to 10 from 50 in order for spawns to work.
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)
code/modules/events/ian_storm_vr.dm
+1 -1
View File
@@ -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)
code/modules/events/ion_storm.dm
+1 -1
View File
@@ -38,7 +38,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)
code/modules/events/radiation_storm.dm
+1 -1
View File
@@ -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
code/modules/events/spider_infestation.dm
+1 -1
View File
@@ -29,7 +29,7 @@
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 to 10 from 50 in order for spawns to work.
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)
code/modules/events/spontaneous_appendicitis_vr.dm
+1 -1
View File
@@ -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
code/modules/events/wallrot.dm
+2 -2
View File
@@ -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
@@ -36,4 +36,4 @@
// Only rot up to severity walls
if(rotcount >= actual_severity)
break
break
code/modules/gamemaster/event2/event.dm
+1 -1
View File
@@ -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
code/modules/mob/dead/observer/observer.dm
+2 -2
View File
@@ -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()
@@ -454,7 +454,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()
code/modules/mob/living/carbon/human/life.dm
+1 -1
View File
@@ -1702,7 +1702,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)
code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm
+1 -1
View File
@@ -139,7 +139,7 @@
if(respite_activating)
return TRUE
var/area/current_area = get_area(H)
if((H.ability_flags & AB_DARK_RESPITE) || H.has_modifier_of_type(/datum/modifier/dark_respite) || current_area.limit_dark_respite)
if((H.ability_flags & AB_DARK_RESPITE) || H.has_modifier_of_type(/datum/modifier/dark_respite) || current_area.flag_check(AREA_LIMIT_DARK_RESPITE))
return
var/list/floors = list()
for(var/turf/unsimulated/floor/dark/floor in get_area_turfs(/area/shadekin))
code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm
+1 -1
View File
@@ -49,7 +49,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
code/modules/mob/living/silicon/robot/life.dm
+1 -1
View File
@@ -159,7 +159,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))
code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm
+1 -1
View File
@@ -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
code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm
+1 -1
View File
@@ -11,7 +11,7 @@
return FALSE
//CHOMPAdd End
//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
code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm
+1 -1
View File
@@ -258,7 +258,7 @@
//CHOMPEdit Begin - Actually phase to the dark on death
var/area/current_area = get_area(src)
if((ability_flags & AB_DARK_RESPITE) || current_area.limit_dark_respite)
if((ability_flags & AB_DARK_RESPITE) || current_area.flag_check(AREA_LIMIT_DARK_RESPITE))
icon_state = ""
spawn(1 SECOND)
qdel(src) //Back from whence you came!
code/modules/mob/mob_movement.dm
+3 -3
View File
@@ -407,13 +407,13 @@
//CHOMPEdit end
//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
code/modules/persistence/datum/persistence_datum.dm
+1 -1
View File
@@ -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
code/modules/power/singularity/singularity.dm
+1 -1
View File
@@ -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
code/modules/projectiles/guns/energy/bsharpoon_vr.dm
+1 -1
View File
@@ -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) || (T.block_tele) || (ownturf.block_tele)) //CHOMPedit, consistency smh
if((get_area(A).flag_check(BLUE_SHIELDED)) || (T.block_tele) || (ownturf.block_tele)) //CHOMPedit, consistency smh
to_chat(user, span_warning("The target area protected by bluespace shielding!"))
return
if(!(A in view(user, world.view)))
code/modules/telesci/telesci_computer.dm
+1 -1
View File
@@ -273,7 +273,7 @@
S.set_up(5, 1, get_turf(telepad))
S.start()
if(!A || (A.flags & BLUE_SHIELDED) || (target.block_tele)) //CHOMPedit, consistency smh
if(!A || (A.flag_check(BLUE_SHIELDED)) || (target.block_tele)) //CHOMPedit, consistency smh
telefail()
temp_msg = "ERROR! Target is shielded from bluespace intersection!"
return
code/modules/tgui/modules/camera.dm
+2 -2
View File
@@ -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
code/modules/ventcrawl/ventcrawl_atmospherics.dm
+2 -2
View File
@@ -48,10 +48,10 @@
prob(90);"* clunk *",
prob(90);"* thud *",
prob(90);"* clatter *",
prob(1);"* <span style='font-size:2em'>ඞ</span> *"
prob(1);"* " + span_giganteus("ඞ") + " *"
)
T.runechat_message(message)
else
if((direction & initialize_directions) || is_type_in_list(src, ventcrawl_machinery) && src.can_crawl_through()) //if we move in a way the pipe can connect, but doesn't - or we're in a vent
user.remove_ventcrawl()
code/modules/vore/resizing/resize_vr.dm
+3 -2
View File
@@ -62,13 +62,14 @@
/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))
size_select = size_select / 100
if((!A?.flag_check(AREA_ALLOW_LARGE_SIZE) && (size_select > RESIZE_MAXIMUM || size_select < RESIZE_MINIMUM)) || (size_select > RESIZE_MAXIMUM_DORMS || size_select < RESIZE_MINIMUM_DORMS))
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 ? !A.limit_mob_size : FALSE //CHOMPEdit
return A ? A.flag_check(AREA_ALLOW_LARGE_SIZE) : FALSE
/proc/is_extreme_size(size)
return (size < RESIZE_MINIMUM || size > RESIZE_MAXIMUM)
code/modules/xenoarcheaology/effect.dm
+1 -1
View File
@@ -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
maps/expedition_vr/space/_debrisfield.dm
+2 -2
View File
@@ -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"
maps/groundbase/groundbase_areas.dm
+12 -11
View File
@@ -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"
maps/stellar_delight/stellar_delight_areas.dm
+5 -16
View File
@@ -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"
maps/submaps/admin_use_vr/event_autonomous_drone.dm
+1 -1
View File
@@ -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"
maps/submaps/surface_submaps/wilderness/wilderness_areas.dm
+2 -4
View File
@@ -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
ambience = AMBIENCE_SIF
maps/tether/tether_areas.dm
+39 -195
View File
@@ -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"
modular_chomp/code/modules/casino/casino_map_atoms.dm
+14 -101
View File
@@ -8,86 +8,30 @@
outdoors = FALSE
flags = RAD_SHIELDED
/area/casino/dorms
name = "\improper Casino dorm"
flags = RAD_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
// Areas for the actual casino
/area/casino/dorm1
name = "\improper Casino dorm"
flags = RAD_SHIELDED
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/casino/dorms/dorm1
/area/casino/dorm2
name = "\improper Casino dorm"
flags = RAD_SHIELDED
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/casino/dorms/dorm2
/area/casino/dorm3
name = "\improper Casino dorm"
flags = RAD_SHIELDED
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/casino/dorms/dorm3
/area/casino/dorm4
name = "\improper Casino dorm"
flags = RAD_SHIELDED
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/casino/dorms/dorm4
/area/casino/dorm5
name = "\improper Casino dorm"
flags = RAD_SHIELDED
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/casino/dorms/dorm5
/area/casino/dorm6
name = "\improper Casino dorm"
flags = RAD_SHIELDED
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/casino/dorms/dorm6
/area/casino/dorm7
name = "\improper Casino dorm"
flags = RAD_SHIELDED
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/casino/dorms/dorm7
/area/casino/dorm8
name = "\improper Casino dorm"
flags = RAD_SHIELDED
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/casino/dorms/dorm8
/area/casino/dorm9
name = "\improper Casino dorm"
flags = RAD_SHIELDED
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/casino/dorms/dorm9
/area/casino/dorm10
name = "\improper Casino dorm"
flags = RAD_SHIELDED
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/casino/dorms/dorm10
/area/casino/helm
name = "\improper Casino helm"
@@ -145,37 +89,6 @@
/area/casino/wizard_home
name = "\improper That's pretty wizard"
// Old casino areas. Apparently we don't want these.
/*
/area/casino/casino_ship
name = "\improper Casino Ship"
icon_state = "yellow"
requires_power = 0
dynamic_lighting = 1
/area/casino/casino_ship/wing_left
name = "\improper Casino Ship left wing"
icon_state = "yellow"
/area/casino/casino_ship/wing_right
name = "\improper Casino Ship right wing"
icon_state = "yellow"
/area/casino/casino_ship/dorms
name = "\improper Casino Ship dorms"
icon_state = "yellow"
soundproofed = TRUE
/area/casino/casino_ship/cockpit
name = "\improper Casino Ship left wing"
icon_state = "yellow"
/area/shuttle/casino/
name = "\improper Casino Shuttle"
dynamic_lighting = 0
icon_state = "shuttlegrn"
*/
// Gear dispenser datums. Organized alphabetically by typepath for your viewing pleasure.
/datum/gear_disp/casino_buried_reward
name = "Buried treasure"
modular_chomp/code/modules/mining/shelter_atoms_ch.dm
+2 -2
View File
@@ -146,11 +146,11 @@
/area/survivalpod/superpose/XenoBotanySetup
/area/survivalpod/superpose/secondlifebar
limit_mob_size = FALSE //Second life bars dont have ceilings
flags = AREA_ALLOW_LARGE_SIZE
/area/survivalpod/superpose/secondlifebar/dorms
icon_state = "toilet"
soundproofed = TRUE
flags = AREA_ALLOW_LARGE_SIZE | AREA_SOUNDPROOF
/obj/item/survivalcapsule/superpose
name = "superposed surfluid shelter capsule"
modular_chomp/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm
+1 -1
View File
@@ -15,7 +15,7 @@
return FALSE
//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 FALSE
//RS Port #658 End
modular_chomp/maps/overmap/space_pois/space_areas.dm
+1 -3
View File
@@ -3,10 +3,8 @@
/area/submap
name = "Submap Area"
icon_state = "submap"
flags = RAD_SHIELDED
flags = RAD_SHIELDED | AREA_SECRET_NAME | AREA_FORBID_EVENTS
ambience = AMBIENCE_RUINS
secret_name = TRUE
forbid_events = TRUE
flags = AREA_FLAG_IS_NOT_PERSISTENT
/area/submap/abandonedtele
modular_chomp/maps/relic_base/relicbase_areas.dm
+1 -1
View File
@@ -1003,7 +1003,7 @@ z
/area/crew_quarters/heads/sc/
name = "\improper Command - Head Office"
icon_state = "head_quarters"
flags = RAD_SHIELDED
flags = RAD_SHIELDED | AREA_FORBID_SINGULO
sound_env = MEDIUM_SOFTFLOOR
/area/crew_quarters/heads/sc/hop
modular_chomp/maps/soluna_nexus/soluna_nexus_areas.dm
+15 -25
View File
@@ -1085,12 +1085,7 @@
/area/bridge/sleep
icon_state = "bridge"
flags = RAD_SHIELDED
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
soundproofed = TRUE
forbid_events = TRUE
flags = RAD_SHIELDED | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING | AREA_SOUNDPROOF | AREA_FORBID_EVENTS
/area/bridge/sleep/HoP_Quarters
name = "\improper HoP Quarters"
@@ -1817,12 +1812,12 @@
/area/crew_quarters/Midnight_Bar
name = "\improper Midnight Bar"
icon_state = "gaming"
flags = RAD_SHIELDED
flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO
/area/crew_quarters/Midnight_Kitchen
name = "\improper Midnight Kitchen"
icon_state = "gaming"
flags = RAD_SHIELDED
flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO
/area/crew_quarters/Gallery
name = "\improper Gallery"
@@ -1858,31 +1853,31 @@
/area/crew_quarters/Central_Restroom
name = "\improper Central Restroom"
icon_state = "gaming"
flags = RAD_SHIELDED
flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO
lightswitch = 1
/area/crew_quarters/For_Restroom
name = "\improper For Restroom"
icon_state = "gaming"
flags = RAD_SHIELDED
flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO
lightswitch = 1
/area/crew_quarters/Star_Restroom
name = "\improper Star Restroom"
icon_state = "gaming"
flags = RAD_SHIELDED
flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO
lightswitch = 1
/area/crew_quarters/Aft_Restroom
name = "\improper Aft Restroom"
icon_state = "gaming"
flags = RAD_SHIELDED
flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO
lightswitch = 1
/area/crew_quarters/Port_Restroom
name = "\improper Port Restroom"
icon_state = "gaming"
flags = RAD_SHIELDED
flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO
lightswitch = 1
/area/crew_quarters/Library
@@ -1911,34 +1906,34 @@
/area/crew_quarters/Chomp_Hydroponics
name = "\improper Chomp Hydroponics"
icon_state = "gaming"
flags = RAD_SHIELDED
flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO
/area/crew_quarters/Chomp_Stage
name = "\improper Chomp Convention Stage"
icon_state = "gaming"
flags = RAD_SHIELDED
flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO
/area/crew_quarters/Chomp_Kitchen
name = "\improper Chomp Kitchen"
icon_state = "gaming"
flags = RAD_SHIELDED
flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO
/area/crew_quarters/Chomp_Dinner_1
name = "\improper Chomp Dinner 1"
icon_state = "gaming"
flags = RAD_SHIELDED
flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO
lightswitch = 1
/area/crew_quarters/Chomp_Dinner_2
name = "\improper Chomp Dinner 2"
icon_state = "gaming"
flags = RAD_SHIELDED
flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO
lightswitch = 1
/area/crew_quarters/Chomp_Lounge
name = "\improper Chomp Lounge"
icon_state = "gaming"
flags = RAD_SHIELDED
flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO
/area/crew_quarters/Public_Hydroponics
name = "\improper Public Hydroponics"
@@ -1961,13 +1956,8 @@
icon_state = "gaming"
/area/crew_quarters/sleep
flags = RAD_SHIELDED
flags = RAD_SHIELDED | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING | AREA_SOUNDPROOF | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO
lightswitch = 0
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
soundproofed = TRUE
forbid_events = TRUE
icon_state = "gaming"
/area/crew_quarters/sleep/Dormitory_01
modular_chomp/maps/southern_cross/overmap/planets/thor/thor.dm
+1 -5
View File
@@ -84,11 +84,7 @@
/area/surface/thor/dorms
name = "Jungle Outpost Generic Dorms"
icon_state = "Sleep"
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
flags = RAD_SHIELDED
block_tracking = TRUE
flags = RAD_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/surface/thor/dorms/pool1
name = "Jungle Outpost Pool Shack 1"
modular_chomp/maps/southern_cross/southern_cross_areas.dm
+4 -8
View File
@@ -212,7 +212,7 @@
/area/hallway/primary/firstdeck/auxdockaft
name = "\improper First Deck Aft Auxiliary Dock"
icon_state = "docking_hallway"
forbid_events = TRUE
flags = AREA_FORBID_EVENTS
/area/hallway/primary/firstdeck/auxdockfore
name = "\improper First Deck Fore Auxiliary Dock"
@@ -432,7 +432,7 @@
/area/crew_quarters/thirddeck/vrroom
name = "\improper Virtual Reality Room"
icon_state = "gaming"
flags = RAD_SHIELDED //Depending on the video game, you might still get figuative cancer
flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO //Depending on the video game, you might still get figuative cancer
//CHOMPStation Edit End
@@ -448,7 +448,7 @@
/area/crew_quarters/heads/sc/
name = "\improper Command - Head Office"
icon_state = "head_quarters"
flags = RAD_SHIELDED
flags = RAD_SHIELDED | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO
sound_env = MEDIUM_SOFTFLOOR
/area/crew_quarters/heads/sc/hop
@@ -1712,11 +1712,7 @@ End Chompstation Edit*/
/area/maintenance/bar/dorms
name = "Maintenance Bar Dorms"
icon_state = "Sleep"
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
flags = RAD_SHIELDED
block_tracking = TRUE
flags = RAD_SHIELDED | AREA_SOUNDPROOF |AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/maintenance/bar/dorms/dorm_1
name = "Maintenance Deck Bar Dorms 1"
modular_chomp/maps/southern_cross/southern_cross_areas_planet.dm
+1 -5
View File
@@ -173,11 +173,7 @@
/area/surface/outpost/shelter/dorms
name = "Wilderness Shelter Dorms"
icon_state = "Sleep"
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
flags = RAD_SHIELDED
block_tracking = TRUE
flags = RAD_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
/area/surface/outpost/shelter/exterior
name = "Wilderness Shelter Exterior"
modular_chomp/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm
+1 -3
View File
@@ -2,10 +2,8 @@
/area/submap
name = "Submap Area"
icon_state = "submap"
flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT
flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT | AREA_SECRET_NAME | AREA_FORBID_EVENTS
ambience = AMBIENCE_RUINS
secret_name = TRUE
forbid_events = TRUE
/area/submap/event //To be used for Events not for regular PoIs
name = "Unknown"
modular_chomp/maps/virtual_reality/constructVR.dm
+3 -8
View File
@@ -4,8 +4,7 @@
name = "VR world"
icon_state = "green"
base_turf = /turf/simulated/floor/outdoors/dirt
limit_mob_size = FALSE
limit_dark_respite = TRUE
flags = AREA_ALLOW_LARGE_SIZE | AREA_LIMIT_DARK_RESPITE
/area/vr/space
name = "VR Space" //copypasta time
@@ -20,7 +19,7 @@
ambience = list('sound/ambience/ambispace.ogg','sound/music/title2.ogg','sound/music/space.ogg','sound/music/main.ogg','sound/music/traitor.ogg','sound/ambience/space/space_serithi.ogg','sound/music/freefallin.mid')
base_turf = /turf/space
ambience = AMBIENCE_SPACE
flags = AREA_FLAG_IS_NOT_PERSISTENT
flags = AREA_FLAG_IS_NOT_PERSISTENT | AREA_ALLOW_LARGE_SIZE | AREA_LIMIT_DARK_RESPITE
/area/space/atmosalert()
return
@@ -163,11 +162,7 @@
/area/vr/powered/mall/dorms
name = "VR Mall Dorms"
icon_state = "Sleep"
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
flags = RAD_SHIELDED
block_tracking = TRUE
flags = RAD_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING | AREA_LIMIT_DARK_RESPITE
/area/vr/powered/mall/dorms/dorms1
vorestation.dme
-1
View File
@@ -772,7 +772,6 @@
#include "code\game\antagonist\station\traitor.dm"
#include "code\game\area\ai_monitored.dm"
#include "code\game\area\areas.dm"
#include "code\game\area\areas_ch.dm"
#include "code\game\area\areas_vr.dm"
#include "code\game\area\asteroid_areas.dm"
#include "code\game\area\Away Mission areas.dm"