Merge pull request #5856 from Citadel-Station-13/upstream-merge-36242

[MIRROR] Small moodie balance changes

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

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"

code/datums/mood_events/generic_negative_events.dm

@@ -34,18 +34,18 @@
 
 /datum/mood_event/slipped
 	description = "<span class='warning'>I slipped. I should be more careful next time...</span>\n"
-	mood_change = -3
+	mood_change = -2
 	timeout = 1800
 
 /datum/mood_event/eye_stab
 	description = "<span class='boldwarning'>I used to be an adventurer like you, until I took a screwdriver to the eye.</span>\n"
-	mood_change = -6
-	timeout = 2400
+	mood_change = -4
+	timeout = 1800
 
 /datum/mood_event/delam //SM delamination
 	description = "<span class='boldwarning'>Those God damn engineers can't do anything right...</span>\n"
-	mood_change = -6
-	timeout = 3000
+	mood_change = -2
+	timeout = 2400
 
 /datum/mood_event/depression
 	description = "<span class='warning'>I feel sad for no particular reason.</span>\n"
@@ -60,7 +60,7 @@
 /datum/mood_event/dismembered
   description = "<span class='boldwarning'>AHH! I WAS USING THAT LIMB!</span>\n"
   mood_change = -8
-  timeout = 3000
+  timeout = 2400
 
 /datum/mood_event/noshoes
 	 description = "<span class='warning'>I am a disgrace to comedy everywhere!</span>\n"
@@ -68,7 +68,7 @@
 
 /datum/mood_event/tased
 	description = "<span class='warning'>There's no \"z\" in \"taser\". It's in the zap.</span>\n"
-	mood_change = -4
+	mood_change = -3
 	timeout = 1200
 
 /datum/mood_event/embedded

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)