1

PMC-Unga-Marines · Jul 17, 2024 · 014fe3a · 014fe3a
1 parent a81aaa0
commit 014fe3a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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