Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27344

2017-05-22 11:52:18 -05:00
parent 7e2cebe1db 1d8f9b31ee
commit d1db0044d1
24 changed files with 59158 additions and 59128 deletions
@@ -207,9 +207,3 @@
 		var/obj/item/clothing/suit/space/hardsuit/C = wear_suit
 		J = C.jetpack
 	return J
-
-/mob/has_gravity(turf/T)
-	var/obj/item/weapon/tank/jetpack/J = get_jetpack()
-	if(J && J.on)
-		return FALSE
-	return ..()