From 014fe3a983b5c919ab73413e319d9e4205059166 Mon Sep 17 00:00:00 2001 From: John Doe Date: Wed, 17 Jul 2024 19:38:07 +0300 Subject: [PATCH] 1 --- code/__DEFINES/movespeed_modification.dm | 2 ++ code/game/objects/machinery/vending/vending_types.dm | 1 - code/modules/reagents/reagents/medical.dm | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/movespeed_modification.dm b/code/__DEFINES/movespeed_modification.dm index a23e4700e9e..692807c0fd3 100644 --- a/code/__DEFINES/movespeed_modification.dm +++ b/code/__DEFINES/movespeed_modification.dm @@ -14,6 +14,8 @@ #define MOVESPEED_ID_HUNTER_DISGUISE "HUNTER_DISGUISE" #define MOVESPEED_ID_MOB_WALK_RUN_CONFIG_SPEED "MOB_WALK_RUN" +#define MOVESPEED_ID_MOB_PARACETAMOL_SPEED "MOB_PARACETAMOL_RUN" +#define MOVESPEED_ID_MOB_NANITES_SPEED "MOB_NANITES_RUN" #define MOVESPEED_ID_MOB_GRAB_STATE "MOB_GRAB_STATE" #define MOVESPEED_ID_CONFIG_SPEEDMOD "MOB_CONFIG_MODIFIER" diff --git a/code/game/objects/machinery/vending/vending_types.dm b/code/game/objects/machinery/vending/vending_types.dm index ba371e352cd..11121ad1f49 100644 --- a/code/game/objects/machinery/vending/vending_types.dm +++ b/code/game/objects/machinery/vending/vending_types.dm @@ -200,7 +200,6 @@ /obj/item/reagent_containers/glass/bottle/oxycodone = 6, /obj/item/reagent_containers/glass/bottle/sleeptoxin = 6, /obj/item/reagent_containers/glass/bottle/polyhexanide = 6, - /obj/item/reagent_containers/glass/bottle/medicalnanites = 12, ), "Chemistry Equipment" = list( /obj/item/reagent_containers/syringe = -1, diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 103fe64aece..8ef9b7da109 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -104,6 +104,7 @@ L.AdjustUnconscious(-1 SECONDS) L.AdjustStun(-1 SECONDS) L.AdjustParalyzed(-1 SECONDS) + L.add_movespeed_modifier(MOVESPEED_ID_MOB_PARACETAMOL_SPEED, TRUE, 0, NONE, TRUE, 100) return ..() @@ -115,6 +116,9 @@ /datum/reagent/medicine/paracetamol/overdose_crit_process(mob/living/L, metabolism) L.apply_damage(3*effect_str, TOX) +/datum/reagent/medicine/paracetamol/on_mob_delete(mob/living/L, metabolism) + L.remove_movespeed_modifier(MOVESPEED_ID_MOB_PARACETAMOL_SPEED) + /datum/reagent/medicine/tramadol name = "Tramadol" description = "A simple, yet effective painkiller." @@ -230,7 +234,7 @@ description = "Kelotane is a drug used to treat burns." color = COLOR_REAGENT_KELOTANE scannable = TRUE - purge_list = list(/datum/reagent/medicine/ryetalyn, /datum/reagent/medicine/research/medicalnanites) + purge_list = list(/datum/reagent/medicine/ryetalyn,) purge_rate = 1.5 overdose_threshold = REAGENTS_OVERDOSE overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL @@ -1305,7 +1309,6 @@ /datum/reagent/medicine/tricordrazine, /datum/reagent/medicine/paracetamol, /datum/reagent/medicine/russian_red, - /datum/reagent/consumable/doctor_delight, ) purge_rate = 5 var/mob/living/carbon/human/host