From 2522d5e7f1877fc9b07f624a2a3ae6e1211162a0 Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 11 Nov 2012 11:45:24 +0100 Subject: [PATCH] Fixed up autoinjectors and added health analyzer to regular first aid. --- .../objects/items/weapons/storage/firstaid.dm | 2 +- .../reagents/reagent_containers/hypospray.dm | 2 +- icons/obj/syringe.dmi | Bin 2931 -> 3218 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 2f2691ebb5f..750dfaee2ee 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -28,13 +28,13 @@ /obj/item/weapon/storage/firstaid/regular/New() ..() if (empty) return + new /obj/item/device/healthanalyzer( src ) new /obj/item/weapon/reagent_containers/hypospray/autoinjector( src ) new /obj/item/stack/medical/bruise_pack(src) new /obj/item/stack/medical/bruise_pack(src) new /obj/item/stack/medical/bruise_pack(src) new /obj/item/stack/medical/ointment(src) new /obj/item/stack/medical/ointment(src) - new /obj/item/stack/medical/ointment(src) return /obj/item/weapon/storage/firstaid/toxin/New() diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 48f044c6cc6..1ebf7fe9af5 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 = "autoinjector" + icon_state = "autoinjector1" item_state = "autoinjector" amount_per_transfer_from_this = 5 volume = 5 diff --git a/icons/obj/syringe.dmi b/icons/obj/syringe.dmi index 3376bd0db714d2e4ebd0a9cebf45ea6c3eeb2ead..9ce4e51c5abd638ab35ade4a9fceff175dfeedfa 100644 GIT binary patch literal 3218 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 literal 2931 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