diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index 753ee75af3..71267e272f 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -93,9 +93,9 @@
#define MOOD_LEVEL_HAPPY1 2
#define MOOD_LEVEL_NEUTRAL 0
#define MOOD_LEVEL_SAD1 -3
-#define MOOD_LEVEL_SAD2 -10
-#define MOOD_LEVEL_SAD3 -15
-#define MOOD_LEVEL_SAD4 -20
+#define MOOD_LEVEL_SAD2 -12
+#define MOOD_LEVEL_SAD3 -18
+#define MOOD_LEVEL_SAD4 -26
//Beauty levels of areas for carbons
#define BEAUTY_LEVEL_HORRID -50
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index 57186c26d1..87f5b8d293 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -44,6 +44,7 @@
#define TRAIT_NOCRITDAMAGE "no_crit"
+
#define TRAIT_ALCOHOL_TOLERANCE "alcohol_tolerance"
#define TRAIT_AGEUSIA "ageusia"
#define TRAIT_HEAVY_SLEEPER "heavy_sleeper"
diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm
index afb58bf379..786131b7fc 100644
--- a/code/datums/mood_events/generic_negative_events.dm
+++ b/code/datums/mood_events/generic_negative_events.dm
@@ -34,18 +34,18 @@
/datum/mood_event/slipped
description = "I slipped. I should be more careful next time...\n"
- mood_change = -3
+ mood_change = -2
timeout = 1800
/datum/mood_event/eye_stab
description = "I used to be an adventurer like you, until I took a screwdriver to the eye.\n"
- mood_change = -6
- timeout = 2400
+ mood_change = -4
+ timeout = 1800
/datum/mood_event/delam //SM delamination
description = "Those God damn engineers can't do anything right...\n"
- mood_change = -6
- timeout = 3000
+ mood_change = -2
+ timeout = 2400
/datum/mood_event/depression
description = "I feel sad for no particular reason.\n"
@@ -60,7 +60,7 @@
/datum/mood_event/dismembered
description = "AHH! I WAS USING THAT LIMB!\n"
mood_change = -8
- timeout = 3000
+ timeout = 2400
/datum/mood_event/noshoes
description = "I am a disgrace to comedy everywhere!\n"
@@ -68,7 +68,7 @@
/datum/mood_event/tased
description = "There's no \"z\" in \"taser\". It's in the zap.\n"
- mood_change = -4
+ mood_change = -3
timeout = 1200
/datum/mood_event/embedded
diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index a3123159f5..c070c1a6ea 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -99,6 +99,7 @@
return 0
/obj/effect/decal/cleanable/Destroy()
+ . = ..()
if(src.loc && isturf(src.loc))
var/area/A = get_area(src)
A.beauty -= beauty / max(1, A.areasize)