diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm
index 53450294b47..7ca29a6b89d 100644
--- a/code/modules/reagents/chemistry/reagents/drugs.dm
+++ b/code/modules/reagents/chemistry/reagents/drugs.dm
@@ -976,7 +976,7 @@
 	return list(0, update_flags)
 
 //Servo Lube, supercharge
-/datum/reagent/lube/ultra/combat
+/datum/reagent/lube/combat
 	name = "Combat-Lube"
 	id = "combatlube"
 	description = "Combat-Lube is a refined and enhanced lubricant which induces effect stronger than Methamphetamine in synthetic users by drastically reducing internal friction and increasing cooling capabilities."
@@ -984,7 +984,10 @@
 	addiction_chance = 1
 	addiction_chance_additional = 20
 
-/datum/reagent/lube/ultra/combat/on_mob_life(mob/living/M)
+/datum/reagent/lube/combat/on_mob_add(mob/living/L)
+	ADD_TRAIT(L, TRAIT_GOTTAGOFAST, id)
+
+/datum/reagent/lube/combat/on_mob_life(mob/living/M)
 	M.SetSleeping(0)
 	M.SetDrowsy(0)
 
@@ -993,5 +996,25 @@
 		high_message = "0100011101001111010101000101010001000001010001110100111101000110010000010101001101010100!"
 	if(prob(5))
 		to_chat(M, "<span class='notice'>[high_message]</span>")
+	return ..()
+
+/datum/reagent/lube/combat/on_mob_delete(mob/living/M)
+	REMOVE_TRAIT(M, TRAIT_GOTTAGOFAST, id)
+	..()
+
+/datum/reagent/lube/combat/overdose_process(mob/living/M, severity)
+	var/list/overdose_info = ..()
+	var/effect = overdose_info[REAGENT_OVERDOSE_EFFECT]
+	var/update_flags = overdose_info[REAGENT_OVERDOSE_FLAGS]
+	if(prob(20))
+		M.emote("ping")
+	if(prob(33))
+		M.visible_message("<span class='danger'>[M]'s hands flip out and flail everywhere!</span>")
+		var/obj/item/I = M.get_active_hand()
+		if(I)
+			M.drop_item()
+	update_flags |= M.adjustFireLoss(5, FALSE)
+	update_flags |= M.adjustBrainLoss(3, FALSE)
+	return list(effect, update_flags)
 
 #undef DRAWBACK_CHANCE_MODIFIER