Merge pull request #1094 from Citadel-Station-13/upstream-merge-27488

[MIRROR] Fixes jetpacks working indoors/in areas with gravity
2017-05-22 08:25:30 -05:00
parent 8572dc2da8 9f75c7b317
commit b2a0fe64af
1 changed files with 0 additions and 6 deletions
--- a/code/game/objects/items/weapons/tanks/jetpack.dm
+++ b/code/game/objects/items/weapons/tanks/jetpack.dm
@@ -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 ..()