From c2f7b80c8f85be17c2eb3b918bdb8b06fcd45126 Mon Sep 17 00:00:00 2001
From: Mickyan <38563876+Mickyan@users.noreply.github.com>
Date: Sun, 5 Aug 2018 02:27:50 +0200
Subject: [PATCH] Being drunk improves mood (#39525)

At last, the bartender finds his purpose. This may be a bit strong but I think
making the bar the best place to go to improve mood is a good thing.
---
 code/datums/mood_events/drug_events.dm | 5 +++++
 code/modules/mob/living/carbon/life.dm | 1 +
 2 files changed, 6 insertions(+)

diff --git a/code/datums/mood_events/drug_events.dm b/code/datums/mood_events/drug_events.dm
index 5d585ab6b27..4fef1f514b3 100644
--- a/code/datums/mood_events/drug_events.dm
+++ b/code/datums/mood_events/drug_events.dm
@@ -2,6 +2,11 @@
 	mood_change = 6
 	description = "<span class='nicegreen'>Woooow duudeeeeee...I'm tripping baaalls...</span>\n"
 
+/datum/mood_event/drugs/drunk
+	mood_change = 4
+	description = "<span class='nicegreen'>Everything just feels better after a drink or two.</span>\n"
+	timeout = 3000
+
 /datum/mood_event/drugs/smoked
 	description = "<span class='nicegreen'>I have had a smoke recently.</span>\n"
 	mood_change = 2
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 00b895a601d..2ce03eaa7ca 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -424,6 +424,7 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
 	if(drunkenness)
 		drunkenness = max(drunkenness - (drunkenness * 0.04), 0)
 		if(drunkenness >= 6)
+			SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "drunk", /datum/mood_event/drugs/drunk)
 			if(prob(25))
 				slurring += 2
 			jitteriness = max(jitteriness - 3, 0)