From 747cf2044bcd4d706940fd4b0b0404d8d0c146f5 Mon Sep 17 00:00:00 2001 From: Superhats Date: Sun, 26 Aug 2018 14:53:51 +0200 Subject: [PATCH] Hyposprays ! --- code/game/response_team.dm | 4 +++- code/modules/reagents/reagent_containers/hypospray.dm | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/game/response_team.dm b/code/game/response_team.dm index 20b697b5861..f0373353657 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -599,11 +599,12 @@ var/ert_request_answered = 0 shoes = /obj/item/clothing/shoes/white gloves = /obj/item/clothing/gloves/color/latex suit = /obj/item/clothing/suit/armor/vest/ert/medical + suit_store = /obj/item/gun/energy/gun/mini glasses = /obj/item/clothing/glasses/hud/health belt = /obj/item/storage/belt/medical/surgery/loaded - l_pocket = /obj/item/gun/energy/gun/mini + l_pocket = /obj/item/reagent_containers/hypospray/safety/ert r_pocket = /obj/item/melee/classic_baton/telescopic backpack_contents = list( @@ -629,6 +630,7 @@ var/ert_request_answered = 0 ) belt = /obj/item/defibrillator/compact/loaded + l_pocket = /obj/item/reagent_containers/hypospray/safety/ert r_pocket = /obj/item/melee/classic_baton/telescopic backpack_contents = list( diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 771d627b421..e4ea28e445e 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -73,6 +73,9 @@ icon_state = "combat_hypo" safety_hypo = TRUE +/obj/item/reagent_containers/hypospray/safety/ert + list_reagents = list("omnizine" = 30) + /obj/item/reagent_containers/hypospray/CMO list_reagents = list("omnizine" = 30) @@ -158,4 +161,4 @@ /obj/item/reagent_containers/hypospray/autoinjector/nanocalcium/attack(mob/living/M, mob/user) if(..()) - playsound(loc, 'sound/weapons/smg_empty_alarm.ogg', 20, 1) \ No newline at end of file + playsound(loc, 'sound/weapons/smg_empty_alarm.ogg', 20, 1)