Merge remote-tracking branch 'upstream/master' into wires-tgui

This commit is contained in:
SteelSlayer
2020-09-14 08:51:32 -05:00
236 changed files with 8002 additions and 1576 deletions
+1 -1
View File
@@ -104,7 +104,7 @@
/mob/living/carbon/human/get_leg_ignore()
if(flying == 1)
if(flying || floating)
return TRUE
var/obj/item/tank/jetpack/J