From 706c20a15eaf6fd3fc8c247c7002293c94835c01 Mon Sep 17 00:00:00 2001 From: "quartz235@gmail.com" Date: Wed, 28 Dec 2011 02:08:33 +0000 Subject: [PATCH] Atmos techs now spawn with extended capacity emergency tanks AIs/Cyborgs can no longer drink from the toilet or wash themselves in sinks for the good of IMMERSION git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2836 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/jobs/job/engineering.dm | 2 +- code/game/machinery/sink.dm | 3 +++ code/modules/recycling/disposal.dm | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index c33deecd11..d397164791 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -62,7 +62,7 @@ if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/headset_eng(H), H.slot_ears) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) - H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack) + H.equip_if_possible(new /obj/item/weapon/storage/box/engineer(H.back), H.slot_in_backpack) H.equip_if_possible(new /obj/item/clothing/under/rank/atmospheric_technician(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/engineering(H), H.slot_belt) diff --git a/code/game/machinery/sink.dm b/code/game/machinery/sink.dm index 163ca8fd53..4944445dcc 100644 --- a/code/game/machinery/sink.dm +++ b/code/game/machinery/sink.dm @@ -8,6 +8,9 @@ attack_hand(mob/M as mob) + if(isrobot(M) || isAI(M)) + return + if(busy) M << "\red Someone's already washing something here." return diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 814f40132e..d724c2ee0e 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -406,6 +406,9 @@ return interact(mob/user) + if(isAI(user) || isrobot(user)) + return + add_fingerprint(user) for (var/mob/V in viewers(user)) V.show_message("[user] eagerly drinks the toilet water!", 3)//Yum yum yum