From 3193d599cb6c93c64670aee40dc6293d84c867e8 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Thu, 2 Aug 2018 23:39:15 -0400 Subject: [PATCH 1/2] Medical Hypospray --- code/game/machinery/vending.dm | 2 +- .../reagents/reagent_containers/hypospray.dm | 34 +++++++++++++++++- .../research/designs/autolathe_designs.dm | 8 +++++ sound/goonstation/items/hypo.ogg | Bin 0 -> 13267 bytes 4 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 sound/goonstation/items/hypo.ogg diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 7fe19960100..42eeafd338c 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1027,7 +1027,7 @@ req_access_txt = "5" products = list(/obj/item/reagent_containers/glass/bottle/charcoal = 4,/obj/item/reagent_containers/glass/bottle/morphine = 4,/obj/item/reagent_containers/glass/bottle/ether = 4,/obj/item/reagent_containers/glass/bottle/epinephrine = 4, /obj/item/reagent_containers/glass/bottle/toxin = 4,/obj/item/reagent_containers/syringe/antiviral = 6,/obj/item/reagent_containers/syringe/insulin = 4, - /obj/item/reagent_containers/syringe = 12,/obj/item/healthanalyzer = 5,/obj/item/healthupgrade = 5,/obj/item/reagent_containers/glass/beaker = 4, + /obj/item/reagent_containers/syringe = 12,/obj/item/healthanalyzer = 5,/obj/item/healthupgrade = 5,/obj/item/reagent_containers/glass/beaker = 4, /obj/item/reagent_containers/hypospray/safety = 2, /obj/item/reagent_containers/dropper = 2,/obj/item/stack/medical/bruise_pack/advanced = 3, /obj/item/stack/medical/ointment/advanced = 3, /obj/item/stack/medical/bruise_pack = 3,/obj/item/stack/medical/splint = 4, /obj/item/sensor_device = 2, /obj/item/reagent_containers/hypospray/autoinjector = 4, /obj/item/pinpointer/crew = 2) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index feee1bab8b4..771d627b421 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -13,7 +13,9 @@ possible_transfer_amounts = list(1,2,3,4,5,10,15,20,25,30) flags = OPENCONTAINER slot_flags = SLOT_BELT - var/ignore_flags = 0 + var/ignore_flags = FALSE + var/emagged = FALSE + var/safety_hypo = FALSE /obj/item/reagent_containers/hypospray/attack(mob/living/M, mob/user) if(!reagents.total_volume) @@ -31,8 +33,13 @@ for(var/datum/reagent/R in reagents.reagent_list) injected += R.name + var/primary_reagent_name = reagents.get_master_reagent_name() var/trans = reagents.trans_to(M, amount_per_transfer_from_this) + if(safety_hypo) + visible_message("[user] injects [M] with [trans] units of [primary_reagent_name].") + playsound(loc, 'sound/goonstation/items/hypo.ogg', 80, 0) + to_chat(user, "[trans] unit\s injected. [reagents.total_volume] unit\s remaining in [src].") var/contained = english_list(injected) @@ -41,6 +48,31 @@ return TRUE +/obj/item/reagent_containers/hypospray/on_reagent_change() + if(safety_hypo && !emagged) + var/found_forbidden_reagent = FALSE + for(var/datum/reagent/R in reagents.reagent_list) + if(!safe_chem_list.Find(R.id)) + reagents.del_reagent(R.id) + found_forbidden_reagent = TRUE + if(found_forbidden_reagent) + if(ismob(loc)) + to_chat(loc, "[src] identifies and removes a harmful substance.") + else + visible_message("[src] identifies and removes a harmful substance.") + +/obj/item/reagent_containers/hypospray/emag_act(mob/user) + if(safety_hypo && !emagged) + emagged = TRUE + ignore_flags = TRUE + to_chat(user, "You short out the safeties on [src].") + +/obj/item/reagent_containers/hypospray/safety + name = "medical hypospray" + desc = "A modified hypospray for quickly injecting safe medicinal chemicals." + icon_state = "combat_hypo" + safety_hypo = TRUE + /obj/item/reagent_containers/hypospray/CMO list_reagents = list("omnizine" = 30) diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 5cb51863851..bba85a5ff00 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -591,6 +591,14 @@ build_path = /obj/item/reagent_containers/syringe category = list("initial", "Medical") +/datum/design/safety_hypo + name = "Medical Hypospray" + id = "safetyhypo" + build_type = AUTOLATHE + materials = list(MAT_METAL = 500, MAT_GLASS = 500) + build_path = /obj/item/reagent_containers/hypospray/safety + category = list("initial", "Medical") + /datum/design/prox_sensor name = "Proximity Sensor" id = "prox_sensor" diff --git a/sound/goonstation/items/hypo.ogg b/sound/goonstation/items/hypo.ogg new file mode 100644 index 0000000000000000000000000000000000000000..8525a1b43c752f4289e2332dd892981e774dd3e3 GIT binary patch literal 13267 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 literal 0 HcmV?d00001 From 53fb8a1ab16047942c1dce330e658635fd9e94f9 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Fri, 3 Aug 2018 10:23:27 -0400 Subject: [PATCH 2/2] tweak --- code/game/gamemodes/steal_items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index 44e722abfca..d3f29734815 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -118,7 +118,7 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/aicard/C) typepath = /obj/item/documents //Any set of secret documents. Doesn't have to be NT's /datum/theft_objective/hypospray - name = "a hypospray" + name = "the Chief Medical Officer's hypospray" typepath = /obj/item/reagent_containers/hypospray/CMO protected_jobs = list("Chief Medical Officer")