From 84ac06c98651abdd2f97cdc269120f5bde0cb055 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sat, 31 Mar 2018 04:07:29 -0700
Subject: [PATCH] Yeah no

---
 code/datums/components/mood.dm                | 19 ++++++----
 .../effects/decals/cleanable/aliens.dm        |  2 +-
 .../effects/decals/cleanable/humans.dm        |  2 +-
 .../objects/effects/decals/cleanable/misc.dm  | 38 +++++++++----------
 .../effects/decals/cleanable/robots.dm        |  2 +-
 5 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm
index 375370f08f..5ec2db38bd 100644
--- a/code/datums/components/mood.dm
+++ b/code/datums/components/mood.dm
@@ -117,12 +117,12 @@
 			owner.overlay_fullscreen("depression", /obj/screen/fullscreen/depression, 3)
 			update_mood_icon()
 			if(prob(7))
-				owner.playsound_local(null, pick(CREEPY_SOUNDS), 100, 1)
+				owner.playsound_local(null, pick(CREEPY_SOUNDS), 40, 1)
 			soundloop.start()
 		if(SANITY_INSANE to SANITY_UNSTABLE)
 			owner.overlay_fullscreen("depression", /obj/screen/fullscreen/depression, 2)
 			if(prob(3))
-				owner.playsound_local(null, pick(CREEPY_SOUNDS), 60, 1)
+				owner.playsound_local(null, pick(CREEPY_SOUNDS), 20, 1)
 			soundloop.stop()
 		if(SANITY_UNSTABLE to SANITY_DISTURBED)
 			owner.overlay_fullscreen("depression", /obj/screen/fullscreen/depression, 1)
@@ -133,13 +133,13 @@
 
 	switch(mood_level)
 		if(1)
-			DecreaseSanity(0.4)
+			DecreaseSanity(0.2, 0)
 		if(2)
-			DecreaseSanity(0.25)
+			DecreaseSanity(0.125, 25)
 		if(3)
-			DecreaseSanity(0.15)
+			DecreaseSanity(0.075, 50)
 		if(4)
-			DecreaseSanity(0.05)
+			DecreaseSanity(0.025, 75)
 		if(5)
 			IncreaseSanity(0.1)
 		if(6)
@@ -164,8 +164,11 @@
 	if(A)
 		update_beauty(A)
 
-/datum/component/mood/proc/DecreaseSanity(amount)
-	sanity = max(0, sanity - amount)
+/datum/component/mood/proc/DecreaseSanity(amount, limit = 0)
+	if(sanity < limit) //This might make KevinZ stop fucking pinging me.
+		IncreaseSanity(0.5)
+	else
+		sanity = max(0, sanity - amount)
 
 /datum/component/mood/proc/IncreaseSanity(amount, limit = 99)
 	if(sanity > limit)
diff --git a/code/game/objects/effects/decals/cleanable/aliens.dm b/code/game/objects/effects/decals/cleanable/aliens.dm
index f93d5b5f44..d34fac1b9d 100644
--- a/code/game/objects/effects/decals/cleanable/aliens.dm
+++ b/code/game/objects/effects/decals/cleanable/aliens.dm
@@ -8,7 +8,7 @@
 	random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
 	bloodiness = MAX_SHOE_BLOODINESS
 	blood_state = BLOOD_STATE_XENO
-	beauty = -250
+	beauty = -75
 
 /obj/effect/decal/cleanable/xenoblood/Initialize()
 	. = ..()
diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm
index 215a012b64..0b6818c97b 100644
--- a/code/game/objects/effects/decals/cleanable/humans.dm
+++ b/code/game/objects/effects/decals/cleanable/humans.dm
@@ -6,7 +6,7 @@
 	random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
 	blood_state = BLOOD_STATE_HUMAN
 	bloodiness = MAX_SHOE_BLOODINESS
-	beauty = -250
+	beauty = -60
 
 /obj/effect/decal/cleanable/blood/replace_decal(obj/effect/decal/cleanable/blood/C)
 	C.add_blood_DNA(return_blood_DNA())
diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm
index 53e368ea64..bd0048a3bd 100644
--- a/code/game/objects/effects/decals/cleanable/misc.dm
+++ b/code/game/objects/effects/decals/cleanable/misc.dm
@@ -3,7 +3,7 @@
 	desc = "Someone should clean that up."
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "shards"
-	beauty = -300
+	beauty = -50
 
 /obj/effect/decal/cleanable/ash
 	name = "ashes"
@@ -11,7 +11,7 @@
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "ash"
 	mergeable_decal = FALSE
-	beauty = -300
+	beauty = -50
 
 /obj/effect/decal/cleanable/ash/Initialize()
 	. = ..()
@@ -26,7 +26,7 @@
 /obj/effect/decal/cleanable/ash/large
 	name = "large pile of ashes"
 	icon_state = "big_ash"
-	beauty = -300
+	beauty = -100
 
 /obj/effect/decal/cleanable/ash/large/Initialize()
 	. = ..()
