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 00e4c82485..39f939eaed 100644 Binary files a/icons/obj/syringe.dmi and b/icons/obj/syringe.dmi differ