From 7e0b1302ece30d740c031fce326478d4f4c7fb98 Mon Sep 17 00:00:00 2001 From: pinatacolada Date: Wed, 4 May 2016 14:31:43 +0100 Subject: [PATCH 1/3] prevents implanting fukken disks in boxes inside of people fixes #4347 --- code/modules/surgery/implant.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm index 6a6a7e8b7fe..a8667638dea 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -175,6 +175,12 @@ to_chat(user, "Central command would kill you if you implanted the disk into someone.") return 0//fail + if(istype(tool, /obj/item/weapon/storage/box)) + for(var/obj/item/I in tool.contents) + if(istype(I, /obj/item/weapon/disk/nuclear)) + to_chat(user, "Central command would kill you if you implanted the disk into someone. Even if in a box. Especially in a box.") + return 0//fail + if(istype(tool,/obj/item/organ)) to_chat(user, "This isn't the type of surgery for organ transplants!") return 0//fail From 0f3f961ce0fbfb8fbf6cdd1d5d3c1aa457203f81 Mon Sep 17 00:00:00 2001 From: pinatacolada Date: Wed, 4 May 2016 20:56:27 +0100 Subject: [PATCH 2/3] locatorinos --- code/modules/surgery/implant.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm index a8667638dea..5eeba4ab50b 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -175,11 +175,11 @@ to_chat(user, "Central command would kill you if you implanted the disk into someone.") return 0//fail - if(istype(tool, /obj/item/weapon/storage/box)) - for(var/obj/item/I in tool.contents) - if(istype(I, /obj/item/weapon/disk/nuclear)) - to_chat(user, "Central command would kill you if you implanted the disk into someone. Even if in a box. Especially in a box.") - return 0//fail + if(istype(tool, /obj/item/weapon/storage)) + var/obj/item/weapon/disk/nuclear/datdisk = locate() in tool + if(datdisk) + to_chat(user, "Central command would kill you if you implanted the disk into someone. Even if in a box. Especially in a box.") + return 0//fail if(istype(tool,/obj/item/organ)) to_chat(user, "This isn't the type of surgery for organ transplants!") From bc1eeb432b563d0afe20db1f832768f5b9aad608 Mon Sep 17 00:00:00 2001 From: pinatacolada Date: Wed, 4 May 2016 21:49:35 +0100 Subject: [PATCH 3/3] betterlocatorinos --- code/modules/surgery/implant.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm index 5eeba4ab50b..82cda80e494 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -175,11 +175,10 @@ to_chat(user, "Central command would kill you if you implanted the disk into someone.") return 0//fail - if(istype(tool, /obj/item/weapon/storage)) - var/obj/item/weapon/disk/nuclear/datdisk = locate() in tool - if(datdisk) - to_chat(user, "Central command would kill you if you implanted the disk into someone. Even if in a box. Especially in a box.") - return 0//fail + var/obj/item/weapon/disk/nuclear/datdisk = locate() in tool + if(datdisk) + to_chat(user, "Central command would kill you if you implanted the disk into someone. Even if in a box. Especially in a box.") + return 0//fail if(istype(tool,/obj/item/organ)) to_chat(user, "This isn't the type of surgery for organ transplants!")