Revert "Revert "Merge branch 'master' into cumcom""

This reverts commit c2cc5c49c6.

code/datums/components/footstep.dm

@@ -46,6 +46,12 @@
 
 	//begin playsound shenanigans//
 
+	//for big characters, add alittle boom
+	if(LM.size_multiplier > 1.5)
+		var/stompsound = pick( 'sound/effects/footstep/giant1.ogg','sound/effects/footstep/giant2.ogg')
+		var/giantvolume = LM.size_multiplier * 9
+		playsound(T, stompsound, giantvolume)
+
 	//for barefooted non-clawed mobs like monkeys
 	if(isbarefoot(LM))
 		playsound(T, pick(GLOB.barefootstep[T.barefootstep][1]),

code/datums/components/mood.dm

@@ -12,6 +12,7 @@
 	var/insanity_effect = 0 //is the owner being punished for low mood? If so, how much?
 	var/holdmyinsanityeffect = 0 //before we edit our sanity lets take a look
 	var/obj/screen/mood/screen_obj
+	var/lastupdate = 0
 
 /datum/component/mood/Initialize()
 	if(!isliving(parent))
@@ -91,6 +92,7 @@
 		mood += event.mood_change
 		if(!event.hidden)
 			shown_mood += event.mood_change
+
 	mood *= mood_modifier
 	shown_mood *= mood_modifier