@@ -37,7 +37,7 @@
 	desc = "Back to sand."
 	icon = 'icons/obj/shards.dmi'
 	icon_state = "tiny"
-	beauty = -125
+	beauty = -60
 
 /obj/effect/decal/cleanable/glass/Initialize()
 	. = ..()
@@ -51,20 +51,20 @@
 	desc = "Someone should clean that up."
 	icon_state = "dirt"
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-	beauty = -300
+	beauty = -50
 
 /obj/effect/decal/cleanable/flour
 	name = "flour"
 	desc = "It's still good. Four second rule!"
 	icon_state = "flour"
-	beauty = -100
+	beauty = -50
 
 /obj/effect/decal/cleanable/greenglow
 	name = "glowing goo"
 	desc = "Jeez. I hope that's not for lunch."
 	light_color = LIGHT_COLOR_GREEN
 	icon_state = "greenglow"
-	beauty = -200
+	beauty = -150
 
 /obj/effect/decal/cleanable/greenglow/Initialize(mapload)
 	. = ..()
@@ -80,7 +80,7 @@
 	layer = WALL_OBJ_LAYER
 	icon_state = "cobweb1"
 	resistance_flags = FLAMMABLE
-	beauty = -300
+	beauty = -50
 
 /obj/effect/decal/cleanable/cobweb/cobweb2
 	icon_state = "cobweb2"
@@ -92,12 +92,12 @@
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "molten"
 	mergeable_decal = FALSE
-	beauty = -300
+	beauty = -100
 
 /obj/effect/decal/cleanable/molten_object/large
 	name = "big gooey grey mass"
 	icon_state = "big_molten"
-	beauty = -450
+	beauty = -250
 
 //Vomit (sorry)
 /obj/effect/decal/cleanable/vomit
@@ -106,7 +106,7 @@
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "vomit_1"
 	random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4")
-	beauty = -600
+	beauty = -200
 
 /obj/effect/decal/cleanable/vomit/attack_hand(mob/user)
 	if(ishuman(user))
@@ -138,14 +138,14 @@
 	gender = NEUTER
 	icon = 'icons/effects/tomatodecal.dmi'
 	random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")
-	beauty = -125
+	beauty = -50
 
 /obj/effect/decal/cleanable/plant_smudge
 	name = "plant smudge"
 	gender = NEUTER
 	icon = 'icons/effects/tomatodecal.dmi'
 	random_icon_states = list("smashed_plant")
-	beauty = -125
+	beauty = -50
 
 /obj/effect/decal/cleanable/egg_smudge
 	name = "smashed egg"
@@ -153,7 +153,7 @@
 	gender = NEUTER
 	icon = 'icons/effects/tomatodecal.dmi'
 	random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3")
-	beauty = -125
+	beauty = -50
 
 /obj/effect/decal/cleanable/pie_smudge //honk
 	name = "smashed pie"
@@ -161,7 +161,7 @@
 	gender = NEUTER
 	icon = 'icons/effects/tomatodecal.dmi'
 	random_icon_states = list("smashed_pie")
-	beauty = -200
+	beauty = -50
 
 /obj/effect/decal/cleanable/chem_pile
 	name = "chemical pile"
@@ -169,7 +169,7 @@
 	gender = NEUTER
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "ash"
-	beauty = -200
+	beauty = -60
 
 /obj/effect/decal/cleanable/shreds
 	name = "shreds"
@@ -177,7 +177,7 @@
 	icon_state = "shreds"
 	gender = PLURAL
 	mergeable_decal = FALSE
-	beauty = -200
+	beauty = -75
 
 /obj/effect/decal/cleanable/shreds/ex_act(severity, target)
 	if(severity == 1) //so shreds created during an explosion aren't deleted by the explosion.
@@ -194,14 +194,14 @@
 	icon = 'icons/effects/tomatodecal.dmi'
 	icon_state = "salt_pile"
 	gender = NEUTER
-	beauty = -125
+	beauty = -50
 
 /obj/effect/decal/cleanable/glitter
 	name = "generic glitter pile"
 	desc = "The herpes of arts and crafts."
 	icon = 'icons/effects/tile_effects.dmi'
 	gender = NEUTER
-	beauty = 300
+	beauty = 100
 
 /obj/effect/decal/cleanable/glitter/pink
 	name = "pink glitter"
diff --git a/code/game/objects/effects/decals/cleanable/robots.dm b/code/game/objects/effects/decals/cleanable/robots.dm
index 91956fdb65..b764e1f0ce 100644
--- a/code/game/objects/effects/decals/cleanable/robots.dm
+++ b/code/game/objects/effects/decals/cleanable/robots.dm
@@ -10,7 +10,7 @@
 	blood_state = BLOOD_STATE_OIL
 	bloodiness = MAX_SHOE_BLOODINESS
 	mergeable_decal = FALSE
-	beauty = -200
+	beauty = -100
 
 /obj/effect/decal/cleanable/robot_debris/proc/streak(list/directions)
 	set waitfor = 0