From 4d239d27a3e0ca709d5b0db567a6f196bec9787b Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Sun, 18 Sep 2016 19:37:20 -0500 Subject: [PATCH] Fixes not being able to put things in medkits. --- code/modules/mob/living/bot/medbot.dm | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm index 4186c047da..fffe5879fa 100644 --- a/code/modules/mob/living/bot/medbot.dm +++ b/code/modules/mob/living/bot/medbot.dm @@ -263,29 +263,6 @@ /* Construction */ -/obj/item/weapon/storage/firstaid/attackby(var/obj/item/robot_parts/S, mob/user as mob) - if ((!istype(S, /obj/item/robot_parts/l_arm)) && (!istype(S, /obj/item/robot_parts/r_arm))) - ..() - return - - if(contents.len >= 1) - user << "You need to empty [src] out first." - return - - var/obj/item/weapon/firstaid_arm_assembly/A = new /obj/item/weapon/firstaid_arm_assembly - if(istype(src, /obj/item/weapon/storage/firstaid/fire)) - A.skin = "ointment" - else if(istype(src, /obj/item/weapon/storage/firstaid/toxin)) - A.skin = "tox" - else if(istype(src, /obj/item/weapon/storage/firstaid/o2)) - A.skin = "o2" - - qdel(S) - user.put_in_hands(A) - user << "You add the robot arm to the first aid kit." - user.drop_from_inventory(src) - qdel(src) - /obj/item/weapon/storage/firstaid/attackby(var/obj/item/robot_parts/S, mob/user as mob) if ((!istype(S, /obj/item/robot_parts/l_arm)) && (!istype(S, /obj/item/robot_parts/r_arm))) ..() @@ -310,7 +287,7 @@ qdel(src) /obj/item/weapon/storage/firstaid/attackby(var/obj/item/organ/external/S, mob/user as mob) - if (!istype(S, /obj/item/organ/external/arm) && !(S.robotic == ORGAN_ROBOT)) + if (!istype(S, /obj/item/organ/external/arm) || !(S.robotic == ORGAN_ROBOT)) ..() return