cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 07:28:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15658 from Kashargul/borgPrivacy

Browse Source 
borg privacy in droms
This commit is contained in:
Heroman3003
2024-01-04 05:16:17 +10:00
committed by GitHub
parent 400187ced7 86a45310ff
commit 075ebf7756
6 changed files with 53 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/area/areas_vr.dm
+2 -1
View File
@@ -2,7 +2,8 @@
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.
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.
code/game/machinery/camera/tracking.dm
+3 -1
View File
@@ -228,7 +228,9 @@
var/obj/item/weapon/card/id/id = GetIdCard()
if(id && id.prevent_tracking())
return TRACKING_TERMINATE
if(InvalidPlayerTurf(get_turf(src)))
var/turf/pos = get_turf(src)
var/area/B = pos?.loc // No cam tracking in dorms!
if(InvalidPlayerTurf(pos) || B.block_tracking)
return TRACKING_TERMINATE
if(invisibility >= INVISIBILITY_LEVEL_ONE) //cloaked
return TRACKING_TERMINATE
code/modules/tgui/modules/camera.dm
+6 -3
View File
@@ -80,8 +80,10 @@
/datum/tgui_module/camera/tgui_interact(mob/user, datum/tgui/ui = null)
// Update UI
ui = SStgui.try_update_ui(user, src, ui)
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())
if(!active_camera?.can_use() || B.block_tracking)
show_camera_static()
if(!ui)
var/user_ref = REF(user)
@@ -175,15 +177,16 @@
. = TRUE
/datum/tgui_module/camera/proc/update_active_camera_screen()
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())
if(!active_camera?.can_use() || B.block_tracking)
show_camera_static()
return TRUE
// If we're not forcing an update for some reason and the cameras are in the same location,
// we don't need to update anything.
// Most security cameras will end here as they're not moving.
var/turf/newturf = get_turf(active_camera)
if(newturf == last_camera_turf)
return
maps/groundbase/groundbase_areas.dm
+1
View File
@@ -449,6 +449,7 @@
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
forbid_events = TRUE
forbid_singulo = TRUE
maps/stellar_delight/stellar_delight_areas.dm
+2 -1
View File
@@ -129,6 +129,7 @@
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
forbid_events = TRUE
forbid_singulo = TRUE
@@ -286,6 +287,7 @@
flags = RAD_SHIELDED| BLUE_SHIELDED |AREA_FLAG_IS_NOT_PERSISTENT
soundproofed = TRUE
block_suit_sensors = TRUE
block_tracking = TRUE
forbid_events = TRUE
/area/stellardelight/deck3/portdock
@@ -305,4 +307,3 @@
name = "Deck Two Exterior"
/area/stellardelight/deck3/exterior
name = "Deck Three Exterior"
maps/tether/tether_areas.dm
+39
View File
@@ -994,6 +994,7 @@
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = = TRUE
/area/crew_quarters/sleep/maintDorm2
name = "\improper Construction Dorm 2"
@@ -1002,6 +1003,7 @@
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = = TRUE
/area/crew_quarters/sleep/maintDorm3
name = "\improper Construction Dorm 3"
@@ -1010,6 +1012,7 @@
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = = TRUE
/area/crew_quarters/sleep/maintDorm4
name = "\improper Construction Dorm 4"
@@ -1018,138 +1021,161 @@
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/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
/area/crew_quarters/sleep/Dorm_1
flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/Dorm_2
flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/Dorm_3
flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/Dorm_4
flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/Dorm_5
flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/Dorm_6
flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/Dorm_7
flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/Dorm_8
flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/Dorm_9
flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/Dorm_10
flags = RAD_SHIELDED | BLUE_SHIELDED
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/Dorm_1/holo
name = "\improper Dorm 1 Holodeck"
@@ -1175,6 +1201,7 @@
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/spacedorm2
name = "\improper Visitor Lodging 2"
@@ -1184,6 +1211,7 @@
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/spacedorm3
name = "\improper Visitor Lodging 3"
@@ -1193,6 +1221,7 @@
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/crew_quarters/sleep/spacedorm4
name = "\improper Visitor Lodging 4"
@@ -1202,6 +1231,7 @@
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/holodeck/holodorm/source_basic
name = "\improper Holodeck Source"
@@ -1209,6 +1239,7 @@
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/holodeck/holodorm/source_desert
name = "\improper Holodeck Source"
@@ -1216,6 +1247,7 @@
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/holodeck/holodorm/source_seating
name = "\improper Holodeck Source"
@@ -1223,6 +1255,7 @@
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/holodeck/holodorm/source_beach
name = "\improper Holodeck Source"
@@ -1230,6 +1263,7 @@
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/holodeck/holodorm/source_garden
name = "\improper Holodeck Source"
@@ -1237,6 +1271,7 @@
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/holodeck/holodorm/source_boxing
name = "\improper Holodeck Source"
@@ -1244,6 +1279,7 @@
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/holodeck/holodorm/source_snow
name = "\improper Holodeck Source"
@@ -1251,6 +1287,7 @@
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/holodeck/holodorm/source_space
name = "\improper Holodeck Source"
@@ -1258,6 +1295,7 @@
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/holodeck/holodorm/source_off
name = "\improper Holodeck Source"
@@ -1265,6 +1303,7 @@
soundproofed = TRUE
limit_mob_size = FALSE
block_suit_sensors = TRUE
block_tracking = TRUE
/area/ai_core_foyer
name = "\improper AI Core Access"