From 52eaaf5003a9a270f47d52a4d1396913746fa2c7 Mon Sep 17 00:00:00 2001
From: AzuleUtama <44248086+AzuleUtama@users.noreply.github.com>
Date: Wed, 16 Sep 2020 19:40:04 +0100
Subject: [PATCH] Reworks minor addictions for all addiction stages (#14297)

---
 code/modules/reagents/chemistry/reagents.dm | 79 ++++++++++++---------
 1 file changed, 46 insertions(+), 33 deletions(-)

diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm
index 7f0ed2c91dc..c5ef03040b4 100644
--- a/code/modules/reagents/chemistry/reagents.dm
+++ b/code/modules/reagents/chemistry/reagents.dm
@@ -144,56 +144,69 @@
 	return STATUS_UPDATE_NONE
 
 /datum/reagent/proc/addiction_act_stage2(mob/living/M)
-	if(prob(8))
-		M.emote("shiver")
-	if(prob(8))
-		M.emote("sneeze")
-	if(prob(4))
-		to_chat(M, "<span class='notice'>You feel a dull headache.</span>")
+	if(minor_addiction)
+		if(prob(4))
+			to_chat(M, "<span class='notice'>You briefly think about getting some more [name].</span>")
+	else
+		if(prob(8))
+			M.emote("shiver")
+		if(prob(8))
+			M.emote("sneeze")
+		if(prob(4))
+			to_chat(M, "<span class='notice'>You feel a dull headache.</span>")
 	return STATUS_UPDATE_NONE
 
 /datum/reagent/proc/addiction_act_stage3(mob/living/M)
-	if(prob(8))
-		M.emote("twitch_s")
-	if(prob(8))
-		M.emote("shiver")
-	if(prob(4))
-		to_chat(M, "<span class='warning'>Your head hurts.</span>")
-	if(prob(4))
-		to_chat(M, "<span class='warning'>You begin craving [name]!</span>")
+	if(minor_addiction)
+		if(prob(4))
+			to_chat(M, "<span class='notice'>You could really go for some [name] right now.</span>")
+	else
+		if(prob(8))
+			M.emote("twitch_s")
+		if(prob(8))
+			M.emote("shiver")
+		if(prob(4))
+			to_chat(M, "<span class='warning'>Your head hurts.</span>")
+		if(prob(4))
+			to_chat(M, "<span class='warning'>You begin craving [name]!</span>")
 	return STATUS_UPDATE_NONE
 
 /datum/reagent/proc/addiction_act_stage4(mob/living/M)
-	if(prob(8))
-		M.emote("twitch")
-	if(prob(4))
-		to_chat(M, "<span class='warning'>You have a pounding headache.</span>")
-	if(prob(4))
-		to_chat(M, "<span class='warning'>You have the strong urge for some [name]!</span>")
-	else if(prob(4))
-		to_chat(M, "<span class='warning'>You REALLY crave some [name]!</span>")
+	if(minor_addiction)
+		if(prob(8))
+			to_chat(M, "<span class='notice'>You could really go for some [name] right now.</span>")
+	else
+		if(prob(8))
+			M.emote("twitch")
+		if(prob(4))
+			to_chat(M, "<span class='warning'>You have a pounding headache.</span>")
+		if(prob(4))
+			to_chat(M, "<span class='warning'>You have the strong urge for some [name]!</span>")
+		else if(prob(4))
+			to_chat(M, "<span class='warning'>You REALLY crave some [name]!</span>")
 	return STATUS_UPDATE_NONE
 
 /datum/reagent/proc/addiction_act_stage5(mob/living/M)
 	var/update_flags = STATUS_UPDATE_NONE
 	if(minor_addiction)
-		if(prob(6))
-			M.AdjustSlowed(3)
-			to_chat(M, "<span class='warning'>You feel [pick("tired", "exhausted", "sluggish")].</span>")
+		if(prob(8))
+			to_chat(M, "<span class='notice'>You can't stop thinking about [name]...</span>")
+		if(prob(4))
+			M.emote(pick("twitch"))
 	else
 		if(prob(6))
 			to_chat(M, "<span class='warning'>Your stomach lurches painfully!</span>")
 			M.visible_message("<span class='warning'>[M] gags and retches!</span>")
 			update_flags |= M.Stun(rand(2,4), FALSE)
 			update_flags |= M.Weaken(rand(2,4), FALSE)
-	if(prob(8))
-		M.emote(pick("twitch", "twitch_s", "shiver"))
-	if(prob(4))
-		to_chat(M, "<span class='warning'>Your head is killing you!</span>")
-	if(prob(5))
-		to_chat(M, "<span class='warning'>You feel like you can't live without [name]!</span>")
-	else if(prob(5))
-		to_chat(M, "<span class='warning'>You would DIE for some [name] right now!</span>")
+		if(prob(8))
+			M.emote(pick("twitch", "twitch_s", "shiver"))
+		if(prob(4))
+			to_chat(M, "<span class='warning'>Your head is killing you!</span>")
+		if(prob(5))
+			to_chat(M, "<span class='warning'>You feel like you can't live without [name]!</span>")
+		else if(prob(5))
+			to_chat(M, "<span class='warning'>You would DIE for some [name] right now!</span>")
 	return update_flags
 
 /datum/reagent/proc/fakedeath(mob/living/M)