cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1905 from CHOMPStationBot/upstream-merge-10221

Browse Source 
[MIRROR] Disables Suit Sensors in Dorms
This commit is contained in:
Nadyr
2021-05-08 08:09:27 -04:00
committed by GitHub
parent fa46ddd8a5 e35babea77
commit b7ea40f46c
4 changed files with 92 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/datums/repositories/crew.dm
View File

@@ -24,7 +24,8 @@ var/global/datum/repository/crew/crew_repository = new()
var/tracked = scan() var/tracked = scan()
for(var/obj/item/clothing/under/C in tracked) for(var/obj/item/clothing/under/C in tracked)
var/turf/pos = get_turf(C) 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 = 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)) if(istype(C.loc, /mob/living/carbon/human))
var/mob/living/carbon/human/H = C.loc var/mob/living/carbon/human/H = C.loc
if(H.w_uniform != C) if(H.w_uniform != C)

3
code/game/area/Space Station 13 areas_vr.dm
View File

@@ -1,6 +1,3 @@
/area
var/limit_mob_size = TRUE //If mob size is limited in the area.
/area/shuttle/belter /area/shuttle/belter
name = "Belter Shuttle" name = "Belter Shuttle"
icon_state = "shuttle2" icon_state = "shuttle2"

2
code/game/area/areas_vr.dm
View File

@@ -1,6 +1,8 @@
/area /area
var/enter_message var/enter_message
var/exit_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) /area/Entered(var/atom/movable/AM, oldLoc)
. = ..() . = ..()

101
maps/tether/tether_areas.dm
View File

