From b4969c4770804d14cc8f75d2ec96eb157cda8532 Mon Sep 17 00:00:00 2001 From: GrayRachnid Date: Wed, 17 Mar 2021 12:40:25 -0400 Subject: [PATCH] Fixes auto-calling for non-heads and adds secure holopads --- _maps/map_files/BoxStation/BoxStation.dmm | 36 ++++++++--------- .../map_files/Deltastation/DeltaStation2.dmm | 32 +++++++-------- _maps/map_files/MetaStation/MetaStation.dmm | 39 +++++++++---------- _maps/map_files/PubbyStation/PubbyStation.dmm | 10 ++--- code/game/machinery/hologram.dm | 6 +-- .../circuitboards/machine_circuitboards.dm | 2 +- 6 files changed, 62 insertions(+), 63 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index eb194cf5cf..d99e42beb7 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -1000,7 +1000,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hos) "act" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "acu" = ( @@ -3551,7 +3551,7 @@ /turf/open/floor/plasteel, /area/security/brig) "agU" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "agV" = ( @@ -19903,7 +19903,6 @@ /turf/open/floor/plasteel, /area/bridge) "aVk" = ( -/obj/machinery/holopad, /obj/structure/cable{ icon_state = "4-8" }, @@ -19913,6 +19912,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/holopad, /turf/open/floor/plasteel, /area/bridge) "aVl" = ( @@ -22726,10 +22726,10 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "bcf" = ( -/obj/machinery/holopad, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "bcg" = ( @@ -23322,10 +23322,10 @@ /turf/open/floor/mineral/titanium/blue, /area/crew_quarters/toilet/locker) "bdK" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/holopad/secure, /turf/open/floor/carpet, /area/bridge/meeting_room) "bdL" = ( @@ -24557,10 +24557,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/holopad, /obj/structure/cable{ icon_state = "2-8" }, +/obj/machinery/holopad/secure, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bgX" = ( @@ -28662,7 +28662,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "bqB" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/carpet, /area/crew_quarters/heads/hop) "bqC" = ( @@ -32045,7 +32045,7 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) "byr" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/hor) "bys" = ( @@ -32135,13 +32135,13 @@ /turf/open/floor/plasteel, /area/quartermaster/qm) "byC" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/brown{ dir = 1 }, /obj/effect/turf_decal/tile/brown{ dir = 4 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/quartermaster/qm) "byD" = ( @@ -35876,13 +35876,13 @@ /turf/open/floor/engine, /area/science/storage) "bGZ" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) "bHa" = ( @@ -40809,8 +40809,8 @@ /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "bTI" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/tcommsat/computer) "bTJ" = ( @@ -45387,7 +45387,6 @@ name = "Privacy Shutters Control"; pixel_y = 26 }, -/obj/machinery/holopad, /obj/machinery/light{ dir = 1 }, @@ -45401,6 +45400,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) "cfI" = ( @@ -49628,12 +49628,12 @@ /turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "ctJ" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ icon_state = "2-8" }, /obj/effect/landmark/start/cyborg, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "ctK" = ( @@ -50018,9 +50018,9 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/atmos) "cuC" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/landmark/start/cyborg, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/atmos) "cuD" = ( @@ -50075,12 +50075,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/landmark/start/cyborg, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "cuH" = ( @@ -50106,10 +50106,10 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/service) "cuJ" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/service) "cuK" = ( @@ -50676,8 +50676,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/hallway) "cvU" = ( @@ -50932,10 +50932,10 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "cwB" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 94699a7a00..6965d3d0af 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -25899,7 +25899,6 @@ /turf/open/floor/plasteel, /area/quartermaster/qm) "aVU" = ( -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -25907,6 +25906,7 @@ icon_state = "1-8" }, /obj/effect/turf_decal/bot, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/quartermaster/qm) "aVV" = ( @@ -36419,7 +36419,6 @@ /turf/open/floor/plasteel/dark, /area/aisat) "boh" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -36430,6 +36429,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/aisat) "boi" = ( @@ -37166,13 +37166,13 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hos) "bpv" = ( -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hos) "bpw" = ( @@ -46877,7 +46877,6 @@ /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai) "bEg" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -46888,6 +46887,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "bEh" = ( @@ -48308,12 +48308,12 @@ /turf/open/floor/plasteel, /area/engine/gravity_generator) "bFZ" = ( -/obj/machinery/holopad, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /obj/structure/cable/white{ icon_state = "4-8" }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/engine/gravity_generator) "bGa" = ( @@ -54052,10 +54052,10 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "2-8" }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bOL" = ( @@ -54114,7 +54114,6 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bOR" = ( -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "1-4" }, @@ -54123,6 +54122,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, +/obj/machinery/holopad/secure, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bOS" = ( @@ -56069,8 +56069,8 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) "bRZ" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/bot, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "bSa" = ( @@ -58451,7 +58451,6 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/holopad, /obj/effect/landmark/start/cyborg, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -58463,6 +58462,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "bVy" = ( @@ -58795,7 +58795,6 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/holopad, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -58806,6 +58805,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/aisat) "bVT" = ( @@ -64575,7 +64575,6 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "ceH" = ( -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -64586,6 +64585,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/holopad/secure, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "ceI" = ( @@ -66125,11 +66125,11 @@ /turf/open/floor/plasteel, /area/security/brig) "chd" = ( -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "4-8" }, /obj/effect/turf_decal/bot, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/security/brig) "che" = ( @@ -66303,7 +66303,6 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -66317,6 +66316,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "cho" = ( @@ -67663,10 +67663,10 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hop) "cjC" = ( -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "1-2" }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hop) "cjD" = ( @@ -102510,10 +102510,10 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/hor) "drY" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/hor) "drZ" = ( @@ -107086,7 +107086,6 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -107094,6 +107093,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/cmo) "dAd" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index c2a0e5c353..7f8e7c1d8a 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -3710,7 +3710,6 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "agS" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3721,6 +3720,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "agT" = ( @@ -3795,11 +3795,11 @@ /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "agZ" = ( -/obj/machinery/holopad, /obj/structure/chair{ dir = 1 }, /obj/effect/landmark/start/head_of_security, +/obj/machinery/holopad/secure, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "aha" = ( @@ -9617,8 +9617,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, -/obj/machinery/holopad, /obj/effect/turf_decal/stripes/line, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/engine/gravity_generator) "arR" = ( @@ -20575,7 +20575,7 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "aOc" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "aOd" = ( @@ -21700,7 +21700,7 @@ /area/quartermaster/qm) "aQs" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/quartermaster/qm) "aQt" = ( @@ -25578,7 +25578,7 @@ dir = 1; pixel_y = 1 }, -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/aisat) "aYe" = ( @@ -27503,7 +27503,6 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "bbv" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -27514,6 +27513,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "bbw" = ( @@ -30698,7 +30698,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/holopad, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "bhz" = ( @@ -31161,8 +31160,8 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "bip" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "biq" = ( @@ -33899,12 +33898,12 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "bnC" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/landmark/start/cyborg, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "bnD" = ( @@ -34887,11 +34886,11 @@ /turf/open/floor/plasteel/dark, /area/aisat) "bpF" = ( -/obj/machinery/holopad, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/aisat) "bpG" = ( @@ -34937,8 +34936,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/holopad, /obj/item/beacon, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/foyer) "bpL" = ( @@ -37489,9 +37488,9 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "buG" = ( -/obj/machinery/holopad{ - pixel_x = 9; - pixel_y = -9 +/obj/machinery/holopad/secure{ + pixel_x = 15; + pixel_y = -15 }, /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) @@ -39670,7 +39669,6 @@ /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bzq" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -39681,6 +39679,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bzr" = ( @@ -43456,13 +43455,13 @@ /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "bHE" = ( -/obj/machinery/holopad, /obj/structure/cable/yellow{ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "bHF" = ( @@ -58787,7 +58786,7 @@ /area/science/explab) "cmX" = ( /obj/structure/window/reinforced, -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/aisat) "cmY" = ( @@ -61251,13 +61250,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/holopad, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) "crA" = ( @@ -63638,7 +63637,7 @@ }, /area/crew_quarters/heads/hor) "cvU" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 8e23df2e5f..aef188164e 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -3,9 +3,9 @@ /turf/open/space/basic, /area/space) "aab" = ( -/obj/machinery/holopad, /obj/effect/landmark/start/cyborg, /mob/living/simple_animal/bot/secbot/pingsky, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "aac" = ( @@ -999,7 +999,7 @@ /obj/machinery/power/terminal{ dir = 1 }, -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/white, /area/ai_monitored/turret_protected/ai) "acs" = ( @@ -11793,7 +11793,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) "aBn" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) "aBo" = ( @@ -12592,7 +12592,7 @@ /turf/open/floor/wood, /area/crew_quarters/heads/hop) "aCR" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "aCS" = ( @@ -12995,7 +12995,6 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "aDM" = ( -/obj/machinery/holopad, /obj/machinery/camera/motion{ c_tag = "AI Upload Center"; dir = 1; @@ -13008,6 +13007,7 @@ name = "Station Intercom (AI Private)"; pixel_y = -28 }, +/obj/machinery/holopad/secure, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "aDN" = ( diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 4a576c5a6e..853bd73eac 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -79,7 +79,7 @@ GLOBAL_LIST_EMPTY(network_holopads) var/secure = FALSE /// If we are currently calling another holopad var/calling = FALSE -/* + /obj/machinery/holopad/secure name = "secure holopad" desc = "It's a floor-mounted device for projecting holographic images. This one will refuse to auto-connect incoming calls." @@ -90,7 +90,7 @@ GLOBAL_LIST_EMPTY(network_holopads) var/obj/item/circuitboard/machine/holopad/board = circuit board.secure = TRUE board.build_path = /obj/machinery/holopad/secure -*/ + /obj/machinery/holopad/tutorial resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF flags_1 = NODECONSTRUCT_1 @@ -372,7 +372,7 @@ GLOBAL_LIST_EMPTY(network_holopads) if(force_answer_call && world.time > (HC.call_start_time + (HOLOPAD_MAX_DIAL_TIME / 2))) HC.Answer(src) break - if(!secure) //HC.head_call && + if(HC.head_call && !secure) HC.Answer(src) break if(outgoing_call) diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index dcd0cda233..286506a7d1 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -472,7 +472,7 @@ build_path = /obj/machinery/holopad secure = FALSE else - build_path = /obj/machinery/holopad //secure + build_path = /obj/machinery/holopad/secure //secure secure = TRUE to_chat(user, "You [secure? "en" : "dis"]able the security on the [src]") . = ..()