From 4c2518fac5e8fbbc2dd361f46a7a5adc300e9499 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 27 Apr 2021 12:01:18 -0400 Subject: [PATCH 1/3] Disables Suit Sensors in Dorms --- code/datums/repositories/crew.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/repositories/crew.dm b/code/datums/repositories/crew.dm index c45202194bd..c07c6417bb8 100644 --- a/code/datums/repositories/crew.dm +++ b/code/datums/repositories/crew.dm @@ -24,7 +24,8 @@ var/global/datum/repository/crew/crew_repository = new() var/tracked = scan() for(var/obj/item/clothing/under/C in tracked) var/turf/pos = get_turf(C) - if((C) && (C.has_sensor) && (pos) && (pos.z == zLevel) && (C.sensor_mode != SUIT_SENSOR_OFF) && !(is_jammed(C))) + var/area/B = get_area(pos) //VOREStation Add: No sensor in Dorm + if((C) && (C.has_sensor) && (pos) && (pos.z == zLevel) && (C.sensor_mode != SUIT_SENSOR_OFF) && !(is_jammed(C)) && (B.limit_mob_size)) //VOREStation Edit if(istype(C.loc, /mob/living/carbon/human)) var/mob/living/carbon/human/H = C.loc if(H.w_uniform != C) From b21d5f33733f76bda3a6148f61976905aadf2469 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 6 May 2021 12:30:03 -0400 Subject: [PATCH 2/3] Minor Refactor --- code/datums/repositories/crew.dm | 2 +- code/game/area/Space Station 13 areas_vr.dm | 3 - code/game/area/areas_vr.dm | 2 + maps/tether/tether_areas.dm | 101 +++++++++++++++++--- 4 files changed, 91 insertions(+), 17 deletions(-) diff --git a/code/datums/repositories/crew.dm b/code/datums/repositories/crew.dm index c07c6417bb8..b9967debfef 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 = get_area(pos) //VOREStation Add: No sensor in Dorm - if((C) && (C.has_sensor) && (pos) && (pos.z == zLevel) && (C.sensor_mode != SUIT_SENSOR_OFF) && !(is_jammed(C)) && (B.limit_mob_size)) //VOREStation Edit + if((C) && (C.has_sensor) && (pos) && (pos.z == zLevel) && (C.sensor_mode != SUIT_SENSOR_OFF) && !(is_jammed(C)) && !(B.block_suit_sensors)) //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/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm index 9b1a751ec67..c7a18a41070 100644 --- a/code/game/area/Space Station 13 areas_vr.dm +++ b/code/game/area/Space Station 13 areas_vr.dm @@ -1,6 +1,3 @@ -/area - var/limit_mob_size = TRUE //If mob size is limited in the area. - /area/shuttle/belter name = "Belter Shuttle" icon_state = "shuttle2" diff --git a/code/game/area/areas_vr.dm b/code/game/area/areas_vr.dm index 5396c46e601..371701e5b65 100644 --- a/code/game/area/areas_vr.dm +++ b/code/game/area/areas_vr.dm @@ -1,6 +1,8 @@ /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 mob size is limited in the area. /area/Entered(var/atom/movable/AM, oldLoc) . = ..() diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index 1389266ce85..71c93bb2894 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -973,144 +973,185 @@ icon_state = "recreation_area_restroom" sound_env = SMALL_ENCLOSED -/area/crew_quarters/sleep - limit_mob_size = FALSE - /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 /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 /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 /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 /area/crew_quarters/sleep/vistor_room_1 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/vistor_room_2 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/vistor_room_3 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/vistor_room_4 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/vistor_room_5 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/vistor_room_6 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/vistor_room_7 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/vistor_room_8 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/vistor_room_9 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/vistor_room_10 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/vistor_room_11 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/vistor_room_12 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/Dorm_1 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/Dorm_2 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/Dorm_3 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/Dorm_4 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/Dorm_5 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/Dorm_6 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/Dorm_7 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/Dorm_8 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/Dorm_9 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/Dorm_10 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/crew_quarters/sleep/Dorm_1/holo name = "\improper Dorm 1 Holodeck" icon_state = "dk_yellow" - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE /area/crew_quarters/sleep/Dorm_3/holo name = "\improper Dorm 3 Holodeck" icon_state = "dk_yellow" - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE /area/crew_quarters/sleep/Dorm_5/holo name = "\improper Dorm 5 Holodeck" icon_state = "dk_yellow" - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE /area/crew_quarters/sleep/Dorm_7/holo name = "\improper Dorm 7 Holodeck" icon_state = "dk_yellow" - flags = RAD_SHIELDED | BLUE_SHIELDED - soundproofed = TRUE /area/crew_quarters/sleep/spacedorm1 name = "\improper Visitor Lodging 1" @@ -1118,64 +1159,98 @@ lightswitch = 0 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE + /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 + /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 + /area/crew_quarters/sleep/spacedorm4 name = "\improper Visitor Lodging 4" icon_state = "dk_yellow" lightswitch = 0 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE - -/area/holodeck/holodorm limit_mob_size = FALSE + block_suit_sensors = TRUE /area/holodeck/holodorm/source_basic name = "\improper Holodeck Source" flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE + /area/holodeck/holodorm/source_desert name = "\improper Holodeck Source" flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE + /area/holodeck/holodorm/source_seating name = "\improper Holodeck Source" flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE + /area/holodeck/holodorm/source_beach name = "\improper Holodeck Source" flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE + /area/holodeck/holodorm/source_garden name = "\improper Holodeck Source" flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE + /area/holodeck/holodorm/source_boxing name = "\improper Holodeck Source" flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE + /area/holodeck/holodorm/source_snow name = "\improper Holodeck Source" flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE + /area/holodeck/holodorm/source_space name = "\improper Holodeck Source" flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE + /area/holodeck/holodorm/source_off name = "\improper Holodeck Source" flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE /area/ai_core_foyer name = "\improper AI Core Access" From dd86de0fb2853679d58c935a8b074bbc4803cae8 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 6 May 2021 13:00:38 -0400 Subject: [PATCH 3/3] Optimization! --- code/datums/repositories/crew.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/repositories/crew.dm b/code/datums/repositories/crew.dm index b9967debfef..e9547694480 100644 --- a/code/datums/repositories/crew.dm +++ b/code/datums/repositories/crew.dm @@ -24,8 +24,8 @@ var/global/datum/repository/crew/crew_repository = new() var/tracked = scan() for(var/obj/item/clothing/under/C in tracked) var/turf/pos = get_turf(C) - var/area/B = get_area(pos) //VOREStation Add: No sensor in Dorm - if((C) && (C.has_sensor) && (pos) && (pos.z == zLevel) && (C.sensor_mode != SUIT_SENSOR_OFF) && !(is_jammed(C)) && !(B.block_suit_sensors)) //VOREStation Edit + 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))) //VOREStation Edit if(istype(C.loc, /mob/living/carbon/human)) var/mob/living/carbon/human/H = C.loc if(H.w_uniform != C)