From 5d4a64a35a024c2ee0e9100e820f6e428eb6085b Mon Sep 17 00:00:00 2001
From: Casper3667 <8396443+Casper3667@users.noreply.github.com>
Date: Tue, 23 Jun 2026 18:37:15 +0200
Subject: [PATCH] Fixes that smoking while drinking causes hallucinations
 (#22759)

As per the title. Nicotine, being a subtype of mental meds, previously
caused hallucinations if a person was drunk while smoking.
---
 .../Chemistry-Reagents/Chemistry-Reagents-Medicine.dm       | 1 +
 html/changelogs/BoozeHallucination.yml                      | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 html/changelogs/BoozeHallucination.yml

diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
index 2cf06726216..5bf16785e34 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
@@ -1272,6 +1272,7 @@
 	messagedelay = MEDICATION_MESSAGE_DELAY * 0.75
 	goodmessage = list("You feel good.","You feel relaxed.","You feel alert and focused.")
 	value = 2
+	alchohol_affected = FALSE
 
 /singleton/reagent/mental/nicotine/overdose(var/mob/living/carbon/M, var/alien, var/removed, var/scale, var/datum/reagents/holder)
 	..()
diff --git a/html/changelogs/BoozeHallucination.yml b/html/changelogs/BoozeHallucination.yml
new file mode 100644
index 00000000000..c97b988c88d
--- /dev/null
+++ b/html/changelogs/BoozeHallucination.yml
@@ -0,0 +1,6 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - bugfix: "Smoking while drinking no longer risks hallucinations."