New speedboost reagent for marines MasTac (#610)

* modified: code/__DEFINES/colors.dm modified: code/__DEFINES/loadout.dm modified: code/game/objects/items/reagent_containers/autoinjectors.dm modified: code/game/objects/machinery/vending/marine_vending.dm modified: code/modules/reagents/reactions/other.dm modified: code/modules/reagents/reagents/medical.dm modified: code/modules/reqs/medical.dm * Update code/modules/reagents/reactions/other.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: Istrelok2107 <[email protected]> * Update code/modules/reagents/reagents/medical.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: Istrelok2107 <[email protected]> * Update code/modules/reagents/reactions/other.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: Istrelok2107 <[email protected]> * Update code/modules/reagents/reagents/medical.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: Istrelok2107 <[email protected]> * Update code/modules/reagents/reagents/medical.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: Istrelok2107 <[email protected]> * Update code/modules/reagents/reagents/medical.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: Istrelok2107 <[email protected]> * modified: code/__DEFINES/colors.dm modified: code/__DEFINES/loadout.dm modified: code/game/objects/items/reagent_containers/autoinjectors.dm modified: code/game/objects/machinery/vending/marine_vending.dm modified: code/modules/reagents/reactions/other.dm modified: code/modules/reagents/reagents/medical.dm modified: code/modules/reqs/medical.dm * modified: code/modules/reagents/reagents/medical.dm * modified: code/modules/reagents/reagents/medical.dm * modified: code/modules/reagents/reactions/other.dm * modified: code/modules/reagents/reagents/medical.dm * modified: code/modules/reqs/medical.dm * modified: code/modules/reagents/reagents/medical.dm * modified: code/__DEFINES/loadout.dm * helg fetish * xenohud+fix * modified: code/game/data_huds/human.dm modified: code/game/objects/items/reagent_containers/autoinjectors.dm modified: code/modules/reagents/reactions/other.dm modified: code/modules/reagents/reagents/medical.dm * потестил в вальггале, надо чтобы реже сердце било * Update code/modules/reagents/reagents/medical.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: Istrelok2107 <[email protected]> * Дешевле на 5 очков Signed-off-by: Istrelok2107 <[email protected]> * ранний ретурн * уэээ * удаление ретурна * Update code/modules/reagents/reagents/medical.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: Istrelok2107 <[email protected]> * nerf * antidupe * fix * Update code/modules/reagents/reagents/medical.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: Istrelok2107 <[email protected]> * Update code/modules/reagents/reagents/medical.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: Istrelok2107 <[email protected]> * grammar * grammar2 * readability * helgshiza * Revert "helgshiza" This reverts commit b3b4c7c. * Revert "readability" This reverts commit bf62cc9. * SHIZA * Update medical.dm Signed-off-by: Helg2 <[email protected]> * shiza nerf * нолик * no fun allowed antidupe * conflict * Delete code/modules/reqs/medical.dm Signed-off-by: Istrelok2107 <[email protected]> * mikola shiza * rename * modified: code/__DEFINES/loadout.dm modified: code/modules/reqs/supplypacks/medical.dm * Update code/game/objects/items/reagent_containers/autoinjectors.dm Signed-off-by: Helg2 <[email protected]> --------- Signed-off-by: Istrelok2107 <[email protected]> Signed-off-by: Helg2 <[email protected]> Co-authored-by: Helg2 <[email protected]>
PMC-Unga-Marines · Dec 13, 2024 · 50a52ed · 50a52ed
1 parent defa66b
commit 50a52ed
Show file tree

Hide file tree

Showing 9 changed files with 92 additions and 0 deletions.
diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm
@@ -169,6 +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
@@ -102,6 +102,7 @@ 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
@@ -218,6 +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)
@@ -228,6 +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
@@ -270,6 +272,9 @@
 	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
@@ -370,3 +370,13 @@
 
 /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
@@ -1069,6 +1069,7 @@
 			/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
@@ -18,6 +18,11 @@
 	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)

diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm
@@ -1678,3 +1678,54 @@
 
 /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
@@ -324,6 +324,24 @@
 	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"

diff --git a/icons/mob/hud/reagent.dmi b/icons/mob/hud/reagent.dmi