Merge branch 'master' into 11/19/2015_gun_modes

This commit is contained in:
Neerti
2015-11-19 07:36:09 -05:00
5 changed files with 88 additions and 78 deletions

View File

@@ -23,5 +23,5 @@
/datum/antagonist/proc/place_mob(var/mob/living/mob)
if(!starting_locations || !starting_locations.len)
return
var/turf/T = pick_mobless_turf_if_exists(mob)
var/turf/T = pick_mobless_turf_if_exists(starting_locations)
mob.forceMove(T)