From c335840cfd6ab735061f91c53d3a4d8f8e2f896e Mon Sep 17 00:00:00 2001 From: TullyBurnalot Date: Wed, 6 Jul 2016 19:40:56 +0100 Subject: [PATCH 1/3] Fixes AIs removing beakers from IV Drips Thanks to Krausus for the general idea on how to do this without adding an exception just for the AI. - AIs can no longer interact with IV Drips (unless their core is literally adjacent to it); - Human mobs and Robotics can still interact with IV Drips (robots can no longer interact with them at a distance :cl: tweak: AI can no longer interact with IV Drips at a distance tweak: Robots can no longer interact with IV Drips at a distance /:cl: --- code/game/machinery/iv_drip.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 5caff96d4ea..0fb74bc68ad 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -132,6 +132,8 @@ update_icon() /obj/machinery/iv_drip/attack_hand(mob/user as mob) + if((get_dist(src, user) > 1)) + return //stops the AI from removing beakers, still allows borgs if(src.beaker) src.beaker.loc = get_turf(src) src.beaker = null From 34a6960ef11c68e6950ecb3f4e0ae8dc75692338 Mon Sep 17 00:00:00 2001 From: TullyBurnalot Date: Wed, 6 Jul 2016 19:50:47 +0100 Subject: [PATCH 2/3] Removes 2 extra parenthesis What the title says. --- code/game/machinery/iv_drip.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 0fb74bc68ad..2c1f4cb0059 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -132,7 +132,7 @@ update_icon() /obj/machinery/iv_drip/attack_hand(mob/user as mob) - if((get_dist(src, user) > 1)) + if(get_dist(src, user) > 1) return //stops the AI from removing beakers, still allows borgs if(src.beaker) src.beaker.loc = get_turf(src) From a1e84818aad9b64ae8887d83fa74fe849a0cb9eb Mon Sep 17 00:00:00 2001 From: TullyBurnalot Date: Wed, 6 Jul 2016 23:21:32 +0100 Subject: [PATCH 3/3] Removes Borg/AI IV Drip access entirely Neither AIs nor Cyborgs can remove beakers from IV Drips. --- code/game/machinery/iv_drip.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 2c1f4cb0059..09350136bff 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -131,9 +131,9 @@ beaker.reagents.handle_reactions() update_icon() -/obj/machinery/iv_drip/attack_hand(mob/user as mob) - if(get_dist(src, user) > 1) - return //stops the AI from removing beakers, still allows borgs +/obj/machinery/iv_drip/attack_hand(mob/living/carbon/user) + if(!istype(user)) + return if(src.beaker) src.beaker.loc = get_turf(src) src.beaker = null