"), occ["bicaridine_amount"])
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index bd765e000f4..e8271c5b5e1 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -193,10 +193,10 @@
occupant.adjustCloneLoss(-2 * heal_rate)
//So clones don't die of oxyloss in a running pod.
- if(occupant.reagents.get_reagent_amount(/datum/reagent/norepinephrine) < 30)
- occupant.reagents.add_reagent(/datum/reagent/norepinephrine, 60)
+ if(occupant.reagents.get_reagent_amount(/datum/reagent/inaprovaline) < 30)
+ occupant.reagents.add_reagent(/datum/reagent/inaprovaline, 60)
occupant.Sleeping(30)
- //Also heal some oxyloss ourselves because norepinephrine is so bad at preventing it!!
+ //Also heal some oxyloss ourselves because inaprovaline is so bad at preventing it!!
occupant.adjustOxyLoss(-4)
use_power(7500) //This might need tweaking.
diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm
index 53a362f1539..d2b8fa51b3b 100644
--- a/code/game/machinery/vending_types.dm
+++ b/code/game/machinery/vending_types.dm
@@ -393,7 +393,7 @@
vend_id = "meds"
products = list(
/obj/item/reagent_containers/glass/bottle/antitoxin = 4,
- /obj/item/reagent_containers/glass/bottle/norepinephrine = 4,
+ /obj/item/reagent_containers/glass/bottle/inaprovaline = 4,
/obj/item/reagent_containers/glass/bottle/toxin = 4,
/obj/item/reagent_containers/glass/bottle/coughsyrup = 4,
/obj/item/reagent_containers/syringe = 12,
@@ -462,7 +462,7 @@
products = list(
/obj/item/stack/medical/bruise_pack = 2,
/obj/item/stack/medical/ointment = 2,
- /obj/item/reagent_containers/hypospray/autoinjector/norepinephrine = 4,
+ /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 4,
/obj/item/device/healthanalyzer = 1,
/obj/item/device/breath_analyzer = 1
)
@@ -487,7 +487,7 @@
density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude
vend_id = "meds"
products = list(
- /obj/item/reagent_containers/hypospray/autoinjector/norepinephrine = 5,
+ /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 5,
/obj/item/reagent_containers/syringe/dylovene = 3,
/obj/item/stack/medical/bruise_pack = 3,
/obj/item/stack/medical/ointment = 3,
diff --git a/code/game/modifiers/modifiers_chem.dm b/code/game/modifiers/modifiers_chem.dm
index 9f66b9f55fd..af010976819 100644
--- a/code/game/modifiers/modifiers_chem.dm
+++ b/code/game/modifiers/modifiers_chem.dm
@@ -31,11 +31,11 @@
-//Adrenaline, granted by synaptizine and norepinephrine, with different strengths for each
+//Adrenaline, granted by synaptizine and inaprovaline, with different strengths for each
//Allows the body to endure more, increasing speed a little, stamina a lot, stamina regen a lot,
//and reducing sprint costs
-//Synaptizine applies it at strength 1, norepinephrine applies it at strength 0.6
-//Is applied using strengthen override mode, so synaptizine will replace norepinephrine if both are present
+//Synaptizine applies it at strength 1, inaprovaline applies it at strength 0.6
+//Is applied using strengthen override mode, so synaptizine will replace inaprovaline if both are present
/datum/modifier/adrenaline
var/speed_added = 0
var/stamina_added = 0
diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm
index 469403ab8d7..429191a7c0c 100644
--- a/code/game/objects/items/weapons/chewables.dm
+++ b/code/game/objects/items/weapons/chewables.dm
@@ -237,7 +237,7 @@ obj/item/clothing/mask/chewable/Destroy()
. = ..()
var/datum/reagent/payload = pick(list(
/datum/reagent/dylovene,
- /datum/reagent/norepinephrine))
+ /datum/reagent/inaprovaline))
reagents.add_reagent(payload, 15)
color = reagents.get_color()
desc = "[desc] This one is labeled '[initial(payload.name)]'."
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index 3a8d649b35a..66d03ce72ef 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -35,7 +35,7 @@
/obj/item/reagent_containers/pill/kelotane = 3,
/obj/item/stack/medical/ointment = 2,
/obj/item/device/healthanalyzer = 1,
- /obj/item/reagent_containers/hypospray/autoinjector/norepinephrine = 1
+ /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 1
)
/obj/item/storage/firstaid/fire/fill()
@@ -48,7 +48,7 @@
/obj/item/stack/medical/bruise_pack = 3,
/obj/item/stack/medical/ointment = 2,
/obj/item/device/healthanalyzer = 1,
- /obj/item/reagent_containers/hypospray/autoinjector/norepinephrine = 1
+ /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 1
)
/obj/item/storage/firstaid/toxin
@@ -73,7 +73,7 @@
item_state = "o2"
starts_with = list(
/obj/item/reagent_containers/inhaler/dexalin = 4,
- /obj/item/reagent_containers/hypospray/autoinjector/norepinephrine = 2,
+ /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 2,
/obj/item/device/breath_analyzer = 1
)
@@ -83,7 +83,7 @@
icon_state = "advfirstaid"
item_state = "advfirstaid"
starts_with = list(
- /obj/item/reagent_containers/hypospray/autoinjector/norepinephrine = 1,
+ /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 1,
/obj/item/stack/medical/advanced/bruise_pack = 3,
/obj/item/stack/medical/advanced/ointment = 2,
/obj/item/stack/medical/splint = 1
@@ -207,10 +207,10 @@
desc = "Contains pills used to treat toxic substances in the blood."
starts_with = list(/obj/item/reagent_containers/pill/dylovene = 7)
-/obj/item/storage/pill_bottle/norepinephrine
- name = "bottle of Norepinephrine pills"
+/obj/item/storage/pill_bottle/inaprovaline
+ name = "bottle of Inaprovaline pills"
desc = "Contains pills used to stabilize patients."
- starts_with = list(/obj/item/reagent_containers/pill/norepinephrine = 7)
+ starts_with = list(/obj/item/reagent_containers/pill/inaprovaline = 7)
/obj/item/storage/pill_bottle/kelotane
name = "bottle of kelotane pills"
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index aa7c3db9602..f80726ef214 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -219,11 +219,11 @@
/obj/item/storage/box/syndie_kit/stimulants
name = "box of stimulants"
- desc = "Comes with a combat inhaler, a large cartridge of hyperzine, a large cartridge of norepinephrine, and a large empty cartridge."
+ desc = "Comes with a combat inhaler, a large cartridge of hyperzine, a large cartridge of inaprovaline, and a large empty cartridge."
starts_with = list(
/obj/item/personal_inhaler/combat = 1,
/obj/item/reagent_containers/personal_inhaler_cartridge/large/hyperzine = 1,
- /obj/item/reagent_containers/personal_inhaler_cartridge/large/norepinephrine = 1,
+ /obj/item/reagent_containers/personal_inhaler_cartridge/large/inaprovaline = 1,
/obj/item/reagent_containers/personal_inhaler_cartridge/large = 1,
)
diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm
index da08ee2c0ee..8527521dd0e 100644
--- a/code/game/objects/random/random.dm
+++ b/code/game/objects/random/random.dm
@@ -154,7 +154,7 @@
/obj/item/storage/pill_bottle/antitox = 2,
/obj/item/storage/pill_bottle/tramadol = 2,
/obj/item/reagent_containers/syringe/dylovene = 2,
- /obj/item/reagent_containers/syringe/norepinephrine = 2,
+ /obj/item/reagent_containers/syringe/inaprovaline = 2,
/obj/item/stack/nanopaste = 1
)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index cbfaea9eed0..8c61022d4e0 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -17,8 +17,8 @@
new /obj/item/reagent_containers/dropper(src)
new /obj/item/reagent_containers/glass/beaker(src)
new /obj/item/reagent_containers/glass/beaker(src)
- new /obj/item/reagent_containers/glass/bottle/norepinephrine(src)
- new /obj/item/reagent_containers/glass/bottle/norepinephrine(src)
+ new /obj/item/reagent_containers/glass/bottle/inaprovaline(src)
+ new /obj/item/reagent_containers/glass/bottle/inaprovaline(src)
new /obj/item/reagent_containers/glass/bottle/antitoxin(src)
new /obj/item/reagent_containers/glass/bottle/antitoxin(src)
diff --git a/code/modules/cargo/random_stock/t1_common.dm b/code/modules/cargo/random_stock/t1_common.dm
index 253e041e85c..2c5757500bc 100644
--- a/code/modules/cargo/random_stock/t1_common.dm
+++ b/code/modules/cargo/random_stock/t1_common.dm
@@ -329,7 +329,7 @@ STOCK_ITEM_COMMON(pills, 1.2)
/obj/item/storage/pill_bottle/dexalin_plus, \
/obj/item/storage/pill_bottle/dermaline, \
/obj/item/storage/pill_bottle/dylovene, \
- /obj/item/storage/pill_bottle/norepinephrine, \
+ /obj/item/storage/pill_bottle/inaprovaline, \
/obj/item/storage/pill_bottle/kelotane, \
/obj/item/storage/pill_bottle/antihistamine, \
/obj/item/storage/pill_bottle/tramadol, \
diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm
index 595b1f87dcf..a4c6868bc4d 100644
--- a/code/modules/clothing/spacesuits/rig/modules/utility.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm
@@ -330,7 +330,7 @@
charges = list(
list("dexalin", "dexalin", /datum/reagent/dexalin, 5),
- list("norepinephrine", "norepinephrine", /datum/reagent/norepinephrine, 5)
+ list("inaprovaline", "inaprovaline", /datum/reagent/inaprovaline, 5)
)
interface_name = "chem dispenser"
@@ -360,7 +360,7 @@
list("tricordrazine", "tricordrazine", /datum/reagent/tricordrazine, 40),
list("tramadol", "tramadol", /datum/reagent/tramadol, 40),
list("dexalin", "dexalin", /datum/reagent/dexalin, 40),
- list("norepinephrine", "norepinephrine", /datum/reagent/norepinephrine, 40)
+ list("inaprovaline", "inaprovaline", /datum/reagent/inaprovaline, 40)
)
/obj/item/rig_module/voice
diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm
index a36f0f7c93f..186252b82f2 100644
--- a/code/modules/hydroponics/seed.dm
+++ b/code/modules/hydroponics/seed.dm
@@ -401,7 +401,7 @@
/datum/reagent/mercury,
/datum/reagent/mindbreaker,
/datum/reagent/slimetoxin,
- /datum/reagent/norepinephrine,
+ /datum/reagent/inaprovaline,
/datum/reagent/peridaxon,
/datum/reagent/toxin/phoron,
/datum/reagent/toxin/plasticide,
diff --git a/code/modules/item_worth/reagents.dm b/code/modules/item_worth/reagents.dm
index 9177ec21ffc..7e609d3d604 100644
--- a/code/modules/item_worth/reagents.dm
+++ b/code/modules/item_worth/reagents.dm
@@ -492,7 +492,7 @@
/datum/reagent/alcohol/ethanol/tallrussian
value = 0.15
-/datum/reagent/norepinephrine
+/datum/reagent/inaprovaline
value = 2.5
/datum/reagent/bicaridine
diff --git a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
index c95906b4e94..b9fca407869 100644
--- a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
+++ b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
@@ -117,7 +117,7 @@
/datum/medical_effect/cramps
name = "Cramps"
triggers = list(/datum/reagent/dylovene = 30, /datum/reagent/tramadol = 15)
- cures = list(/datum/reagent/norepinephrine)
+ cures = list(/datum/reagent/inaprovaline)
cure_message = "The cramps let up..."
/datum/medical_effect/cramps/on_life(mob/living/carbon/human/H, strength)
@@ -135,7 +135,7 @@
/datum/medical_effect/itch
name = "Itch"
triggers = list(/datum/reagent/space_drugs = 10)
- cures = list(/datum/reagent/norepinephrine)
+ cures = list(/datum/reagent/inaprovaline)
cure_message = "The itching stops..."
/datum/medical_effect/itch/on_life(mob/living/carbon/human/H, strength)
diff --git a/code/modules/mob/living/carbon/human/chem_side_effects.dm b/code/modules/mob/living/carbon/human/chem_side_effects.dm
index c95906b4e94..b9fca407869 100644
--- a/code/modules/mob/living/carbon/human/chem_side_effects.dm
+++ b/code/modules/mob/living/carbon/human/chem_side_effects.dm
@@ -117,7 +117,7 @@
/datum/medical_effect/cramps
name = "Cramps"
triggers = list(/datum/reagent/dylovene = 30, /datum/reagent/tramadol = 15)
- cures = list(/datum/reagent/norepinephrine)
+ cures = list(/datum/reagent/inaprovaline)
cure_message = "The cramps let up..."
/datum/medical_effect/cramps/on_life(mob/living/carbon/human/H, strength)
@@ -135,7 +135,7 @@
/datum/medical_effect/itch
name = "Itch"
triggers = list(/datum/reagent/space_drugs = 10)
- cures = list(/datum/reagent/norepinephrine)
+ cures = list(/datum/reagent/inaprovaline)
cure_message = "The itching stops..."
/datum/medical_effect/itch/on_life(mob/living/carbon/human/H, strength)
diff --git a/code/modules/mob/living/simple_animal/borer/borer_powers.dm b/code/modules/mob/living/simple_animal/borer/borer_powers.dm
index 572d8adafe4..8c8075ed7ae 100644
--- a/code/modules/mob/living/simple_animal/borer/borer_powers.dm
+++ b/code/modules/mob/living/simple_animal/borer/borer_powers.dm
@@ -205,7 +205,7 @@
to_chat(src, SPAN_WARNING("You don't have enough chemicals!"))
return
- var/list/choices = list("Norepinephrine" = /datum/reagent/norepinephrine, "Bicaridine" = /datum/reagent/norepinephrine, "Kelotane" = /datum/reagent/norepinephrine, "Dylovene" = /datum/reagent/dylovene, "Hyperzine" = /datum/reagent/hyperzine, "Peridaxon" = /datum/reagent/peridaxon, "Tramadol" = /datum/reagent/tramadol, "Fluvoxamine" = /datum/reagent/mental/fluvoxamine)
+ var/list/choices = list("Inaprovaline" = /datum/reagent/inaprovaline, "Bicaridine" = /datum/reagent/bicaridine, "Kelotane" = /datum/reagent/kelotane, "Dylovene" = /datum/reagent/dylovene, "Hyperzine" = /datum/reagent/hyperzine, "Peridaxon" = /datum/reagent/peridaxon, "Tramadol" = /datum/reagent/tramadol, "Fluvoxamine" = /datum/reagent/mental/fluvoxamine)
var/chem = input("Select a chemical to secrete.", "Chemicals") as null|anything in choices
if(!chem || chemicals < 20 || !host || controlling || !src || stat) //Sanity check.
diff --git a/code/modules/organs/subtypes/autakh.dm b/code/modules/organs/subtypes/autakh.dm
index 528678a8510..96acdb7453f 100644
--- a/code/modules/organs/subtypes/autakh.dm
+++ b/code/modules/organs/subtypes/autakh.dm
@@ -156,7 +156,7 @@
return FALSE
if(owner.reagents)
- owner.reagents.add_reagent(/datum/reagent/norepinephrine, 10)
+ owner.reagents.add_reagent(/datum/reagent/inaprovaline, 10)
owner.reagents.add_reagent(/datum/reagent/tricordrazine, 10)
owner.reagents.add_reagent(/datum/reagent/soporific, 15)
take_damage(15)
diff --git a/code/modules/random_map/drop/drop_types.dm b/code/modules/random_map/drop/drop_types.dm
index e5ec711bef2..fdd8402ee1a 100644
--- a/code/modules/random_map/drop/drop_types.dm
+++ b/code/modules/random_map/drop/drop_types.dm
@@ -147,7 +147,7 @@ var/global/list/datum/supply_drop_loot/supply_drop
/obj/item/storage/firstaid/o2,
/obj/item/storage/firstaid/adv,
/obj/item/reagent_containers/glass/bottle/antitoxin,
- /obj/item/reagent_containers/glass/bottle/norepinephrine,
+ /obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/glass/bottle/stoxin,
/obj/item/storage/box/syringes,
/obj/item/storage/box/autoinjectors)
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
index baf5c353105..5d764b57428 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
@@ -1,8 +1,8 @@
/* General medicine */
-/datum/reagent/norepinephrine
- name = "Norepinephrine"
- description = "Norepinephrine is a chemical that narrows blood vessels, raises blood pressure, and helps the blood pump more efficiently. Commonly used to stabilize patients."
+/datum/reagent/inaprovaline
+ name = "Inaprovaline"
+ description = "Inaprovaline is a chemical that narrows blood vessels, raises blood pressure, and helps the blood pump more efficiently. Commonly used to stabilize patients."
reagent_state = LIQUID
color = "#00BFFF"
overdose = REAGENTS_OVERDOSE * 2
@@ -12,7 +12,7 @@
scannable = 1
taste_description = "bitterness"
-/datum/reagent/norepinephrine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/inaprovaline/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
M.add_chemical_effect(CE_STABLE)
M.add_chemical_effect(CE_PAINKILLER, 25)
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index da2351500c7..eb81c191ce6 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -139,10 +139,10 @@
/* Common reactions */
-/datum/chemical_reaction/norepinephrine
- name = "Norepinephrine"
- id = "norepinephrine"
- result = /datum/reagent/norepinephrine
+/datum/chemical_reaction/inaprovaline
+ name = "Inaprovaline"
+ id = "inaprovaline"
+ result = /datum/reagent/inaprovaline
required_reagents = list(/datum/reagent/acetone = 1, /datum/reagent/carbon = 1, /datum/reagent/sugar = 1)
result_amount = 3
@@ -157,7 +157,7 @@
name = "Tramadol"
id = "tramadol"
result = /datum/reagent/tramadol
- required_reagents = list(/datum/reagent/norepinephrine = 1, /datum/reagent/alcohol/ethanol = 1, /datum/reagent/acetone = 1)
+ required_reagents = list(/datum/reagent/inaprovaline = 1, /datum/reagent/alcohol/ethanol = 1, /datum/reagent/acetone = 1)
result_amount = 3
/datum/chemical_reaction/paracetamol
@@ -294,7 +294,7 @@
name = "Tricordrazine"
id = "tricordrazine"
result = /datum/reagent/tricordrazine
- required_reagents = list(/datum/reagent/norepinephrine = 1, /datum/reagent/dylovene = 1)
+ required_reagents = list(/datum/reagent/inaprovaline = 1, /datum/reagent/dylovene = 1)
result_amount = 2
/datum/chemical_reaction/alkysine
@@ -331,8 +331,8 @@
name = "Bicaridine"
id = "bicaridine"
result = /datum/reagent/bicaridine
- required_reagents = list(/datum/reagent/norepinephrine = 1, /datum/reagent/carbon = 1)
- inhibitors = list(/datum/reagent/sugar = 1) // Messes with norepinephrine
+ required_reagents = list(/datum/reagent/inaprovaline = 1, /datum/reagent/carbon = 1)
+ inhibitors = list(/datum/reagent/sugar = 1) // Messes with inaprovaline
result_amount = 2
/datum/chemical_reaction/hyperzine
@@ -375,7 +375,7 @@
name = "Diphenhydramine"
id = "diphenhydramine"
result = /datum/reagent/antihistamine
- required_reagents = list(/datum/reagent/cryptobiolin = 1, /datum/reagent/norepinephrine = 1)
+ required_reagents = list(/datum/reagent/cryptobiolin = 1, /datum/reagent/inaprovaline = 1)
result_amount = 2
/datum/chemical_reaction/ondansetron
@@ -658,7 +658,7 @@
/datum/chemical_reaction/adrenaline
name = "Adrenaline"
result = /datum/reagent/adrenaline
- required_reagents = list(/datum/reagent/norepinephrine = 1, /datum/reagent/hyperzine = 1, /datum/reagent/dexalin/plus = 1)
+ required_reagents = list(/datum/reagent/inaprovaline = 1, /datum/reagent/hyperzine = 1, /datum/reagent/dexalin/plus = 1)
result_amount = 3
/datum/chemical_reaction/paroxetine
@@ -3568,4 +3568,4 @@
id = "rmt"
result = /datum/reagent/rmt
result_amount = 1
- required_reagents = list(/datum/reagent/potassium = 1, /datum/reagent/norepinephrine = 1)
+ required_reagents = list(/datum/reagent/potassium = 1, /datum/reagent/inaprovaline = 1)
diff --git a/code/modules/reagents/dispenser/cartridge_presets.dm b/code/modules/reagents/dispenser/cartridge_presets.dm
index 0d74043f56f..e64fc492f17 100644
--- a/code/modules/reagents/dispenser/cartridge_presets.dm
+++ b/code/modules/reagents/dispenser/cartridge_presets.dm
@@ -98,7 +98,7 @@
imidazoline spawn_reagent = /datum/reagent/imidazoline
kelotane spawn_reagent = /datum/reagent/kelotane
leporazine spawn_reagent = /datum/reagent/leporazine
- norepi spawn_reagent = /datum/reagent/norepinephrine
+ norepi spawn_reagent = /datum/reagent/inaprovaline
oxycodone spawn_reagent = /datum/reagent/oxycodone
paracetamol spawn_reagent = /datum/reagent/paracetamol
peridaxon spawn_reagent = /datum/reagent/peridaxon
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index 1c06223eb6f..ed27aa108ba 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -13,17 +13,17 @@
var/charge_tick = 0
var/recharge_time = 5 //Time it takes for shots to recharge (in seconds)
- var/list/reagent_ids = list(/datum/reagent/tricordrazine, /datum/reagent/norepinephrine)
+ var/list/reagent_ids = list(/datum/reagent/tricordrazine, /datum/reagent/inaprovaline)
var/list/reagent_volumes = list()
var/list/reagent_names = list()
center_of_mass = null
/obj/item/reagent_containers/borghypo/medical
- reagent_ids = list(/datum/reagent/bicaridine, /datum/reagent/kelotane, /datum/reagent/dylovene, /datum/reagent/dexalin, /datum/reagent/norepinephrine, /datum/reagent/tramadol, /datum/reagent/thetamycin)
+ reagent_ids = list(/datum/reagent/bicaridine, /datum/reagent/kelotane, /datum/reagent/dylovene, /datum/reagent/dexalin, /datum/reagent/inaprovaline, /datum/reagent/tramadol, /datum/reagent/thetamycin)
/obj/item/reagent_containers/borghypo/rescue
- reagent_ids = list(/datum/reagent/tricordrazine, /datum/reagent/norepinephrine, /datum/reagent/tramadol, /datum/reagent/adrenaline)
+ reagent_ids = list(/datum/reagent/tricordrazine, /datum/reagent/inaprovaline, /datum/reagent/tramadol, /datum/reagent/adrenaline)
/obj/item/reagent_containers/borghypo/Initialize()
. = ..()
diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm
index f26535afd65..ec232c78759 100644
--- a/code/modules/reagents/reagent_containers/glass/bottle.dm
+++ b/code/modules/reagents/reagent_containers/glass/bottle.dm
@@ -61,11 +61,11 @@
if (!is_open_container())
add_overlay("lid_bottle")
-/obj/item/reagent_containers/glass/bottle/norepinephrine
- name = "norepinephrine bottle"
- desc = "A small bottle. Contains norepinephrine - used to stabilize patients."
+/obj/item/reagent_containers/glass/bottle/inaprovaline
+ name = "inaprovaline bottle"
+ desc = "A small bottle. Contains inaprovaline - used to stabilize patients."
icon_state = "bottle-4"
- reagents_to_add = list(/datum/reagent/norepinephrine = 60)
+ reagents_to_add = list(/datum/reagent/inaprovaline = 60)
/obj/item/reagent_containers/glass/bottle/toxin
name = "toxin bottle"
diff --git a/code/modules/reagents/reagent_containers/glass/bottle/robot.dm b/code/modules/reagents/reagent_containers/glass/bottle/robot.dm
index 0402b9dce8b..5a1814b7efa 100644
--- a/code/modules/reagents/reagent_containers/glass/bottle/robot.dm
+++ b/code/modules/reagents/reagent_containers/glass/bottle/robot.dm
@@ -8,13 +8,13 @@
var/reagent = /datum/reagent/
-/obj/item/reagent_containers/glass/bottle/robot/norepinephrine
- name = "internal norepinephrine bottle"
- desc = "A small bottle. Contains norepinephrine - used to stabilize patients."
+/obj/item/reagent_containers/glass/bottle/robot/inaprovaline
+ name = "internal inaprovaline bottle"
+ desc = "A small bottle. Contains inaprovaline - used to stabilize patients."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- reagent = /datum/reagent/norepinephrine
- reagents_to_add = list(/datum/reagent/norepinephrine = 60)
+ reagent = /datum/reagent/inaprovaline
+ reagents_to_add = list(/datum/reagent/inaprovaline = 60)
/obj/item/reagent_containers/glass/bottle/robot/antitoxin
name = "internal anti-toxin bottle"
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 6c9690cc5d6..9ce7545218f 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -156,15 +156,15 @@
to_chat(user, SPAN_NOTICE("It is empty."))
-/obj/item/reagent_containers/hypospray/autoinjector/norepinephrine
- name = "autoinjector (norepinephrine)"
+/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline
+ name = "autoinjector (inaprovaline)"
volume = 5
amount_per_transfer_from_this = 20
flags = 0
-/obj/item/reagent_containers/hypospray/autoinjector/norepinephrine/Initialize()
+/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline/Initialize()
. =..()
- reagents.add_reagent(/datum/reagent/norepinephrine, 5)
+ reagents.add_reagent(/datum/reagent/inaprovaline, 5)
update_icon()
return
@@ -182,7 +182,7 @@
volume = 35
amount_per_transfer_from_this = 35
- reagents_to_add = list(/datum/reagent/tricordrazine = 15, /datum/reagent/norepinephrine = 5, /datum/reagent/dexalin/plus = 5, /datum/reagent/oxycodone = 5, /datum/reagent/mental/methylphenidate = 5)
+ reagents_to_add = list(/datum/reagent/tricordrazine = 15, /datum/reagent/inaprovaline = 5, /datum/reagent/dexalin/plus = 5, /datum/reagent/oxycodone = 5, /datum/reagent/mental/methylphenidate = 5)
/obj/item/reagent_containers/hypospray/combat
name = "combat hypospray"
diff --git a/code/modules/reagents/reagent_containers/inhaler_advanced.dm b/code/modules/reagents/reagent_containers/inhaler_advanced.dm
index 2bea07710c2..1303163a09f 100644
--- a/code/modules/reagents/reagent_containers/inhaler_advanced.dm
+++ b/code/modules/reagents/reagent_containers/inhaler_advanced.dm
@@ -196,11 +196,11 @@
update_icon()
return
-/obj/item/reagent_containers/personal_inhaler_cartridge/large/norepinephrine
- name = "large inhaler cartridge (norepinephrine)"
+/obj/item/reagent_containers/personal_inhaler_cartridge/large/inaprovaline
+ name = "large inhaler cartridge (inaprovaline)"
Initialize()
. =..()
- reagents.add_reagent(/datum/reagent/norepinephrine, 30)
+ reagents.add_reagent(/datum/reagent/inaprovaline, 30)
flags ^= OPENCONTAINER
update_icon()
return
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 6cdfa83f58e..0645cdf745a 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -147,11 +147,11 @@
icon_state = "pill8"
reagents_to_add = list(/datum/reagent/mental/escitalopram = 15)
-/obj/item/reagent_containers/pill/norepinephrine
- name = "norepinephrine pill"
+/obj/item/reagent_containers/pill/inaprovaline
+ name = "inaprovaline pill"
desc = "Used to stabilize patients."
icon_state = "pill20"
- reagents_to_add = list(/datum/reagent/norepinephrine = 30)
+ reagents_to_add = list(/datum/reagent/inaprovaline = 30)
/obj/item/reagent_containers/pill/dexalin
name = "Dexalin pill"
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index da33ef69221..8b09d4ed8a3 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -391,12 +391,12 @@
/// Syringes. END
////////////////////////////////////////////////////////////////////////////////
-/obj/item/reagent_containers/syringe/norepinephrine
- name = "Syringe (norepinephrine)"
- desc = "Contains norepinephrine - used to stabilize patients."
- reagents_to_add = list(/datum/reagent/norepinephrine = 15)
+/obj/item/reagent_containers/syringe/inaprovaline
+ name = "Syringe (inaprovaline)"
+ desc = "Contains inaprovaline - used to stabilize patients."
+ reagents_to_add = list(/datum/reagent/inaprovaline = 15)
-/obj/item/reagent_containers/syringe/norepinephrine/Initialize()
+/obj/item/reagent_containers/syringe/inaprovaline/Initialize()
. = ..()
mode = SYRINGE_INJECT
update_icon()
diff --git a/html/changelogs/furrycactus - epinephraprovaline.yml b/html/changelogs/furrycactus - epinephraprovaline.yml
new file mode 100644
index 00000000000..1f14f1c3598
--- /dev/null
+++ b/html/changelogs/furrycactus - epinephraprovaline.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: Furrycactus
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - tweak: "Renamed all instances of 'Norepinephrine' to 'Inaprovaline'."
diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm
index c4f7d4e96bd..2cd40c0ac89 100644
--- a/maps/aurora/aurora-1_centcomm.dmm
+++ b/maps/aurora/aurora-1_centcomm.dmm
@@ -3972,7 +3972,7 @@
pixel_x = -4;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/norepinephrine{
+/obj/item/reagent_containers/glass/bottle/inaprovaline{
pixel_x = 4;
pixel_y = 7
},
@@ -8276,9 +8276,9 @@
/obj/item/storage/belt/medical,
/obj/item/storage/belt/medical,
/obj/item/storage/belt/medical,
-/obj/item/reagent_containers/glass/bottle/norepinephrine,
-/obj/item/reagent_containers/glass/bottle/norepinephrine,
-/obj/item/reagent_containers/glass/bottle/norepinephrine,
+/obj/item/reagent_containers/glass/bottle/inaprovaline,
+/obj/item/reagent_containers/glass/bottle/inaprovaline,
+/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/storage/box/syringes,
/obj/item/reagent_containers/hypospray/cmo,
/obj/item/reagent_containers/hypospray/cmo,
@@ -8293,9 +8293,9 @@
/obj/item/storage/belt/medical,
/obj/item/storage/belt/medical,
/obj/item/storage/belt/medical,
-/obj/item/reagent_containers/glass/bottle/norepinephrine,
-/obj/item/reagent_containers/glass/bottle/norepinephrine,
-/obj/item/reagent_containers/glass/bottle/norepinephrine,
+/obj/item/reagent_containers/glass/bottle/inaprovaline,
+/obj/item/reagent_containers/glass/bottle/inaprovaline,
+/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/storage/box/syringes,
/obj/item/reagent_containers/glass/beaker/large,
/obj/item/reagent_containers/hypospray/cmo,
@@ -27375,15 +27375,15 @@
/area/shuttle/administration/centcom)
"nmx" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bottle/norepinephrine{
+/obj/item/reagent_containers/glass/bottle/inaprovaline{
pixel_x = 8;
pixel_y = 10
},
-/obj/item/reagent_containers/glass/bottle/norepinephrine{
+/obj/item/reagent_containers/glass/bottle/inaprovaline{
pixel_x = 8;
pixel_y = 5
},
-/obj/item/reagent_containers/glass/bottle/norepinephrine{
+/obj/item/reagent_containers/glass/bottle/inaprovaline{
pixel_x = 8
},
/turf/unsimulated/floor{
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index 57de6fe1d53..e06330b0f03 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -31902,7 +31902,7 @@
/obj/item/bodybag/cryobag,
/obj/item/bodybag/cryobag,
/obj/item/bodybag/cryobag,
-/obj/item/reagent_containers/glass/bottle/norepinephrine,
+/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/stack/medical/bruise_pack,
/obj/item/stack/medical/bruise_pack,
/obj/item/storage/pill_bottle/tramadol,
@@ -42681,7 +42681,7 @@
/obj/item/bodybag/cryobag,
/obj/item/bodybag/cryobag,
/obj/item/bodybag/cryobag,
-/obj/item/reagent_containers/glass/bottle/norepinephrine,
+/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/stack/medical/bruise_pack,
/obj/item/stack/medical/bruise_pack,
/obj/item/storage/pill_bottle/tramadol,
diff --git a/maps/exodus/exodus-1_station.dmm b/maps/exodus/exodus-1_station.dmm
index df7afe33739..2bacd514124 100644
--- a/maps/exodus/exodus-1_station.dmm
+++ b/maps/exodus/exodus-1_station.dmm
@@ -1402,12 +1402,12 @@
/area/security/main)
"acH" = (
/obj/structure/table/standard,
-/obj/item/reagent_containers/syringe/norepinephrine,
-/obj/item/reagent_containers/syringe/norepinephrine{
+/obj/item/reagent_containers/syringe/inaprovaline,
+/obj/item/reagent_containers/syringe/inaprovaline{
pixel_x = -2;
pixel_y = 5
},
-/obj/item/reagent_containers/syringe/norepinephrine{
+/obj/item/reagent_containers/syringe/inaprovaline{
pixel_y = 10
},
/obj/structure/cable/green{
@@ -40124,7 +40124,7 @@
pixel_x = 5;
pixel_y = 5
},
-/obj/item/reagent_containers/glass/bottle/norepinephrine{
+/obj/item/reagent_containers/glass/bottle/inaprovaline{
pixel_x = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -42885,7 +42885,7 @@
},
/obj/item/storage/pill_bottle/antitox,
/obj/item/storage/pill_bottle/tramadol,
-/obj/item/reagent_containers/syringe/norepinephrine,
+/obj/item/reagent_containers/syringe/inaprovaline,
/turf/simulated/wall,
/area/medical/sleeper)
"bDG" = (
diff --git a/maps/exodus/exodus-2_centcomm.dmm b/maps/exodus/exodus-2_centcomm.dmm
index e7c7ae94a63..5311aae81f3 100644
--- a/maps/exodus/exodus-2_centcomm.dmm
+++ b/maps/exodus/exodus-2_centcomm.dmm
@@ -4254,7 +4254,7 @@
pixel_x = -4;
pixel_y = 8
},
-/obj/item/reagent_containers/glass/bottle/norepinephrine{
+/obj/item/reagent_containers/glass/bottle/inaprovaline{
pixel_x = 4;
pixel_y = 7
},
@@ -6355,9 +6355,9 @@
/obj/item/storage/belt/medical,
/obj/item/storage/belt/medical,
/obj/item/storage/belt/medical,
-/obj/item/reagent_containers/glass/bottle/norepinephrine,
-/obj/item/reagent_containers/glass/bottle/norepinephrine,
-/obj/item/reagent_containers/glass/bottle/norepinephrine,
+/obj/item/reagent_containers/glass/bottle/inaprovaline,
+/obj/item/reagent_containers/glass/bottle/inaprovaline,
+/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/hypospray,
@@ -6372,9 +6372,9 @@
/obj/item/storage/belt/medical,
/obj/item/storage/belt/medical,
/obj/item/storage/belt/medical,
-/obj/item/reagent_containers/glass/bottle/norepinephrine,
-/obj/item/reagent_containers/glass/bottle/norepinephrine,
-/obj/item/reagent_containers/glass/bottle/norepinephrine,
+/obj/item/reagent_containers/glass/bottle/inaprovaline,
+/obj/item/reagent_containers/glass/bottle/inaprovaline,
+/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/hypospray,
@@ -17031,9 +17031,9 @@
/obj/item/storage/belt/medical,
/obj/item/storage/belt/medical,
/obj/item/storage/belt/medical,
-/obj/item/reagent_containers/glass/bottle/norepinephrine,
-/obj/item/reagent_containers/glass/bottle/norepinephrine,
-/obj/item/reagent_containers/glass/bottle/norepinephrine,
+/obj/item/reagent_containers/glass/bottle/inaprovaline,
+/obj/item/reagent_containers/glass/bottle/inaprovaline,
+/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/hypospray,
@@ -18454,9 +18454,9 @@
/obj/item/storage/belt/medical,
/obj/item/storage/belt/medical,
/obj/item/storage/belt/medical,
-/obj/item/reagent_containers/glass/bottle/norepinephrine,
-/obj/item/reagent_containers/glass/bottle/norepinephrine,
-/obj/item/reagent_containers/glass/bottle/norepinephrine,
+/obj/item/reagent_containers/glass/bottle/inaprovaline,
+/obj/item/reagent_containers/glass/bottle/inaprovaline,
+/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/hypospray,
diff --git a/nano/templates/med_diagnostics.tmpl b/nano/templates/med_diagnostics.tmpl
index af452f6ffdc..0e116cf9c20 100644
--- a/nano/templates/med_diagnostics.tmpl
+++ b/nano/templates/med_diagnostics.tmpl
@@ -102,7 +102,7 @@
{{:helper.round(data.blood_o2)}}%
-
=> Norepinephrine:
+
=> Inaprovaline:
{{:helper.round(data.norepiAmt)}} unit(s)
diff --git a/vueui/src/components/view/medical/bodyscanner.vue b/vueui/src/components/view/medical/bodyscanner.vue
index 6cefdec6701..7b0adecc336 100644
--- a/vueui/src/components/view/medical/bodyscanner.vue
+++ b/vueui/src/components/view/medical/bodyscanner.vue
@@ -73,7 +73,7 @@
{{blood_pressure}}
{{ Math.round(blood_o2) }}%
- {{ Math.round(norepiAmt) }} unit(s)
+ {{ Math.round(norepiAmt) }} unit(s)
{{ Math.round(soporAmt) }} unit(s)
{{ Math.round(bicardAmt) }} unit(s)
{{ Math.round(dermAmt) }} unit(s)