From d803a38bdffd3caeb95865e0fa6d95646720a005 Mon Sep 17 00:00:00 2001 From: SatinIsle <98125273+SatinIsle@users.noreply.github.com> Date: Tue, 22 Apr 2025 01:02:48 +0100 Subject: [PATCH] AllergyPen and autoinjector costs (#17545) * AllergyPen and autoinjector costs Added a new AllergyPen autoinjector, available via the loadout (1 point) and medical vendors. Basically the same as the inaprovaline injectors that everyone starts with anyway, but with a new sprite and text to theme them around characters with allergies. Reduced the cost of large autoinjectors in the injector maker from 1500 to 300. The small ones cost 30 already, and the large ones are definitely worth way more but getting more than one per sheet of plastic would be really nice! Hopefully will make the injector maker more used. * Update injector_maker.dm --- .../loadout/loadout_utility.dm | 5 +++++ code/modules/economy/vending_machines.dm | 1 + .../reagents/machinery/injector_maker.dm | 6 +++--- .../reagents/reagent_containers/hypospray.dm | 6 ++++++ icons/obj/syringe.dmi | Bin 4424 -> 4796 bytes 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index 44157000d9..09e8109104 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -321,3 +321,8 @@ modular computers display_name = "blood bag (Randomized)" path = /obj/item/reagent_containers/blood/random_bloodsucker cost = 1 + +/datum/gear/utility/allergypen //For people with allergies + display_name = "AllergyPen" + path = /obj/item/reagent_containers/hypospray/autoinjector/allergen + cost = 1 diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index 0886eacd53..c4bbf13b07 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -457,6 +457,7 @@ /obj/item/reagent_containers/glass/bottle/toxin = 4, /obj/item/reagent_containers/syringe/antiviral = 4, /obj/item/reagent_containers/syringe = 12, + /obj/item/reagent_containers/hypospray/autoinjector/allergen = 6, /obj/item/healthanalyzer = 5, /obj/item/reagent_containers/glass/beaker = 4, /obj/item/reagent_containers/dropper = 2, diff --git a/code/modules/reagents/machinery/injector_maker.dm b/code/modules/reagents/machinery/injector_maker.dm index 6859ed89d3..c0e989f5bf 100644 --- a/code/modules/reagents/machinery/injector_maker.dm +++ b/code/modules/reagents/machinery/injector_maker.dm @@ -25,9 +25,9 @@ var/count_plastic = 0 //Given in "units", not sheets var/value_plastic = 2000 //1 sheet translates to 2000 units - var/cost_plastic_small = 30 - var/cost_plastic_large = 1500 - var/capacity_plastic = 60000 // cost_plastic_large * 40 + var/cost_plastic_small = 25 + var/cost_plastic_large = 250 + var/capacity_plastic = 60000 // 30 sheets of plastic /obj/machinery/injector_maker/Initialize(mapload) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 41d6ebc478..84fb495580 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -211,6 +211,12 @@ desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel. This one excels at treating genetic damage." filled_reagents = list(REAGENT_ID_REZADONE = 5) +/obj/item/reagent_containers/hypospray/autoinjector/allergen + name = "AllergyPen" + desc = "An autoinjector designed for use during an allergic reaction or anaphylaxis. The user should immediately seek medical support after use, for additional monitoring and aid." + icon_state = "allergy" + item_state = "allergy" + // These have a 15u capacity, somewhat higher tech level, and generally more useful chems, but are otherwise the same as the regular autoinjectors. /obj/item/reagent_containers/hypospray/autoinjector/biginjector name = "empty hypo" diff --git a/icons/obj/syringe.dmi b/icons/obj/syringe.dmi index 00e4c82485f8ef3a2abb402835e83456732d7f00..39f939eaed9e9713e1c4631ae404f20df0db0fbc 100644 GIT binary patch literal 4796 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 Yw%{^c&YRVtpGpBH2Il%zSKaRa3sk8>`v3p{ literal 4424 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