July 5th TG sync (#1883)

July 5th TG sync
2017-07-05 22:14:19 -05:00
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
@@ -207,7 +207,7 @@
 /obj/effect/particle_effect/smoke/sleeping/smoke_mob(mob/living/carbon/M)
 	if(..())
 		M.drop_item()
-		M.Sleeping(max(M.sleeping,10))
+		M.Sleeping(200)
 		M.emote("cough")
 		return 1