From 1fb88e40e21c0133a2a1388f26f6c9e7421bb202 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 6 Aug 2019 20:54:14 -0400 Subject: [PATCH 1/6] Adds Prototype Hypospray - Can be researched and manufactured by Science - Identical to a mk1 hypospray, except does not instantly inject reagents at friendly intents Not terribly useful right now under the current meta, but probably will be useful down the road if/when syringes become disposable again. --- code/modules/reagents/reagent_containers/hypospray.dm | 9 ++++++++- code/modules/reagents/reagent_containers/hypospray_vr.dm | 5 +++++ code/modules/research/designs_vr.dm | 9 +++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 4b5949595b..6b7910fab3 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -44,7 +44,14 @@ to_chat(user, "You cannot inject a robotic limb.") return - if(!H.stat) + //VOREStation Add Start - Adds Prototype Hypo functionality + if(H != user && prototype) + to_chat(user, "You begin injecting [H] with \the [src].") + to_chat(H, " [user] is trying to inject you with \the [src]!") + if(!do_after(user, 30, H)) + return + //VOREstation Add End + else if(!H.stat && !prototype) //VOREStation Edit if(H != user) if(H.a_intent != I_HELP) to_chat(user, "[H] is resisting your attempt to inject them with \the [src].") diff --git a/code/modules/reagents/reagent_containers/hypospray_vr.dm b/code/modules/reagents/reagent_containers/hypospray_vr.dm index 9f52d9f699..ac99fbeb86 100644 --- a/code/modules/reagents/reagent_containers/hypospray_vr.dm +++ b/code/modules/reagents/reagent_containers/hypospray_vr.dm @@ -22,3 +22,8 @@ ..() for (var/i = 1 to 7) new /obj/item/weapon/reagent_containers/hypospray/autoinjector/miner(src) + +/obj/item/weapon/reagent_containers/hypospray/science + name = "prototype hypospray" + desc = "This reproduction hypospray is nearly a perfect replica of the early model DeForest hyposprays, sharing many of the same features. However, there are additional safety measures installed to prevent unwanted injections." + prototype = 1 diff --git a/code/modules/research/designs_vr.dm b/code/modules/research/designs_vr.dm index 518c77a504..958d359ab1 100644 --- a/code/modules/research/designs_vr.dm +++ b/code/modules/research/designs_vr.dm @@ -117,6 +117,15 @@ build_path = /obj/item/device/nifrepairer sort_string = "HABBE" //Changed String from HABBD to HABBE +/datum/design/item/medical/protohypospray + name = "prototype hypospray" + desc = "This prototype hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients." + id = "protohypospray" + req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_POWER = 2, TECH_BIO = 4, TECH_ILLEGAL = 2) + materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 1500, "silver" = 2000, "gold" = 1500, "uranium" = 1000) + build_path = /obj/item/weapon/reagent_containers/hypospray/science + sort_string = "MBBAH" + // Resleeving Circuitboards /datum/design/circuit/transhuman_clonepod From f699825119aa889f6f2308bb1d449d4e71f084ba Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 6 Aug 2019 20:58:25 -0400 Subject: [PATCH 2/6] Forgot a Var --- code/modules/reagents/reagent_containers/hypospray.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 6b7910fab3..af69556247 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -18,6 +18,7 @@ var/filled = 0 var/list/filled_reagents = list() var/hyposound // What sound do we play on use? + var/prototype = 0 //VOREStation Add - Prototype Hypospray /obj/item/weapon/reagent_containers/hypospray/Initialize() . = ..() From 03976d3dd3f01ee1bdbb3784ed22192fb2f7aacf Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 6 Aug 2019 21:03:35 -0400 Subject: [PATCH 3/6] Moves var --- code/modules/reagents/reagent_containers/hypospray.dm | 1 - code/modules/reagents/reagent_containers/hypospray_vr.dm | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index af69556247..6b7910fab3 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -18,7 +18,6 @@ var/filled = 0 var/list/filled_reagents = list() var/hyposound // What sound do we play on use? - var/prototype = 0 //VOREStation Add - Prototype Hypospray /obj/item/weapon/reagent_containers/hypospray/Initialize() . = ..() diff --git a/code/modules/reagents/reagent_containers/hypospray_vr.dm b/code/modules/reagents/reagent_containers/hypospray_vr.dm index ac99fbeb86..d0777e3216 100644 --- a/code/modules/reagents/reagent_containers/hypospray_vr.dm +++ b/code/modules/reagents/reagent_containers/hypospray_vr.dm @@ -23,6 +23,9 @@ for (var/i = 1 to 7) new /obj/item/weapon/reagent_containers/hypospray/autoinjector/miner(src) +/obj/item/weapon/reagent_containers/hypospray + var/prototype = 0 + /obj/item/weapon/reagent_containers/hypospray/science name = "prototype hypospray" desc = "This reproduction hypospray is nearly a perfect replica of the early model DeForest hyposprays, sharing many of the same features. However, there are additional safety measures installed to prevent unwanted injections." From b5824871ed6e1fea1335c5ab3d093b4ea7db7974 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 6 Aug 2019 21:05:51 -0400 Subject: [PATCH 4/6] Removes unnecessary check --- code/modules/reagents/reagent_containers/hypospray.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 6b7910fab3..253b0b6d80 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -51,7 +51,7 @@ if(!do_after(user, 30, H)) return //VOREstation Add End - else if(!H.stat && !prototype) //VOREStation Edit + else if(!H.stat) if(H != user) if(H.a_intent != I_HELP) to_chat(user, "[H] is resisting your attempt to inject them with \the [src].") From d7406088b52f81fbf72113429fddcc733b65687b Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 6 Aug 2019 21:07:40 -0400 Subject: [PATCH 5/6] Test --- code/modules/reagents/reagent_containers/hypospray.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 253b0b6d80..30b6c759d2 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -51,7 +51,7 @@ if(!do_after(user, 30, H)) return //VOREstation Add End - else if(!H.stat) + if(!H.stat) if(H != user) if(H.a_intent != I_HELP) to_chat(user, "[H] is resisting your attempt to inject them with \the [src].") From 8e321b372522efa5437b8189fa016b0d5a20f132 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Tue, 6 Aug 2019 22:10:50 -0400 Subject: [PATCH 6/6] Update hypospray.dm --- code/modules/reagents/reagent_containers/hypospray.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 30b6c759d2..6b7910fab3 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -51,7 +51,7 @@ if(!do_after(user, 30, H)) return //VOREstation Add End - if(!H.stat) + else if(!H.stat && !prototype) //VOREStation Edit if(H != user) if(H.a_intent != I_HELP) to_chat(user, "[H] is resisting your attempt to inject them with \the [src].")