From 15f6dc4c35424fcec9bbbbd126b7a81a7d9f373b Mon Sep 17 00:00:00 2001 From: LoneAsket <59748469+LoneAsket@users.noreply.github.com> Date: Mon, 16 Dec 2024 21:37:39 +0500 Subject: [PATCH] Revert "New speedboost reagent for marines MasTac (#610)" This reverts commit 50a52eda7c332463bb6632d0f9476d307652028a. --- code/__DEFINES/colors.dm | 1 - code/__DEFINES/loadout.dm | 1 - code/game/data_huds/human.dm | 5 -- .../items/reagent_containers/autoinjectors.dm | 10 ---- .../machinery/vending/marine_vending.dm | 1 - code/modules/reagents/reactions/other.dm | 5 -- code/modules/reagents/reagents/medical.dm | 51 ------------------ code/modules/reqs/supplypacks/medical.dm | 18 ------- icons/mob/hud/reagent.dmi | Bin 1250 -> 1084 bytes 9 files changed, 92 deletions(-) diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index e96ab06c7f3..8c4a76f18b5 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -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 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..e9727291307 100644 --- a/code/game/data_huds/human.dm +++ b/code/game/data_huds/human.dm @@ -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) @@ -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 @@ -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 diff --git a/code/game/objects/items/reagent_containers/autoinjectors.dm b/code/game/objects/items/reagent_containers/autoinjectors.dm index a35312ed065..061ca7fd61e 100644 --- a/code/game/objects/items/reagent_containers/autoinjectors.dm +++ b/code/game/objects/items/reagent_containers/autoinjectors.dm @@ -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" 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..a6b5d5c74a6 100644 --- a/code/modules/reagents/reactions/other.dm +++ b/code/modules/reagents/reactions/other.dm @@ -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) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index f719f74be84..12fce353b35 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -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) 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" diff --git a/icons/mob/hud/reagent.dmi b/icons/mob/hud/reagent.dmi index ff0dfb9c8c091e52ae341e2c79fc4e13f7ce333b..e89b1e9efe0b3a8d35f2efcc9039ae97699c81c3 100644 GIT binary patch delta 1000 zcmV2m=5B0B!b@ZvX%Qw2>ub ze*h9B04h=dM~cjC003>w|C}>3oc|ak05(zpT#5jT%mBOpGb8{2QUCyo007JY0RI3p zSRGnvBy5r@m%zZlvmLt52-l)0qTr$6>agnZ#PR>k|MsNGlmGw#0d!JMQvg8b*k%9# z0SbClSad{Xb7OL8aCB*JZU6vyoSl=we`>=p42I9~Q-t;!#*&Whw99B2J*=+~%&gQZ zwlyrfUH0^ITbA_D;ShY0#ApA%B)lx&Ht*YAx&GLSBX~w~n8wGIFPe*z#$L_t(|obB0NQ`$fjfMLQW3&al=Fe1`QMcaz4 z*vi<7{r~@~Y&I9Y*>f0oI+?-u8SY*%duB3Tob7ZJS+|z8)s4yXqKJ1@*V>-7wk!0$ z(g#W}OSxO=_o}Wv>h+GK2ORhN$5KBT3{IqeT9&6$9}b5p17vRG+-MYke+Aswx$#)& z6XzzAcrQ!m%2N3KncIEd{t9IyKS2BsWMe;o&?kNXq3Z*j?M8U}0Jb`xPR}bF?-#S# zh14(S^Gm7wS4ip~s@*5rRko_CX(c_Ns%A=`%e^d>-&aCcx$s}WwbzRx&yCst!~g&Q z0001Z7wYZ1u%EAM^8P=*f0)YZn&Jzu>a(Dv^pbZG$Jr2%}G1`waG z-VZeU_vite9zCE5J$k@g+3y!hSMLX!{kt$gO&Fji3?T3K3#F^~e*=C$?>F#L_ur6v ze7|pu-2Luf>fv@E-T?pr0001he|@}KB=tRfx?U!A+127Esqf)>d7IQ_i<{3$eGkjq zFG(E$00000003~HzTT~pdh701_es5VtNU+B{os9nSSR(?J**#-dh6DYKax5C00000 z0DyPt=hLR`BcyrSIy|?1gfyGyU;p<3zhAaVy>&0!*QDOM?dzYU4gdfE0002sK>Y;= WAT7EAq6P^70000wi_8Esod3K3Gguv3X(VitDwnezy3PpK zBme+X004>r0HP?O;Gy8^uT|OGKVZOygo*gFgJB3D_b5Sz`($* z8}noU0004WQchCy=W7i38{yY=tq{Q>V&7r*Z#;qU+e0;@?x zK~#90?cLc@6HydK;Z9C>1I=`j(2NQw$e;oWGN=K3|EIEt+@8I=vMU}F)+cw16xkG& zi~N-`Nff<)qZg|?m!?@3?oAaQuj=RdQl961p)V_aMd?K$_gs3sQ@X03f3Gertx8W| zZFzZ3>gy{j>r&q+iVdl6Zf=SP%3am-1Mdfe@Sm6;dOsWredPUU6z)ageNhOH-}2Sh z)LqpZ)CUSbU|1h0^ih4F(DehisuQN}s=VCZ+1W1haNphA+m-tM!NI=N>pxMczbmUR zt-DZHA<>62i9FW zaJKuNX0opZ4{&V{9*`>gUDj>i3wE=~z9t;l5Dt|0yR6&3H@gGdeJ=bmt?hTt$-Un8 zq~5N7;SK-*000000QhGIb(_Y5+-52kK*d-rJSn)`<*Q#ZSN z{Auc%ho@hr4gdfE000000000006_P<`nSk^Tz$iMfqU}&^7`_;z&&}begm%y+>__= zpRxEGn)4q2MZhKU|KV-z0000000000%$eA4-M{&L&?U~&VWaPN@%O>%Hx#wA4{H0M zwy(v0k+60E000000002y%>Vw;9P3AStovK+{ZJKqzccTDn%JN3Gw*+z*!!J*|I@_Y h@7VtU001!0{sLcuj_%r?nmzyk002ovPDHLkV1l)ZI-vjn