From 43f0e526ba23953b0a4ca9987a473ee2fb6b7a9c Mon Sep 17 00:00:00 2001
From: Theos <theubernyan@gmail.com>
Date: Sat, 18 Jan 2020 01:29:55 -0500
Subject: [PATCH 1/3] smoking is now bad for you

---
 .../chemistry/reagents/drug_reagents.dm       | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index 7c74a8347f58..8c6db432ee85 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -63,6 +63,47 @@
 	..()
 	. = 1
 
+/datum/reagent/drug/crank/overdose_process(mob/living/M)
+	M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2*REM)
+	M.adjustToxLoss(2*REM, 0)
+	M.adjustBruteLoss(2*REM, FALSE, FALSE, BODYPART_ORGANIC)
+	..()
+	. = 1
+
+/datum/reagent/drug/nicotine/addiction_act_stage1(mob/living/M)
+	M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 1*REM)
+	..()
+
+/datum/reagent/drug/nicotine/addiction_act_stage2(mob/living/M)
+	if(prob(20) && iscarbon(M))
+		M.Jitter(10)
+		var/obj/item/I = M.get_active_held_item()
+		if(I && M.dropItemToGround(I))
+			to_chat(M, "<span class ='notice'>Your hands spaz out and you drop what you were holding!</span>")
+	M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 2*REM)
+	..()
+	. = 1
+
+/datum/reagent/drug/nicotine/addiction_act_stage3(mob/living/M)
+	if(prob(20) && iscarbon(M))
+		M.Jitter(10)
+		var/obj/item/I = M.get_active_held_item()
+		if(I && M.dropItemToGround(I))
+			to_chat(M, "<span class ='notice'>Your hands spaz out and you drop what you were holding!</span>")
+	M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 3*REM)
+	..()
+	. = 1
+
+/datum/reagent/drug/nicotine/addiction_act_stage4(mob/living/M)
+	if(prob(40) && iscarbon(M))
+		M.Jitter(10)
+		var/obj/item/I = M.get_active_held_item()
+		if(I && M.dropItemToGround(I))
+			to_chat(M, "<span class ='notice'>Your hands spaz out and you drop what you were holding!</span>")
+	M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 3*REM)
+	..()
+	. = 1
+
 /datum/reagent/drug/crank
 	name = "Crank"
 	description = "Reduces stun times by about 200%. If overdosed or addicted it will deal significant Toxin, Brute and Brain damage."

From 836a6656d654d682b95029667c705d7156fb4f1e Mon Sep 17 00:00:00 2001
From: Theos <theubernyan@gmail.com>
Date: Sat, 18 Jan 2020 01:31:14 -0500
Subject: [PATCH 2/3] this never happened

---
 code/modules/reagents/chemistry/reagents/drug_reagents.dm | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index 8c6db432ee85..9cd1cb8def10 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -63,13 +63,6 @@
 	..()
 	. = 1
 
-/datum/reagent/drug/crank/overdose_process(mob/living/M)
-	M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2*REM)
-	M.adjustToxLoss(2*REM, 0)
-	M.adjustBruteLoss(2*REM, FALSE, FALSE, BODYPART_ORGANIC)
-	..()
-	. = 1
-
 /datum/reagent/drug/nicotine/addiction_act_stage1(mob/living/M)
 	M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 1*REM)
 	..()

From 0e2032a91de6abdc95c3d89d954ba1fe60029dbc Mon Sep 17 00:00:00 2001
From: Theos <theubernyan@gmail.com>
Date: Sat, 18 Jan 2020 01:35:39 -0500
Subject: [PATCH 3/3] organ damage change

---
 .../reagents/chemistry/reagents/drug_reagents.dm       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index 9cd1cb8def10..0f3ac66e27b0 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -60,11 +60,16 @@
 /datum/reagent/drug/nicotine/overdose_process(mob/living/M)
 	M.adjustToxLoss(0.1*REM, 0)
 	M.adjustOxyLoss(1.1*REM, 0)
+	M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 2*REM)
 	..()
 	. = 1
 
 /datum/reagent/drug/nicotine/addiction_act_stage1(mob/living/M)
-	M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 1*REM)
+	if(prob(5) && iscarbon(M))
+		M.Jitter(10)
+		var/obj/item/I = M.get_active_held_item()
+		if(I && M.dropItemToGround(I))
+			to_chat(M, "<span class ='notice'>Your hands spaz out and you drop what you were holding!</span>")
 	..()
 
 /datum/reagent/drug/nicotine/addiction_act_stage2(mob/living/M)
@@ -73,7 +78,6 @@
 		var/obj/item/I = M.get_active_held_item()
 		if(I && M.dropItemToGround(I))
 			to_chat(M, "<span class ='notice'>Your hands spaz out and you drop what you were holding!</span>")
-	M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 2*REM)
 	..()
 	. = 1
 
@@ -83,7 +87,6 @@
 		var/obj/item/I = M.get_active_held_item()
 		if(I && M.dropItemToGround(I))
 			to_chat(M, "<span class ='notice'>Your hands spaz out and you drop what you were holding!</span>")
-	M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 3*REM)
 	..()
 	. = 1
 
@@ -93,7 +96,6 @@
 		var/obj/item/I = M.get_active_held_item()
 		if(I && M.dropItemToGround(I))
 			to_chat(M, "<span class ='notice'>Your hands spaz out and you drop what you were holding!</span>")
-	M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 3*REM)
 	..()
 	. = 1