diff --git a/code/datums/outfits/ert/iac.dm b/code/datums/outfits/ert/iac.dm index 08e1f427691..fe56971210d 100644 --- a/code/datums/outfits/ert/iac.dm +++ b/code/datums/outfits/ert/iac.dm @@ -30,7 +30,7 @@ /obj/item/stack/medical/advanced/ointment = 2, /obj/item/stack/medical/splint = 1, /obj/item/reagent_containers/syringe = 1, - /obj/item/reagent_containers/glass/bottle/inaprovaline = 1 + /obj/item/reagent_containers/glass/bottle/norepinephrine = 1 ) /datum/outfit/admin/ert/iac/get_id_access() diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index d227db3bf66..2d638d22119 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -89,7 +89,7 @@ /obj/item/personal_inhaler/combat = 1, /obj/item/reagent_containers/personal_inhaler_cartridge/large = 2, /obj/item/reagent_containers/glass/bottle/dexalin_plus = 1, - /obj/item/reagent_containers/glass/bottle/inaprovaline = 1, + /obj/item/reagent_containers/glass/bottle/norepinephrine = 1, /obj/item/reagent_containers/glass/bottle/deltamivir = 1, /obj/item/reagent_containers/glass/bottle/thetamycin = 1, diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 0668e8264ea..a597864c46d 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -398,9 +398,6 @@ /obj/item/reagent_containers/pill/tox = 3, /obj/item/reagent_containers/pill/stox = 4 ) - premium = list( - /obj/item/reagent_containers/glass/bottle/inaprovaline = 2 - ) idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. random_itemcount = 0 temperature_setting = -1 diff --git a/code/game/modifiers/modifiers_chem.dm b/code/game/modifiers/modifiers_chem.dm index af010976819..9f66b9f55fd 100644 --- a/code/game/modifiers/modifiers_chem.dm +++ b/code/game/modifiers/modifiers_chem.dm @@ -31,11 +31,11 @@ -//Adrenaline, granted by synaptizine and inaprovaline, with different strengths for each +//Adrenaline, granted by synaptizine and norepinephrine, 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, inaprovaline applies it at strength 0.6 -//Is applied using strengthen override mode, so synaptizine will replace inaprovaline if both are present +//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 /datum/modifier/adrenaline var/speed_added = 0 var/stamina_added = 0 diff --git a/code/modules/item_worth/reagents.dm b/code/modules/item_worth/reagents.dm index d2f8c7cd7d2..9b912cafe2f 100644 --- a/code/modules/item_worth/reagents.dm +++ b/code/modules/item_worth/reagents.dm @@ -501,7 +501,7 @@ /datum/reagent/bicaridine value = 4.9 -/datum/reagent/kelotane/dermaline +/datum/reagent/dermaline value = 3.9 /datum/reagent/dylovene @@ -546,6 +546,9 @@ /datum/reagent/ryetalyn value = 3.6 +/datum/reagent/pneumalin + value = 3.2 + /datum/reagent/hyperzine value = 3.9 @@ -633,9 +636,6 @@ /datum/reagent/adrenaline value = 3 -/datum/reagent/inaprovaline - value = 3.5 - /datum/reagent/diethylamine value = 0.9 diff --git a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm index 3bbd8548d62..cf1bac64fea 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("dylovene" = 30, "tramadol" = 15) - cures = list("inaprovaline") + cures = list("norepinephrine") 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("space_drugs" = 10) - cures = list("inaprovaline") + cures = list("norepinephrine") 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 3bbd8548d62..cf1bac64fea 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("dylovene" = 30, "tramadol" = 15) - cures = list("inaprovaline") + cures = list("norepinephrine") 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("space_drugs" = 10) - cures = list("inaprovaline") + cures = list("norepinephrine") 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 159e3d88254..4ee1ace42f7 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/chem = input("Select a chemical to secrete.", "Chemicals") as null|anything in list("Inaprovaline", "Norepinephrine", "Bicaridine", "Kelotane", "Dylovene", "Hyperzine", "Peridaxon", "Tramadol", "Fluvoxamine") + var/chem = input("Select a chemical to secrete.", "Chemicals") as null|anything in list("Norepinephrine", "Bicaridine", "Kelotane", "Dylovene", "Hyperzine", "Peridaxon", "Tramadol", "Fluvoxamine") if(!chem || chemicals < 20 || !host || controlling || !src || stat) //Sanity check. return diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index e10de324f3c..f17f000b1ab 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -17,74 +17,11 @@ /datum/reagent/norepinephrine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) M.add_chemical_effect(CE_STABLE) M.add_chemical_effect(CE_PAINKILLER, 25) - if (!modifier) - modifier = M.add_modifier(/datum/modifier/adrenaline, MODIFIER_REAGENT, src, _strength = 0.6, override = MODIFIER_OVERRIDE_STRENGTHEN) /datum/reagent/norepinephrine/Destroy() QDEL_NULL(modifier) return ..() -/datum/reagent/inaprovaline - name = "Inaprovaline" - id = "inaprovaline" - description = "Inaprovaline is a super strength stimulant and painkiller intended to keep a patient alive while in critical condition. Overdose causes heart damage and an energy boost equivelent to hyperzine." - reagent_state = LIQUID - color = "#FFFFFF" - overdose = 20 - metabolism = 2 - metabolism_min = 0.25 - breathe_mul = 0.25 - ingest_mul = 0.25 - scannable = 1 - taste_description = "salty sugar" - var/datum/modifier/modifier1 - var/datum/modifier/modifier2 - -/datum/reagent/inaprovaline/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - - var/reagent_strength = round(max(0,1 - (M.health/100)),0.1) - - if(reagent_strength == 0) - return - - var/list/damage_stats = list(BRUTE = M.getBruteLoss(), BURN = M.getFireLoss(), TOX = M.getToxLoss(), OXY = M.getOxyLoss()) - - var/best_stat = "None" - var/best_value = 0 - - for(var/key in damage_stats) - var/value = damage_stats[key] - if(value > best_value) - best_stat = key - best_value = value - - switch(best_stat) - if(BRUTE) - M.adjustBruteLoss(-removed*5*reagent_strength) - if(BURN) - M.adjustFireLoss(-removed*5*reagent_strength) - if(TOX) - M.adjustToxLoss(-removed*5*reagent_strength) - if(OXY) - M.adjustOxyLoss(-removed*5*reagent_strength) - - M.make_jittery(removed*10) - M.add_chemical_effect(CE_STABLE) - M.add_chemical_effect(CE_PAINKILLER, 25) - -/datum/reagent/inaprovaline/overdose(var/mob/living/carbon/human/H, var/alien, removed ) - if(istype(H)) - H.add_chemical_effect(CE_CARDIOTOXIC, 0.1*removed) - H.make_jittery(removed*10) - H.add_chemical_effect(CE_SPEEDBOOST, 1) - if (!modifier2) - modifier2 = H.add_modifier(/datum/modifier/stimulant, MODIFIER_REAGENT, src, _strength = 1, override = MODIFIER_OVERRIDE_STRENGTHEN) - -/datum/reagent/inaprovaline/Destroy() - QDEL_NULL(modifier1) - QDEL_NULL(modifier2) - return ..() - /datum/reagent/bicaridine name = "Bicaridine" id = "bicaridine" @@ -114,23 +51,28 @@ reagent_state = LIQUID color = "#FFA800" overdose = REAGENTS_OVERDOSE - scannable = 1 + scannable = TRUE metabolism = REM * 0.5 taste_description = "bitterness" - var/strength = 6 /datum/reagent/kelotane/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - M.heal_organ_damage(0, 6 * removed) + if(!(locate(/datum/reagent/dermaline) in M.reagents.reagent_list)) + M.heal_organ_damage(0, 6 * removed) -/datum/reagent/kelotane/dermaline +/datum/reagent/dermaline name = "Dermaline" id = "dermaline" description = "Dermaline is the next step in burn medication. Works twice as good as kelotane and enables the body to restore even the direst heat-damaged tissue." + reagent_state = LIQUID color = "#FF8000" fallback_specific_heat = 1 + scannable = TRUE + metabolism = REM * 0.5 overdose = REAGENTS_OVERDOSE * 0.5 taste_mult = 1.5 - strength = 12 + +/datum/reagent/dermaline/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + M.heal_organ_damage(0, 12 * removed) /datum/reagent/dylovene name = "Dylovene" @@ -153,7 +95,7 @@ if(remove_generic) M.drowsyness = max(0, M.drowsyness - 6 * removed) - M.hallucination -= (9 * removed) + M.hallucination -= (2 * removed) M.add_up_to_chemical_effect(CE_ANTITOXIN, 1) var/removing = (4 * removed) @@ -602,7 +544,7 @@ fallback_specific_heat = 0.605 // assuming it's ethanol-based /datum/reagent/deltamivir/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - M.add_chemical_effect(CE_FEVER, dose/4) + M.add_chemical_effect(CE_FEVER, dose/12) /datum/reagent/thetamycin name = "Thetamycin" @@ -1360,6 +1302,25 @@ H.add_chemical_effect(CE_PNEUMOTOXIC, 0.2*removed) . = ..() +/datum/reagent/pneumalin + name = "Pneumalin" + id = "pneumalin" + description = "A chemical that, when inhaled, restores tearing and bruising of the lungs. Overdosing can lower a patient's pulse to dangerous levels." + color = "#8154b4" + overdose = 15 + scannable = 1 + taste_description = "fine dust" + reagent_state = SOLID + +/datum/reagent/pneumalin/affect_breathe(var/mob/living/carbon/human/H, var/alien, var/removed) + H.adjustOxyLoss(removed) //Every unit heals 1 oxy damage + H.add_chemical_effect(CE_PNEUMOTOXIC, -removed * 1.5) + H.add_chemical_effect(CE_PULSE, -1) + . = ..() + +/datum/reagent/pneumalin/overdose(var/mob/living/carbon/human/H, var/alien, var/removed) + H.add_chemical_effect(CE_PULSE, -dose * 0.33) + /datum/reagent/rezadone name = "Rezadone" id = "rezadone" @@ -1435,19 +1396,15 @@ /datum/reagent/adipemcina //Based on quinapril name = "Adipemcina" id = "adipemcina" - description = "Adipemcina is a heart medication used for treating high blood pressure, heart failure, and diabetes. Works at it's best when the stomach is empty. Causes vomiting and liver damage when overdosed." + description = "Adipemcina is a heart medication used for treating high blood pressure, heart failure, and diabetes. Causes vomiting and liver damage when overdosed." reagent_state = LIQUID color = "#008000" - metabolism = REM * 0.5 overdose = REAGENTS_OVERDOSE scannable = 1 taste_description = "bitterness" /datum/reagent/adipemcina/affect_blood(var/mob/living/carbon/human/M, var/alien, var/removed) - if(istype(M)) - if(M.max_nutrition > 0) - var/nutritionmod = max(0.25, (1 - M.nutrition) / M.max_nutrition * 0.5) //Less effective when your stomach is "full". - M.add_chemical_effect(CE_CARDIOTOXIC, -removed * nutritionmod) + M.add_chemical_effect(CE_CARDIOTOXIC, -removed*2) ..() /datum/reagent/adipemcina/overdose(var/mob/living/carbon/human/M, var/alien) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 3c5cc9533f7..52e3ccfa392 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -616,6 +616,13 @@ required_reagents = list("calomel" = 1, "lexorin" = 1) result_amount = 2 +/datum/chemical_reaction/pneumalin + name = "Pneumalin" + id = "pneumalin" + result = "pneumalin" + required_reagents = list("coughsyrup" = 1, "copper" = 1, "pulmodeiectionem" = 1) + result_amount = 2 + /datum/chemical_reaction/saline name = "Saline" id = "saline" @@ -637,13 +644,6 @@ required_reagents = list("tricordrazine" = 1, "phoron" = 0.1, "hydrazine" = 1 ) result_amount = 2 -/datum/chemical_reaction/inaprovaline - name = "Inaprovaline" - id = "inaprovaline" - result = "inaprovaline" - required_reagents = list("atropine" = 1, "phoron" = 0.1, "adrenaline" = 1 ) - result_amount = 2 - /datum/chemical_reaction/coughsyrup name = "Cough Syrup" id = "coughsyrup" diff --git a/code/modules/reagents/dispenser/cartridge_presets.dm b/code/modules/reagents/dispenser/cartridge_presets.dm index ceab807e1ca..d85b967ce9b 100644 --- a/code/modules/reagents/dispenser/cartridge_presets.dm +++ b/code/modules/reagents/dispenser/cartridge_presets.dm @@ -78,7 +78,6 @@ hot_coco spawn_reagent = "hot_coco" // ERT - inaprov spawn_reagent = "inaprovaline" norepi spawn_reagent = "norepinephrine" ryetalyn spawn_reagent = "ryetalyn" paracetamol spawn_reagent = "paracetamol" @@ -111,3 +110,4 @@ chloral spawn_reagent = "chloralhydrate" cryoxadone spawn_reagent = "cryoxadone" clonexadone spawn_reagent = "clonexadone" + pneumalin spawn_reagent = "pneumalin" diff --git a/code/modules/reagents/dispenser/dispenser_presets.dm b/code/modules/reagents/dispenser/dispenser_presets.dm index 01e66bb427f..5f75c594374 100644 --- a/code/modules/reagents/dispenser/dispenser_presets.dm +++ b/code/modules/reagents/dispenser/dispenser_presets.dm @@ -26,7 +26,7 @@ /obj/machinery/chemical_dispenser/ert name = "medicine dispenser" spawn_cartridges = list( - /obj/item/reagent_containers/chem_disp_cartridge/inaprov, + /obj/item/reagent_containers/chem_disp_cartridge/norepi, /obj/item/reagent_containers/chem_disp_cartridge/ryetalyn, /obj/item/reagent_containers/chem_disp_cartridge/paracetamol, /obj/item/reagent_containers/chem_disp_cartridge/tramadol, diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm index 55a41fbbb7c..cec533712e2 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle.dm @@ -66,14 +66,7 @@ desc = "A small bottle. Contains norepinephrine - used to stabilize patients." icon_state = "bottle-4" reagents_to_add = list("norepinephrine" = 60) - -/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("inaprovaline" = 60) - /obj/item/reagent_containers/glass/bottle/toxin name = "toxin bottle" desc = "A small bottle of toxins. Do not drink, it is poisonous." diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 9b6019ea76e..eee97291bd0 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -414,16 +414,6 @@ mode = SYRINGE_INJECT update_icon() -/obj/item/reagent_containers/syringe/inaprovaline - name = "Syringe (inaprovaline)" - desc = "Contains inaprovaline - used to stabilize patients." - -/obj/item/reagent_containers/syringe/norepinephrine/Initialize() - . = ..() - reagents.add_reagent("inaprovaline", 15) - mode = SYRINGE_INJECT - update_icon() - /obj/item/reagent_containers/syringe/dylovene name = "Syringe (dylovene)" desc = "Contains anti-toxins." diff --git a/html/changelogs/doxxmedearly - chemshift.yml b/html/changelogs/doxxmedearly - chemshift.yml new file mode 100644 index 00000000000..dff12c7d5dd --- /dev/null +++ b/html/changelogs/doxxmedearly - chemshift.yml @@ -0,0 +1,13 @@ +author: Doxxmedearly + +delete-after: True + +changes: + - rscadd: "Added Pneumalin, a medication that is targeted to fix lung damage, which should decrease reliance on peridaxon. Make it by using a 1:1:1 ratio of cough syrup, copper, and pulmodeiectionem. Overdoses above 15u, causing a dangerous drop in a person's pulse." + - rscdel: "Removed inaprovaline. Replaced all bottles and syringes with norepinephrine. Itching and cramps are now relieved by norepinephrine." + - tweak: "Dylovene is now less effective at treating hallucinations. Use synaptizine." + - tweak: "Adipemcina no longer relies on or affects a person's nutrition level to function. It also metabolizes a little faster." + - tweak: "Removed adrenaline effects from norepinephrine." + - tweak: "Kelotane will no longer heal burns if dermaline is present in a person's system. It will metabolize with no effect until the dermaline is gone." + - bugfix: "Dermaline now recovers the proper amount of burn damage, instead of being equivalent to kelotane." + - bugfix: "Deltamivir will no longer cause organ-boiling fevers at 20u dosage. It will still cause a slight fever, so keep that in mind!" diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 8d858bae6db..bdf327540ac 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -5845,7 +5845,7 @@ pixel_x = -4; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/inaprovaline{ +/obj/item/reagent_containers/glass/bottle/norepinephrine{ pixel_x = 4; pixel_y = 7 }, @@ -10732,9 +10732,9 @@ /obj/item/storage/belt/medical, /obj/item/storage/belt/medical, /obj/item/storage/belt/medical, -/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/glass/bottle/norepinephrine, +/obj/item/reagent_containers/glass/bottle/norepinephrine, +/obj/item/reagent_containers/glass/bottle/norepinephrine, /obj/item/storage/box/syringes, /obj/item/reagent_containers/hypospray/cmo, /obj/item/reagent_containers/hypospray/cmo, @@ -10749,9 +10749,9 @@ /obj/item/storage/belt/medical, /obj/item/storage/belt/medical, /obj/item/storage/belt/medical, -/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/glass/bottle/norepinephrine, +/obj/item/reagent_containers/glass/bottle/norepinephrine, +/obj/item/reagent_containers/glass/bottle/norepinephrine, /obj/item/storage/box/syringes, /obj/item/reagent_containers/glass/beaker/large, /obj/item/reagent_containers/hypospray/cmo, @@ -26798,15 +26798,15 @@ /area/merchant_station) "nmx" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/bottle/inaprovaline{ +/obj/item/reagent_containers/glass/bottle/norepinephrine{ pixel_x = 8; pixel_y = 10 }, -/obj/item/reagent_containers/glass/bottle/inaprovaline{ +/obj/item/reagent_containers/glass/bottle/norepinephrine{ pixel_x = 8; pixel_y = 5 }, -/obj/item/reagent_containers/glass/bottle/inaprovaline{ +/obj/item/reagent_containers/glass/bottle/norepinephrine{ pixel_x = 8 }, /turf/unsimulated/floor{ diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index f58d2a46390..077cdc55fbb 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -33368,7 +33368,7 @@ /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, -/obj/item/reagent_containers/glass/bottle/inaprovaline, +/obj/item/reagent_containers/glass/bottle/norepinephrine, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, /obj/item/storage/pill_bottle/tramadol, @@ -44662,7 +44662,7 @@ /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, -/obj/item/reagent_containers/glass/bottle/inaprovaline, +/obj/item/reagent_containers/glass/bottle/norepinephrine, /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 13f17792c9c..4d5ef13b3ee 100644 --- a/maps/exodus/exodus-1_station.dmm +++ b/maps/exodus/exodus-1_station.dmm @@ -1432,12 +1432,12 @@ /area/security/main) "acH" = ( /obj/structure/table/standard, -/obj/item/reagent_containers/syringe/inaprovaline, -/obj/item/reagent_containers/syringe/inaprovaline{ +/obj/item/reagent_containers/syringe/norepinephrine, +/obj/item/reagent_containers/syringe/norepinephrine{ pixel_x = -2; pixel_y = 5 }, -/obj/item/reagent_containers/syringe/inaprovaline{ +/obj/item/reagent_containers/syringe/norepinephrine{ pixel_y = 10 }, /obj/structure/cable/green{ @@ -41824,7 +41824,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/item/reagent_containers/glass/bottle/inaprovaline{ +/obj/item/reagent_containers/glass/bottle/norepinephrine{ pixel_x = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -44681,7 +44681,7 @@ /obj/item/storage/pill_bottle/tramadol, /obj/item/reagent_containers/syringe/antiviral, /obj/item/reagent_containers/syringe/antiviral, -/obj/item/reagent_containers/syringe/inaprovaline, +/obj/item/reagent_containers/syringe/norepinephrine, /turf/simulated/wall, /area/medical/sleeper) "bDG" = ( diff --git a/maps/exodus/exodus-2_centcomm.dmm b/maps/exodus/exodus-2_centcomm.dmm index 5a640fd6c9b..896933a360e 100644 --- a/maps/exodus/exodus-2_centcomm.dmm +++ b/maps/exodus/exodus-2_centcomm.dmm @@ -5835,7 +5835,7 @@ pixel_x = -4; pixel_y = 8 }, -/obj/item/reagent_containers/glass/bottle/inaprovaline{ +/obj/item/reagent_containers/glass/bottle/norepinephrine{ pixel_x = 4; pixel_y = 7 }, @@ -7959,9 +7959,9 @@ /obj/item/storage/belt/medical, /obj/item/storage/belt/medical, /obj/item/storage/belt/medical, -/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/glass/bottle/norepinephrine, +/obj/item/reagent_containers/glass/bottle/norepinephrine, +/obj/item/reagent_containers/glass/bottle/norepinephrine, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/hypospray, @@ -7976,9 +7976,9 @@ /obj/item/storage/belt/medical, /obj/item/storage/belt/medical, /obj/item/storage/belt/medical, -/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/glass/bottle/norepinephrine, +/obj/item/reagent_containers/glass/bottle/norepinephrine, +/obj/item/reagent_containers/glass/bottle/norepinephrine, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/hypospray, @@ -19015,9 +19015,9 @@ /obj/item/storage/belt/medical, /obj/item/storage/belt/medical, /obj/item/storage/belt/medical, -/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/glass/bottle/norepinephrine, +/obj/item/reagent_containers/glass/bottle/norepinephrine, +/obj/item/reagent_containers/glass/bottle/norepinephrine, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/hypospray, @@ -20475,9 +20475,9 @@ /obj/item/storage/belt/medical, /obj/item/storage/belt/medical, /obj/item/storage/belt/medical, -/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/glass/bottle/norepinephrine, +/obj/item/reagent_containers/glass/bottle/norepinephrine, +/obj/item/reagent_containers/glass/bottle/norepinephrine, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/hypospray,