@@ -973,144 +973,185 @@
icon_state = "recreation_area_restroom" icon_state = "recreation_area_restroom"
sound_env = SMALL_ENCLOSED sound_env = SMALL_ENCLOSED
/area/crew_quarters/sleep
limit_mob_size = FALSE
/area/crew_quarters/sleep/maintDorm1 /area/crew_quarters/sleep/maintDorm1
name = "\improper Construction Dorm 1" name = "\improper Construction Dorm 1"
icon_state = "Sleep" icon_state = "Sleep"
flags = RAD_SHIELDED flags = RAD_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/maintDorm2 /area/crew_quarters/sleep/maintDorm2
name = "\improper Construction Dorm 2" name = "\improper Construction Dorm 2"
icon_state = "Sleep" icon_state = "Sleep"
flags = RAD_SHIELDED flags = RAD_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/maintDorm3 /area/crew_quarters/sleep/maintDorm3
name = "\improper Construction Dorm 3" name = "\improper Construction Dorm 3"
icon_state = "Sleep" icon_state = "Sleep"
flags = RAD_SHIELDED flags = RAD_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/maintDorm4 /area/crew_quarters/sleep/maintDorm4
name = "\improper Construction Dorm 4" name = "\improper Construction Dorm 4"
icon_state = "Sleep" icon_state = "Sleep"
flags = RAD_SHIELDED flags = RAD_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/vistor_room_1 /area/crew_quarters/sleep/vistor_room_1
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/vistor_room_2 /area/crew_quarters/sleep/vistor_room_2
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/vistor_room_3 /area/crew_quarters/sleep/vistor_room_3
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/vistor_room_4 /area/crew_quarters/sleep/vistor_room_4
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/vistor_room_5 /area/crew_quarters/sleep/vistor_room_5
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/vistor_room_6 /area/crew_quarters/sleep/vistor_room_6
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/vistor_room_7 /area/crew_quarters/sleep/vistor_room_7
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/vistor_room_8 /area/crew_quarters/sleep/vistor_room_8
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/vistor_room_9 /area/crew_quarters/sleep/vistor_room_9
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/vistor_room_10 /area/crew_quarters/sleep/vistor_room_10
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/vistor_room_11 /area/crew_quarters/sleep/vistor_room_11
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/vistor_room_12 /area/crew_quarters/sleep/vistor_room_12
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/Dorm_1 /area/crew_quarters/sleep/Dorm_1
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/Dorm_2 /area/crew_quarters/sleep/Dorm_2
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/Dorm_3 /area/crew_quarters/sleep/Dorm_3
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/Dorm_4 /area/crew_quarters/sleep/Dorm_4
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/Dorm_5 /area/crew_quarters/sleep/Dorm_5
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/Dorm_6 /area/crew_quarters/sleep/Dorm_6
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/Dorm_7 /area/crew_quarters/sleep/Dorm_7
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/Dorm_8 /area/crew_quarters/sleep/Dorm_8
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/Dorm_9 /area/crew_quarters/sleep/Dorm_9
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/Dorm_10 /area/crew_quarters/sleep/Dorm_10
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/Dorm_1/holo /area/crew_quarters/sleep/Dorm_1/holo
name = "\improper Dorm 1 Holodeck" name = "\improper Dorm 1 Holodeck"
icon_state = "dk_yellow" icon_state = "dk_yellow"
flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_3/holo /area/crew_quarters/sleep/Dorm_3/holo
name = "\improper Dorm 3 Holodeck" name = "\improper Dorm 3 Holodeck"
icon_state = "dk_yellow" icon_state = "dk_yellow"
flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_5/holo /area/crew_quarters/sleep/Dorm_5/holo
name = "\improper Dorm 5 Holodeck" name = "\improper Dorm 5 Holodeck"
icon_state = "dk_yellow" icon_state = "dk_yellow"
flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_7/holo /area/crew_quarters/sleep/Dorm_7/holo
name = "\improper Dorm 7 Holodeck" name = "\improper Dorm 7 Holodeck"
icon_state = "dk_yellow" icon_state = "dk_yellow"
flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE
/area/crew_quarters/sleep/spacedorm1 /area/crew_quarters/sleep/spacedorm1
name = "\improper Visitor Lodging 1" name = "\improper Visitor Lodging 1"
@@ -1118,64 +1159,98 @@
lightswitch = 0 lightswitch = 0
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/spacedorm2 /area/crew_quarters/sleep/spacedorm2
name = "\improper Visitor Lodging 2" name = "\improper Visitor Lodging 2"
icon_state = "dk_yellow" icon_state = "dk_yellow"
lightswitch = 0 lightswitch = 0
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/spacedorm3 /area/crew_quarters/sleep/spacedorm3
name = "\improper Visitor Lodging 3" name = "\improper Visitor Lodging 3"
icon_state = "dk_yellow" icon_state = "dk_yellow"
lightswitch = 0 lightswitch = 0
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/crew_quarters/sleep/spacedorm4 /area/crew_quarters/sleep/spacedorm4
name = "\improper Visitor Lodging 4" name = "\improper Visitor Lodging 4"
icon_state = "dk_yellow" icon_state = "dk_yellow"
lightswitch = 0 lightswitch = 0
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
/area/holodeck/holodorm
limit_mob_size = FALSE limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/holodeck/holodorm/source_basic /area/holodeck/holodorm/source_basic
name = "\improper Holodeck Source" name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/holodeck/holodorm/source_desert /area/holodeck/holodorm/source_desert
name = "\improper Holodeck Source" name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/holodeck/holodorm/source_seating /area/holodeck/holodorm/source_seating
name = "\improper Holodeck Source" name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/holodeck/holodorm/source_beach /area/holodeck/holodorm/source_beach
name = "\improper Holodeck Source" name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/holodeck/holodorm/source_garden /area/holodeck/holodorm/source_garden
name = "\improper Holodeck Source" name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/holodeck/holodorm/source_boxing /area/holodeck/holodorm/source_boxing
name = "\improper Holodeck Source" name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/holodeck/holodorm/source_snow /area/holodeck/holodorm/source_snow
name = "\improper Holodeck Source" name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/holodeck/holodorm/source_space /area/holodeck/holodorm/source_space
name = "\improper Holodeck Source" name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/holodeck/holodorm/source_off /area/holodeck/holodorm/source_off
name = "\improper Holodeck Source" name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
/area/ai_core_foyer /area/ai_core_foyer
name = "\improper AI Core Access" name = "\improper AI Core Access"