Revert "Merge branch 'master' into cumcom"

This reverts commit 05c4645c35, reversing
changes made to d3867f491b.
This commit is contained in:
Dahlular
2021-04-29 17:44:13 -06:00
parent 05c4645c35
commit c2cc5c49c6
97 changed files with 4888 additions and 5346 deletions
-6
View File
@@ -46,12 +46,6 @@
//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]),
-2
View File
@@ -12,7 +12,6 @@
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))
@@ -92,7 +91,6 @@
mood += event.mood_change
if(!event.hidden)
shown_mood += event.mood_change
mood *= mood_modifier
shown_mood *= mood_modifier