From 97d82b15c231a967b6440c9538755f689ff625a6 Mon Sep 17 00:00:00 2001 From: Mandurrrh Date: Sun, 22 Feb 2015 09:15:42 -0500 Subject: [PATCH 1/3] Fixes #7883 Borgs can't pass through holotape --- code/game/objects/items/holotape.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/game/objects/items/holotape.dm b/code/game/objects/items/holotape.dm index 09044d7fdc1..0e5ec254575 100644 --- a/code/game/objects/items/holotape.dm +++ b/code/game/objects/items/holotape.dm @@ -158,6 +158,11 @@ var/turf/T = get_turf(src) C.loc = T +/obj/item/holotape/Bumped(var/mob/living/silicon/S) + if(S.a_intent == "help") + var/turf/T = get_turf(src) + S.loc = T + /obj/item/holotape/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) if(!density) return 1 if(air_group || (height==0)) return 1 From 56912c69ba17aab3c871b5f82ff8b096836b306c Mon Sep 17 00:00:00 2001 From: Mandurrrh Date: Sun, 22 Feb 2015 17:53:52 -0500 Subject: [PATCH 2/3] Removes help intent block giving silicons freeacess. Everyone else has to walk still. --- code/game/objects/items/holotape.dm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/holotape.dm b/code/game/objects/items/holotape.dm index 0e5ec254575..5f38f359d27 100644 --- a/code/game/objects/items/holotape.dm +++ b/code/game/objects/items/holotape.dm @@ -153,13 +153,15 @@ spawn(40) charging = 0 -/obj/item/holotape/Bumped(var/mob/living/carbon/C) - if(C.m_intent == "walk") - var/turf/T = get_turf(src) - C.loc = T +/obj/item/holotape/Bumped(var/mob/M) + if(iscarbon(M)) + var/mob/living/carbon/C = M + if(C.m_intent == "walk") + var/turf/T = get_turf(src) + C.loc = T -/obj/item/holotape/Bumped(var/mob/living/silicon/S) - if(S.a_intent == "help") + if(issilicon(M)) + var/mob/living/silicon/S = M var/turf/T = get_turf(src) S.loc = T From da9100893f979521ec0472e98e83556faf4b02a2 Mon Sep 17 00:00:00 2001 From: Mandurrrh Date: Sun, 22 Feb 2015 18:23:08 -0500 Subject: [PATCH 3/3] adds drone access --- code/game/objects/items/holotape.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/holotape.dm b/code/game/objects/items/holotape.dm index 5f38f359d27..9dcb5cefae2 100644 --- a/code/game/objects/items/holotape.dm +++ b/code/game/objects/items/holotape.dm @@ -160,10 +160,9 @@ var/turf/T = get_turf(src) C.loc = T - if(issilicon(M)) - var/mob/living/silicon/S = M + if(M.has_unlimited_silicon_privilege) var/turf/T = get_turf(src) - S.loc = T + M.loc = T /obj/item/holotape/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) if(!density) return 1