From 49e512e5391707b1e1ad71181c9c170ec72acedc Mon Sep 17 00:00:00 2001 From: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> Date: Sat, 9 Sep 2023 04:43:49 -0400 Subject: [PATCH] Changes to EZ Autoinjectors (#4167) # About the pull request Removes skilled variant of emergency autoinjector and makes it non-refillable Removes EZ autoinjectors from marine pouches # Explain why it's good for the game Makes Emergency autoinjectors more limited Makes usage of autoinjectors require time, rather than being able to use while moving # Testing Photographs and Procedure
Screenshots & Videos I did not test it
# Changelog :cl: del: Removes emergency autoinjectors from squad medics del: Removes skillless variant of the emergency autoinjector, makes default variant skillless balance: Emergency autoinjectors cannot be refilled balance: Replaces skillless autoinjectors in marine pouches with standard autoinjectors /:cl: --- code/game/machinery/vending/vendor_types/medical.dm | 1 - .../vending/vendor_types/squad_prep/squad_medic.dm | 1 - .../items/reagent_containers/autoinjectors.dm | 10 +++------- code/game/objects/items/storage/pouch.dm | 12 ++++++------ code/modules/gear_presets/cmb.dm | 12 ++++++------ .../vehicles/interior/interactable/vendors.dm | 1 - 6 files changed, 15 insertions(+), 22 deletions(-) diff --git a/code/game/machinery/vending/vendor_types/medical.dm b/code/game/machinery/vending/vendor_types/medical.dm index 7f43f93cf8a4..7073dc383dcd 100644 --- a/code/game/machinery/vending/vendor_types/medical.dm +++ b/code/game/machinery/vending/vendor_types/medical.dm @@ -26,7 +26,6 @@ /obj/item/reagent_container/hypospray/autoinjector/oxycodone, /obj/item/reagent_container/hypospray/autoinjector/tramadol, /obj/item/reagent_container/hypospray/autoinjector/tricord, - /obj/item/reagent_container/hypospray/autoinjector/emergency, /obj/item/reagent_container/hypospray/autoinjector/skillless, /obj/item/reagent_container/hypospray/autoinjector/skillless/tramadol, diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm index d2ba88096131..65169a7591ae 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm @@ -29,7 +29,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list( list("Autoinjector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), - list("Autoinjector (Emergency)", 2, /obj/item/reagent_container/hypospray/autoinjector/emergency, null, VENDOR_ITEM_REGULAR), list("PILL BOTTLES", 0, null, null, null), list("Pill Bottle (Bicaridine)", 5, /obj/item/storage/pill_bottle/bicaridine, null, VENDOR_ITEM_RECOMMENDED), diff --git a/code/game/objects/items/reagent_containers/autoinjectors.dm b/code/game/objects/items/reagent_containers/autoinjectors.dm index 4c1e8af88ee5..46463e628c1d 100644 --- a/code/game/objects/items/reagent_containers/autoinjectors.dm +++ b/code/game/objects/items/reagent_containers/autoinjectors.dm @@ -191,8 +191,10 @@ /obj/item/reagent_container/hypospray/autoinjector/emergency name = "emergency autoinjector (CAUTION)" + desc = "An auto-injector loaded with a special cocktail of chemicals, to be used in life-threatening situations. Doesn't require any training to use." + icon_state = "emptyskill" + item_state = "emptyskill" chemname = "emergency" - desc = "An auto-injector loaded with a special cocktail of chemicals, to be used in life-threatening situations." amount_per_transfer_from_this = (REAGENTS_OVERDOSE-1)*2 + (MED_REAGENTS_OVERDOSE-1) volume = (REAGENTS_OVERDOSE-1)*2 + (MED_REAGENTS_OVERDOSE-1) mixed_chem = TRUE @@ -201,12 +203,6 @@ injectVOL = 70//limited-supply emergency injector with v.large injection of drugs. Variable sfx freq sometimes rolls too quiet. display_maptext = TRUE //see anaesthetic injector maptext_label = "!!" - -/obj/item/reagent_container/hypospray/autoinjector/emergency/skillless - name = "EZ emergency autoinjector (CAUTION)" - desc = "An auto-injector loaded with a special cocktail of chemicals, to be used in life-threatening situations. Doesn't require any training to use." - icon_state = "emptyskill" - item_state = "emptyskill" skilllock = SKILL_MEDICAL_DEFAULT /obj/item/reagent_container/hypospray/autoinjector/emergency/Initialize() diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index b31dcc9900f1..b43ce5c47479 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -205,13 +205,13 @@ desc = "Contains a painkiller autoinjector, first-aid autoinjector, some ointment, and some bandages." /obj/item/storage/pouch/firstaid/full/fill_preset_inventory() - new /obj/item/reagent_container/hypospray/autoinjector/bicaridine/skillless(src) - new /obj/item/reagent_container/hypospray/autoinjector/kelotane/skillless(src) - new /obj/item/reagent_container/hypospray/autoinjector/tramadol/skillless(src) - new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless(src) + new /obj/item/reagent_container/hypospray/autoinjector/bicaridine(src) + new /obj/item/reagent_container/hypospray/autoinjector/kelotane(src) + new /obj/item/reagent_container/hypospray/autoinjector/tramadol(src) + new /obj/item/reagent_container/hypospray/autoinjector/emergency(src) /obj/item/storage/pouch/firstaid/full/alternate/fill_preset_inventory() - new /obj/item/reagent_container/hypospray/autoinjector/tricord/skillless(src) + new /obj/item/reagent_container/hypospray/autoinjector/tricord(src) new /obj/item/stack/medical/splint(src) new /obj/item/stack/medical/ointment(src) new /obj/item/stack/medical/bruise_pack(src) @@ -231,7 +231,7 @@ new /obj/item/reagent_container/hypospray/autoinjector/bicaridine/skillless(src) new /obj/item/reagent_container/hypospray/autoinjector/kelotane/skillless(src) new /obj/item/reagent_container/hypospray/autoinjector/tramadol/skillless(src) - new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless(src) + new /obj/item/reagent_container/hypospray/autoinjector/emergency(src) new /obj/item/stack/medical/bruise_pack(src) diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm index c42b1bf868f0..9da7ba70ae5b 100644 --- a/code/modules/gear_presets/cmb.dm +++ b/code/modules/gear_presets/cmb.dm @@ -433,7 +433,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_gasmask, WEAR_IN_HELMET) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_HELMET) new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_HELMET) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light, WEAR_JACKET) @@ -481,7 +481,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor, WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/leader, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_gasmask, WEAR_IN_HELMET) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_HELMET) new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_HELMET) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/lead, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/leader, WEAR_JACKET) @@ -523,7 +523,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/rto, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_gasmask, WEAR_IN_HELMET) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_HELMET) new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_HELMET) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior, WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/tl, WEAR_L_EAR) @@ -571,7 +571,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/medic, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_gasmask, WEAR_IN_HELMET) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_HELMET) new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_HELMET) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/med, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light, WEAR_JACKET) @@ -587,8 +587,8 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/adrenaline, WEAR_IN_BELT) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/adrenaline, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_BELT) new_human.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, WEAR_IN_BELT) if(new_human.disabilities & NEARSIGHTED) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription, WEAR_EYES) diff --git a/code/modules/vehicles/interior/interactable/vendors.dm b/code/modules/vehicles/interior/interactable/vendors.dm index 96a6f6b49c0f..6d98bc85e42e 100644 --- a/code/modules/vehicles/interior/interactable/vendors.dm +++ b/code/modules/vehicles/interior/interactable/vendors.dm @@ -48,7 +48,6 @@ /obj/item/reagent_container/hypospray/autoinjector/oxycodone, /obj/item/reagent_container/hypospray/autoinjector/tramadol, /obj/item/reagent_container/hypospray/autoinjector/tricord, - /obj/item/reagent_container/hypospray/autoinjector/emergency, /obj/item/reagent_container/hypospray/autoinjector/skillless, /obj/item/reagent_container/hypospray/autoinjector/skillless/tramadol,