Merge pull request #7888 from Citadel-Station-13/kevinz000-patch-5

Reworks ephedrine
2019-01-14 21:37:45 -05:00
parent 9047538620 246d6b391f
commit 5ebc570c7a
1 changed files with 4 additions and 9 deletions
@@ -546,19 +546,14 @@
 	overdose_threshold = 45
 	addiction_threshold = 30

-/datum/reagent/medicine/ephedrine/on_mob_add(mob/living/L)
-	..()
-	L.add_trait(TRAIT_GOTTAGOFAST, id)
-
-/datum/reagent/medicine/ephedrine/on_mob_delete(mob/living/L)
-	L.remove_trait(TRAIT_GOTTAGOFAST, id)
-	..()
-
 /datum/reagent/medicine/ephedrine/on_mob_life(mob/living/carbon/M)
 	M.AdjustStun(-20, 0)
 	M.AdjustKnockdown(-20, 0)
 	M.AdjustUnconscious(-20, 0)
-	M.adjustStaminaLoss(-1*REM, 0)
+	M.adjustStaminaLoss(-4.5*REM, 0)
+	M.Jitter(10)
+	if(prob(50))
+		M.confused = max(M.confused, 1)
 	..()
 	return TRUE