Merge remote-tracking branch 'citadel/master' into mobility_flags

2020-01-19 16:18:12 -07:00
parent a4e2591223 92ead7e65d
commit f85527ab4b
320 changed files with 5694 additions and 2936 deletions
@@ -103,7 +103,7 @@
 		visible_message("<span class='notice'>[src] [resting? "lays down for a moment..." : "perks up from the ground"]</span>")
 	update_icon()

-/mob/living/silicon/pai/start_pulling(atom/movable/AM, gs)
+/mob/living/silicon/pai/start_pulling(atom/movable/AM, state, force = move_force, supress_message = FALSE)
 	if(ispAI(AM))
 		return ..()
 	return FALSE