Skip to content

Commit

Permalink
Revert "New speedboost reagent for marines MasTac (PMC-Unga-Marines#610
Browse files Browse the repository at this point in the history
…)"

This reverts commit 50a52ed.
  • Loading branch information
LoneAsket authored Dec 16, 2024
1 parent e9a3de6 commit 15f6dc4
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 92 deletions.
1 change: 0 additions & 1 deletion code/__DEFINES/colors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@
#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
Expand Down
1 change: 0 additions & 1 deletion code/__DEFINES/loadout.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
5 changes: 0 additions & 5 deletions code/game/data_huds/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@
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)
Expand All @@ -229,7 +228,6 @@
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
Expand Down Expand Up @@ -272,9 +270,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
Expand Down
10 changes: 0 additions & 10 deletions code/game/objects/items/reagent_containers/autoinjectors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -370,13 +370,3 @@

/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"
1 change: 0 additions & 1 deletion code/game/objects/machinery/vending/marine_vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions code/modules/reagents/reactions/other.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +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"
results = list(/datum/reagent/toxin/mutagen = 3)
Expand Down
51 changes: 0 additions & 51 deletions code/modules/reagents/reagents/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1678,54 +1678,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)
18 changes: 0 additions & 18 deletions code/modules/reqs/supplypacks/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Binary file modified icons/mob/hud/reagent.dmi
Binary file not shown.

0 comments on commit 15f6dc4

Please sign in to comment.