Merge branch 'master' into upstream-merge-29940

2017-08-21 23:29:24 -05:00
parent 87b3df3069 b5e7f7f7fe
commit a0cf777040
364 changed files with 4317 additions and 3134 deletions
@@ -61,6 +61,7 @@
 	if(!gibbed)
 		GLOB.dead_mob_list += src
 	set_drugginess(0)
+	set_disgust(0)
 	SetSleeping(0, 0)
 	blind_eyes(1)
 	reset_perspective(null)