diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index e96ab06c7f3..1be7d65b184 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -169,7 +169,7 @@ #define COLOR_REAGENT_SULFASALAZINE "#266930" #define COLOR_REAGENT_DIBORANE "#1800a3" #define COLOR_REAGENT_STIMULON "#19C832" -#define COLOR_REAGENT_NEUROFRENZY "#062c48" + //Color defines used by toxin #define COLOR_TOXIN_TOXIN "#CF3600" // rgb: 207, 54, 0 diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index 7085b173c53..93397daaae6 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -102,7 +102,6 @@ GLOBAL_LIST_INIT(marine_gear_listed_products, list( /obj/structure/closet/crate/mortar_ammo/mortar_kit = list(CAT_MARINE, "Mortar kit", 35, "orange3"), /obj/structure/closet/crate/mortar_ammo/howitzer_kit = list(CAT_MARINE, "Howitzer kit", 35, "orange3"), /obj/structure/closet/crate/mortar_ammo/mlrs_kit = list(CAT_MARINE, "MLRS kit", 35, "orange3"), - /obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy = list(CAT_MARINE, "N-F neurostimulator", 20, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/oxycodone = list(CAT_MARINE, "Oxycodone autoinjector", 5, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/russian_red = list(CAT_MARINE, "Emergency autoinjector", 10, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = list(CAT_MARINE, "Synaptizine autoinjector", 8, "cyan"), diff --git a/code/game/data_huds/human.dm b/code/game/data_huds/human.dm index 37c0c1a8be7..01de9a221bf 100644 --- a/code/game/data_huds/human.dm +++ b/code/game/data_huds/human.dm @@ -218,7 +218,7 @@ var/static/image/ifosfamide_image = image('icons/mob/hud/reagent.dmi', icon_state = "ifosfamide") var/static/image/jellyjuice_image = image('icons/mob/hud/reagent.dmi', icon_state = "jellyjuice") var/static/image/russianred_image = image('icons/mob/hud/reagent.dmi', icon_state = "russian_red") - var/static/image/neurofrenzy_image = image('icons/mob/hud/reagent.dmi', icon_state = "neurofrenzy") + var/neurotox_amount = reagents.get_reagent_amount(/datum/reagent/toxin/xeno_neurotoxin) var/hemodile_amount = reagents.get_reagent_amount(/datum/reagent/toxin/xeno_hemodile) @@ -229,7 +229,7 @@ var/medicalnanites_amount = reagents.get_reagent_amount(/datum/reagent/medicalnanites) var/russianred_amount = reagents.get_reagent_amount(/datum/reagent/medicine/russian_red) var/ifosfamide_amount = reagents.get_reagent_amount(/datum/reagent/medicine/ifosfamide) - var/neurofrenzy_amount = reagents.get_reagent_amount(/datum/reagent/neurofrenzy) + if(neurotox_amount > 10) //Blinking image for particularly high concentrations xeno_reagent.overlays += neurotox_high_image @@ -272,9 +272,6 @@ if(jellyjuice_amount > 0) xeno_reagent.overlays += jellyjuice_image - if(neurofrenzy_amount > 0) - xeno_reagent.overlays += neurofrenzy_image - hud_list[XENO_REAGENT_HUD] = xeno_reagent ///Displays active xeno specific debuffs diff --git a/code/game/objects/items/reagent_containers/autoinjectors.dm b/code/game/objects/items/reagent_containers/autoinjectors.dm index a35312ed065..18752fc4eee 100644 --- a/code/game/objects/items/reagent_containers/autoinjectors.dm +++ b/code/game/objects/items/reagent_containers/autoinjectors.dm @@ -371,12 +371,4 @@ /obj/item/reagent_containers/hypospray/autoinjector/yautja/interact(mob/user) return -/obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy - name = "neurofrenzy autoinjector" - desc = "An auto-injector loaded with 1 unit neurostimulant. !DO NOT USE WITH MEDICAL NANITES!" - icon_state = "RedWhite" - amount_per_transfer_from_this = 1 - volume = 1 - list_reagents = list(/datum/reagent/neurofrenzy = 1) - free_refills = FALSE - description_overlay = "Nf" + diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm index 14f06175454..8443eaa2e15 100644 --- a/code/game/objects/machinery/vending/marine_vending.dm +++ b/code/game/objects/machinery/vending/marine_vending.dm @@ -1073,7 +1073,6 @@ /obj/item/reagent_containers/hypospray/autoinjector/neuraline = -1, /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = -1, /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = -1, - /obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy = -1, )) /obj/machinery/vending/MarineMed/Blood diff --git a/code/modules/reagents/reactions/other.dm b/code/modules/reagents/reactions/other.dm index bf487f4cf34..51d108b6003 100644 --- a/code/modules/reagents/reactions/other.dm +++ b/code/modules/reagents/reactions/other.dm @@ -18,10 +18,6 @@ results = list(/datum/reagent/toxin/sleeptoxin = 5) required_reagents = list(/datum/reagent/toxin/chloralhydrate = 1, /datum/reagent/consumable/sugar = 4) -/datum/chemical_reaction/sleeptoxin_two - name = "Sleeptoxin" - results = list(/datum/reagent/toxin/sleeptoxin = 0.5) - required_reagents = list(/datum/reagent/toxin/xeno_hemodile = 0.5, /datum/reagent/neurofrenzy = 0.1) /datum/chemical_reaction/mutagen name = "Unstable mutagen" diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index f719f74be84..47297a563be 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1679,53 +1679,3 @@ /datum/reagent/medicine/ifosfamide/overdose_crit_process(mob/living/L, metabolism) L.adjustToxLoss(4*effect_str) -/datum/reagent/neurofrenzy - name = "NeuroFrenzy" - description = "This is a neurostimulating substance that causes the brain to maintain an increased heart rate." - color = COLOR_REAGENT_NEUROFRENZY - custom_metabolism = 0 - scannable = TRUE - taste_description = "sour coffee" - overdose_threshold = 10 - overdose_crit_threshold = 10 - trait_flags = TACHYCARDIC - purge_rate = 10 - purge_list = list( - /datum/reagent/medicalnanites, - /datum/reagent/medicine/peridaxon, - /datum/reagent/medicine/peridaxon_plus, - ) - -/datum/reagent/neurofrenzy/on_mob_add(mob/living/our_living, metabolism) - our_living.add_movespeed_modifier(type, TRUE, 0, NONE, TRUE, -0.4) - to_chat(our_living, span_userdanger("You feel like your heart could stop at any moment.")) - -/datum/reagent/neurofrenzy/on_mob_life(mob/living/our_living, metabolism) - . = ..() - if(volume < 1) - our_living.reagents.remove_reagent(/datum/reagent/neurofrenzy, 3) - return //antiduplicate - - if(volume < 5) - our_living.reagents.add_reagent(/datum/reagent/neurofrenzy, 0.5) - switch(current_cycle) - if(1 to 40) - our_living.adjustStaminaLoss((4) * effect_str) - our_living.jitter(2) - if(3) - to_chat(our_living, span_notice("Your heart is jumping out of your chest.")) - if(41) - to_chat(our_living, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard.")) - if(45 to INFINITY) - if(prob(99.775)) - return - to_chat(our_living, span_userdanger("OUUH MY HEART")) - our_living.adjustOxyLoss(30) - var/mob/living/carbon/human/our_human = our_living - var/datum/internal_organ/heart/our_heart = our_human.get_organ_slot(ORGAN_SLOT_HEART) - our_heart?.take_damage(15, TRUE) - -/datum/reagent/neurofrenzy/on_mob_delete(mob/living/our_living, metabolism) - to_chat(our_living, span_userdanger("It seems that something has stopped pushing your heart with force.")) - our_living.remove_movespeed_modifier(type) - our_living.Paralyze(2 SECONDS) diff --git a/code/modules/reqs/supplypacks/medical.dm b/code/modules/reqs/supplypacks/medical.dm index e047d97a555..002bd52361f 100644 --- a/code/modules/reqs/supplypacks/medical.dm +++ b/code/modules/reqs/supplypacks/medical.dm @@ -324,24 +324,6 @@ contains = list(/obj/item/reagent_containers/hypospray/autoinjector/oxycodone) cost = 20 -/datum/supply_packs/medical/nf_neurostimulator - name = "N-F neurostimulator injector" - notes = "contains M-S neurostimulator auto injector." - contains = list(/obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy) - cost = 140 - -/datum/supply_packs/medical/nf_neurostimulator_kit - name = "N-F neurostimulator kit" - notes = "contains 5 N-F neurostimulator auto injectors." - contains = list( - /obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy, - /obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy, - /obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy, - /obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy, - /obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy, - ) - cost = 500 - /datum/supply_packs/medical/neuraline_kit name ="large neuraline kit" notes = "contains five neuraline injectors"