From addb95137c87f90ce4a2039a3820e0c7aada49ac Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Thu, 15 Nov 2012 21:02:04 +1000 Subject: [PATCH] made autoinjectors visible again, fixed medibot construction, fixed tajaran ears while lying down Signed-off-by: Cael_Aislinn --- code/game/machinery/bots/medbot.dm | 15 +++++++++------ .../reagents/reagent_containers/hypospray.dm | 2 +- icons/mob/human_face.dmi | Bin 25505 -> 25557 bytes 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index f66910d3615..f4f18f45534 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -512,13 +512,16 @@ else if(istype(src,/obj/item/weapon/storage/firstaid/adv)) A.skin = "adv" - A.loc = user - if (user.r_hand == S) - user.u_equip(S) - user.r_hand = A + //A.loc = user + if(src.loc == user) + if (user.r_hand == S) + user.u_equip(S) + user.equip_to_slot_if_possible(A, slot_r_hand) + else + user.u_equip(S) + user.equip_to_slot_if_possible(A, slot_l_hand) else - user.u_equip(S) - user.l_hand = A + A.loc = src.loc A.layer = 20 user << "You add the robot arm to the first aid kit" del(S) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 1ebf7fe9af5..48f044c6cc6 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -55,7 +55,7 @@ /obj/item/weapon/reagent_containers/hypospray/autoinjector name = "autoinjector" desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel." - icon_state = "autoinjector1" + icon_state = "autoinjector" item_state = "autoinjector" amount_per_transfer_from_this = 5 volume = 5 diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index ef13513ccf085d28fa937900d78e639df607d7bb..5423091f5be33b31856838a0e0e6dd2e9f8b579f 100644 GIT binary patch delta 4068 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 OK<36*jcN=$(EkG{($a