From 00c1e448526a94a762f4d7ce84129f279e1a2b99 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Fri, 6 Dec 2019 09:30:01 +1000 Subject: [PATCH 1/2] Stops bots from opening elevator doors --- code/modules/mob/living/bot/bot.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm index 9e0becd3ce5..67baa9b8847 100644 --- a/code/modules/mob/living/bot/bot.dm +++ b/code/modules/mob/living/bot/bot.dm @@ -157,7 +157,11 @@ /mob/living/bot/Bump(var/atom/A) if(on && botcard && istype(A, /obj/machinery/door)) var/obj/machinery/door/D = A +<<<<<<< HEAD if(!istype(D, /obj/machinery/door/firedoor) && !istype(D, /obj/machinery/door/blast) && !istype(D, /obj/machinery/door/airlock/lift) && D.check_access(botcard)) //VOREStation Edit: Elevator safety precaution +======= + if(!istype(D, /obj/machinery/door/firedoor) && !istype(D, /obj/machinery/door/blast) && !istype(D, /obj/machinery/door/airlock/lift) && D.check_access(botcard)) +>>>>>>> 0159551... Stops bots from opening elevator doors (#6557) D.open() else ..() From a73726fd19a928cce3f4cd75f95214d672f493e4 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Thu, 5 Dec 2019 19:10:29 -0500 Subject: [PATCH 2/2] Update bot.dm --- code/modules/mob/living/bot/bot.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm index 67baa9b8847..3ba745a0144 100644 --- a/code/modules/mob/living/bot/bot.dm +++ b/code/modules/mob/living/bot/bot.dm @@ -157,11 +157,7 @@ /mob/living/bot/Bump(var/atom/A) if(on && botcard && istype(A, /obj/machinery/door)) var/obj/machinery/door/D = A -<<<<<<< HEAD - if(!istype(D, /obj/machinery/door/firedoor) && !istype(D, /obj/machinery/door/blast) && !istype(D, /obj/machinery/door/airlock/lift) && D.check_access(botcard)) //VOREStation Edit: Elevator safety precaution -======= if(!istype(D, /obj/machinery/door/firedoor) && !istype(D, /obj/machinery/door/blast) && !istype(D, /obj/machinery/door/airlock/lift) && D.check_access(botcard)) ->>>>>>> 0159551... Stops bots from opening elevator doors (#6557) D.open() else ..()