Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into freegolems

This commit is contained in:
datlo
2019-02-05 02:51:51 +00:00
5 changed files with 45 additions and 39 deletions
+1 -1
View File
@@ -70,7 +70,7 @@ var/list/chemical_mob_spawn_nicecritters = list() // and possible friendly mobs
if(istype(X, /obj/effect))
continue //stop pulling smoke and hotspots please
if(istype(X, /atom/movable))
if((X) && !X.anchored)
if((X) && !X.anchored && X.move_resist <= MOVE_FORCE_DEFAULT)
if(setting_type)
playsound(T, 'sound/effects/bang.ogg', 25, 1)
for(var/i = 0, i < pull_times, i++)