rename

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_MASTAC "#062c48"
+#define COLOR_REAGENT_NEUROFRENZY "#062c48"
 
 //Color defines used by toxin
 #define COLOR_TOXIN_TOXIN "#CF3600" // rgb: 207, 54, 0

code/__DEFINES/loadout.dm

@@ -102,7 +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/mastac = list(CAT_MARINE, "M-S neurostimulator", 20, "cyan"),
+	/obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy = list(CAT_MARINE, "M-S 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"),

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/mastac_image = image('icons/mob/hud/reagent.dmi', icon_state = "mastac")
+	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/mastac_amount = reagents.get_reagent_amount(/datum/reagent/mastac)
+	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,8 +272,8 @@
 	if(jellyjuice_amount > 0)
 		xeno_reagent.overlays += jellyjuice_image
 
-	if(mastac_amount > 0)
-		xeno_reagent.overlays += mastac_image
+	if(neurofrenzy_amount > 0)
+		xeno_reagent.overlays += neurofrenzy_image
 
 	hud_list[XENO_REAGENT_HUD] = xeno_reagent
 

code/game/objects/items/reagent_containers/autoinjectors.dm

@@ -371,12 +371,12 @@
 /obj/item/reagent_containers/hypospray/autoinjector/yautja/interact(mob/user)
 	return
 
-/obj/item/reagent_containers/hypospray/autoinjector/mastac
-	name = "mastac autoinjector"
+/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/mastac = 1)
+	list_reagents = list(/datum/reagent/neurofrenzy = 1)
 	free_refills = FALSE
 	description_overlay = "Mt"

code/game/objects/machinery/vending/marine_vending.dm

@@ -1058,7 +1058,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/mastac = -1,
+			/obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy = -1,
 		))
 
 /obj/machinery/vending/MarineMed/Blood

code/modules/reagents/reactions/other.dm

@@ -21,7 +21,7 @@
 /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/mastac = 0.1)
+	required_reagents = list(/datum/reagent/toxin/xeno_hemodile = 0.5, /datum/reagent/neurofrenzy = 0.1)
 
 /datum/chemical_reaction/mutagen
 	name = "Unstable mutagen"

code/modules/reagents/reagents/medical.dm

@@ -1679,10 +1679,10 @@
 /datum/reagent/medicine/ifosfamide/overdose_crit_process(mob/living/L, metabolism)
 	L.adjustToxLoss(4*effect_str)
 
-/datum/reagent/mastac
-	name = "MasTac"
+/datum/reagent/neurofrenzy
+	name = "NeuroFrenzy"
 	description = "This is a neurostimulating substance that causes the brain to maintain an increased heart rate."
-	color = COLOR_REAGENT_MASTAC
+	color = COLOR_REAGENT_NEUROFRENZY
 	custom_metabolism = 0
 	scannable = TRUE
 	taste_description = "sour coffee"
@@ -1696,18 +1696,18 @@
 		/datum/reagent/medicine/peridaxon_plus,
 	)
 
-/datum/reagent/mastac/on_mob_add(mob/living/our_living, metabolism)
+/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/mastac/on_mob_life(mob/living/our_living, metabolism)
+/datum/reagent/neurofrenzy/on_mob_life(mob/living/our_living, metabolism)
 	. = ..()
 	if(volume < 1)
-		our_living.reagents.remove_reagent(/datum/reagent/mastac, 3)
+		our_living.reagents.remove_reagent(/datum/reagent/neurofrenzy, 3)
 		return //antiduplicate
 
 	if(volume < 5)
-		our_living.reagents.add_reagent(/datum/reagent/mastac, 0.5)
+		our_living.reagents.add_reagent(/datum/reagent/neurofrenzy, 0.5)
 	switch(current_cycle)
 		if(1 to 40)
 			our_living.adjustStaminaLoss((4) * effect_str)
@@ -1725,7 +1725,7 @@
 			var/datum/internal_organ/heart/our_heart = our_human.get_organ_slot(ORGAN_SLOT_HEART)
 			our_heart?.take_damage(15, TRUE)
 
-/datum/reagent/mastac/on_mob_delete(mob/living/our_living, metabolism)
+/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)

code/modules/reqs/supplypacks/medical.dm

@@ -327,18 +327,18 @@
 /datum/supply_packs/medical/Mt_neurostimulator
 	name = "M-S neurostimulator injector"
 	notes = "contains M-S neurostimulator auto injector."
-	contains = list(/obj/item/reagent_containers/hypospray/autoinjector/mastac)
+	contains = list(/obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy)
 	cost = 140
 
 /datum/supply_packs/medical/Mt_neurostimulator_kit
 	name = "M-S neurostimulator kit"
 	notes = "contains 5 M-S neurostimulator auto injectors."
 	contains = list(
-		/obj/item/reagent_containers/hypospray/autoinjector/mastac,
-		/obj/item/reagent_containers/hypospray/autoinjector/mastac,
-		/obj/item/reagent_containers/hypospray/autoinjector/mastac,
-		/obj/item/reagent_containers/hypospray/autoinjector/mastac,
-		/obj/item/reagent_containers/hypospray/autoinjector/mastac,
+		/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