From 3693e6d6204333024402693be4e960a359a4f2ae Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Mon, 18 Sep 2023 02:15:43 +0200 Subject: [PATCH] Epi autoinjectors are now a subtype of autoinjectors, the basetype is now empty (#22261) * removing the useless feature Yes this removes it from all autoinjectors No I am not going to publish this * WOOOOO REGEX WORKS * Almost forgot the entire reason of this PR * Oversight * Update code/modules/reagents/reagent_containers/hypospray.dm Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com> * Update code/modules/reagents/reagent_containers/hypospray.dm Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com> * Lewc review * Update code/game/objects/items/weapons/storage/bags.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --- .../machinery/vendors/contraband_vendors.dm | 9 +++++++-- .../machinery/vendors/departmental_vendors.dm | 2 +- code/game/machinery/vendors/generic_vendors.dm | 5 ++++- .../game/objects/items/weapons/storage/bags.dm | 5 ++++- .../game/objects/items/weapons/storage/belt.dm | 2 +- .../objects/items/weapons/storage/boxes.dm | 18 +++++++++--------- .../objects/items/weapons/storage/firstaid.dm | 10 +++++----- .../reagents/reagent_containers/hypospray.dm | 14 +++++++++----- code/modules/response_team/ert_outfits.dm | 2 +- 9 files changed, 41 insertions(+), 26 deletions(-) diff --git a/code/game/machinery/vendors/contraband_vendors.dm b/code/game/machinery/vendors/contraband_vendors.dm index 3db3e373c49..8ecdeca5e05 100644 --- a/code/game/machinery/vendors/contraband_vendors.dm +++ b/code/game/machinery/vendors/contraband_vendors.dm @@ -7,8 +7,13 @@ icon_deny = "syndimed_deny" ads_list = list("Go end some lives!", "The best stuff for your ship.", "Only the finest tools.", "Natural chemicals!", "This stuff saves lives.", "Don't you want some?", "Ping!") req_access_txt = "150" - products = list(/obj/item/stack/medical/bruise_pack = 2,/obj/item/stack/medical/ointment = 2,/obj/item/reagent_containers/hypospray/autoinjector = 4,/obj/item/healthanalyzer = 1) - contraband = list(/obj/item/reagent_containers/syringe/charcoal = 4,/obj/item/reagent_containers/syringe/antiviral = 4,/obj/item/reagent_containers/food/pill/tox = 1) + products = list(/obj/item/stack/medical/bruise_pack = 2, + /obj/item/stack/medical/ointment = 2, + /obj/item/reagent_containers/hypospray/autoinjector/epinephrine = 4, + /obj/item/healthanalyzer = 1) + contraband = list(/obj/item/reagent_containers/syringe/charcoal = 4, + /obj/item/reagent_containers/syringe/antiviral = 4, + /obj/item/reagent_containers/food/pill/tox = 1) /obj/machinery/economy/vending/syndicigs name = "\improper Suspicious Cigarette Machine" diff --git a/code/game/machinery/vendors/departmental_vendors.dm b/code/game/machinery/vendors/departmental_vendors.dm index 21f961f2b8b..ad8a0581d40 100644 --- a/code/game/machinery/vendors/departmental_vendors.dm +++ b/code/game/machinery/vendors/departmental_vendors.dm @@ -159,7 +159,7 @@ ads_list = list("Go save some lives!","The best stuff for your medbay.","Only the finest tools.","Natural chemicals!","This stuff saves lives.","Don't you want some?","Ping!") req_access_txt = "5" category = VENDOR_TYPE_DEPARTMENTAL - products = list(/obj/item/reagent_containers/hypospray/autoinjector = 4, + products = list(/obj/item/reagent_containers/hypospray/autoinjector/epinephrine = 4, /obj/item/stack/medical/bruise_pack/advanced = 2, /obj/item/stack/medical/ointment/advanced = 2, /obj/item/reagent_containers/food/pill/patch/styptic = 3, diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm index 8fbe9dfee7a..05a162c015d 100644 --- a/code/game/machinery/vendors/generic_vendors.dm +++ b/code/game/machinery/vendors/generic_vendors.dm @@ -981,7 +981,10 @@ category = VENDOR_TYPE_DEPARTMENTAL density = FALSE //It is wall-mounted, and thus, not dense. --Superxpdude tiltable = FALSE - products = list(/obj/item/stack/medical/bruise_pack = 2, /obj/item/stack/medical/ointment = 2, /obj/item/reagent_containers/hypospray/autoinjector = 4, /obj/item/healthanalyzer = 1) + products = list(/obj/item/stack/medical/bruise_pack = 2, + /obj/item/stack/medical/ointment = 2, + /obj/item/reagent_containers/hypospray/autoinjector/epinephrine = 4, + /obj/item/healthanalyzer = 1) contraband = list(/obj/item/reagent_containers/syringe/charcoal = 4, /obj/item/reagent_containers/syringe/antiviral = 4, /obj/item/reagent_containers/food/pill/tox = 1) armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 0, rad = 0, fire = 100, acid = 70) //this shouldn't be priced diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 705908d9a78..5ace765ad39 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -531,5 +531,8 @@ storage_slots = 25 max_combined_w_class = 200 w_class = WEIGHT_CLASS_TINY - can_hold = list(/obj/item/slime_extract,/obj/item/reagent_containers/food/snacks/monkeycube,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/iv_bag,/obj/item/reagent_containers/hypospray/autoinjector) + can_hold = list(/obj/item/slime_extract, /obj/item/reagent_containers/food/snacks/monkeycube, + /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/glass/beaker, + /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/iv_bag, + /obj/item/reagent_containers/hypospray/autoinjector/epinephrine) resistance_flags = FLAMMABLE diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index c72b51df345..eae691cece0 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -183,7 +183,7 @@ /obj/item/flashlight/pen, /obj/item/clothing/mask/surgical, /obj/item/clothing/gloves/color/latex, - /obj/item/reagent_containers/hypospray/autoinjector, + /obj/item/reagent_containers/hypospray/autoinjector/epinephrine, /obj/item/reagent_containers/hypospray/CMO, /obj/item/reagent_containers/hypospray/safety, /obj/item/sensor_device, diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 54f7c7db72a..b21f989f5fa 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -45,7 +45,7 @@ /obj/item/storage/box/survival/populate_contents() new /obj/item/clothing/mask/breath(src) new /obj/item/tank/internals/emergency_oxygen(src) - new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src) new /obj/item/flashlight/flare/glowstick/emergency(src) /obj/item/storage/box/survival_vox @@ -54,7 +54,7 @@ /obj/item/storage/box/survival_vox/populate_contents() new /obj/item/clothing/mask/breath/vox(src) new /obj/item/tank/internals/emergency_oxygen/nitrogen(src) - new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src) new /obj/item/flashlight/flare/glowstick/emergency(src) /obj/item/storage/box/survival_plasmaman @@ -63,7 +63,7 @@ /obj/item/storage/box/survival_plasmaman/populate_contents() new /obj/item/clothing/mask/breath(src) new /obj/item/tank/internals/emergency_oxygen/plasma(src) - new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src) new /obj/item/flashlight/flare/glowstick/emergency(src) /obj/item/storage/box/engineer @@ -72,7 +72,7 @@ /obj/item/storage/box/engineer/populate_contents() new /obj/item/clothing/mask/breath(src) new /obj/item/tank/internals/emergency_oxygen/engi(src) - new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src) new /obj/item/flashlight/flare/glowstick/emergency(src) /obj/item/storage/box/survival_mining @@ -81,7 +81,7 @@ /obj/item/storage/box/survival_mining/populate_contents() new /obj/item/clothing/mask/gas/explorer(src) new /obj/item/tank/internals/emergency_oxygen/engi(src) - new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src) new /obj/item/flashlight/flare/glowstick/emergency(src) /obj/item/storage/box/survival_syndi @@ -91,7 +91,7 @@ new /obj/item/clothing/mask/gas/syndicate(src) new /obj/item/tank/internals/emergency_oxygen/engi/syndi(src) new /obj/item/crowbar/small(src) - new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src) new /obj/item/reagent_containers/food/pill/initropidril(src) new /obj/item/flashlight/flare/glowstick/red(src) @@ -656,7 +656,7 @@ /obj/item/storage/box/autoinjectors/populate_contents() for(var/I in 1 to storage_slots) - new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src) /obj/item/storage/box/autoinjector/utility name = "autoinjector kit" @@ -834,7 +834,7 @@ new /obj/item/kitchen/knife/combat(src) new /obj/item/radio/centcom(src) new /obj/item/reagent_containers/food/pill/patch/synthflesh(src) - new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src) /obj/item/storage/box/deathsquad name = "boxed death kit" @@ -857,7 +857,7 @@ /obj/item/storage/box/soviet/populate_contents() new /obj/item/clothing/mask/breath(src) new /obj/item/tank/internals/emergency_oxygen/engi(src) - new /obj/item/reagent_containers/hypospray/autoinjector + new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine new /obj/item/flashlight/flare(src) new /obj/item/crowbar/red(src) new /obj/item/kitchen/knife/combat(src) diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 01c4d946ef7..23cb103c9f6 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -40,7 +40,7 @@ new /obj/item/reagent_containers/applicator/burn(src) new /obj/item/reagent_containers/food/pill/patch/silver_sulf/small(src) new /obj/item/healthanalyzer(src) - new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src) new /obj/item/reagent_containers/food/pill/salicylic(src) /obj/item/storage/firstaid/fire/empty/populate_contents() @@ -57,7 +57,7 @@ new /obj/item/reagent_containers/food/pill/patch/silver_sulf(src) new /obj/item/reagent_containers/food/pill/patch/silver_sulf(src) new /obj/item/healthanalyzer(src) - new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src) /obj/item/storage/firstaid/regular/empty/populate_contents() return @@ -73,7 +73,7 @@ new /obj/item/reagent_containers/food/pill/patch/silver_sulf(src) new /obj/item/reagent_containers/food/pill/salicylic(src) new /obj/item/healthanalyzer/advanced(src) - new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src) /obj/item/storage/firstaid/toxin name = "toxin first aid kit" @@ -127,7 +127,7 @@ new /obj/item/reagent_containers/applicator/brute(src) new /obj/item/reagent_containers/food/pill/patch/styptic/small(src) new /obj/item/healthanalyzer(src) - new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src) new /obj/item/stack/medical/bruise_pack(src) /obj/item/storage/firstaid/brute/empty/populate_contents() @@ -146,7 +146,7 @@ new /obj/item/stack/medical/bruise_pack/advanced(src) new /obj/item/stack/medical/ointment/advanced(src) new /obj/item/stack/medical/ointment/advanced(src) - new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src) new /obj/item/healthanalyzer(src) /obj/item/storage/firstaid/adv/empty/populate_contents() diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index e81c38b7c83..13afce6c879 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -116,9 +116,9 @@ volume = 100 list_reagents = list("nanites" = 100) -/obj/item/reagent_containers/hypospray/autoinjector - name = "emergency autoinjector" - desc = "A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge." +/obj/item/reagent_containers/hypospray/autoinjector // This is an empty variant + name = "empty autoinjector" + desc = "A rapid and safe way to inject chemicals into humanoids. This one is empty." icon_state = "autoinjector" item_state = "autoinjector" belt_icon = "autoinjector" @@ -128,7 +128,6 @@ ignore_flags = TRUE //so you can medipen through hardsuits container_type = DRAWABLE flags = null - list_reagents = list("epinephrine" = 10) /obj/item/reagent_containers/hypospray/autoinjector/attack(mob/M, mob/user) if(!reagents.total_volume) @@ -156,6 +155,11 @@ else . += "It is spent." +/obj/item/reagent_containers/hypospray/autoinjector/epinephrine + name = "emergency autoinjector" + desc = "A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge." + list_reagents = list("epinephrine" = 10) + /obj/item/reagent_containers/hypospray/autoinjector/teporone //basilisks name = "teporone autoinjector" desc = "A rapid way to regulate your body's temperature in the event of a hardsuit malfunction." @@ -184,7 +188,7 @@ icon_state = "survpen" volume = 42 amount_per_transfer_from_this = 42 - list_reagents = list("salbutamol" = 10, "teporone" = 15, "epinephrine" = 10, "lavaland_extract" = 2, "weak_omnizine" = 5) //Short burst of healing, followed by minor healing from the saline + list_reagents = list("salbutamol" = 10, "teporone" = 15, "epinephrine" = 10, "lavaland_extract" = 2, "weak_omnizine" = 5) /obj/item/reagent_containers/hypospray/autoinjector/emergency_nuclear name = "emergency stabilization medipen" diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm index 4f760df64cc..fe1afd74ccd 100644 --- a/code/modules/response_team/ert_outfits.dm +++ b/code/modules/response_team/ert_outfits.dm @@ -378,7 +378,7 @@ belt = /obj/item/storage/belt/medical //No need for belt defib, they got the built in ones. This gives them some extra storage. l_pocket = /obj/item/reagent_containers/hypospray/combat/nanites - r_pocket = /obj/item/reagent_containers/hypospray/autoinjector + r_pocket = /obj/item/reagent_containers/hypospray/autoinjector/epinephrine backpack_contents = list(