Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
This commit is contained in:
Leshana
2018-04-15 14:19:36 -04:00
59 changed files with 1608 additions and 304 deletions

View File

@@ -86,6 +86,9 @@
/mob/living/carbon/human/can_overcome_gravity()
return species && species.can_overcome_gravity(src)
/mob/living/simple_animal/construct/can_overcome_gravity()
return 1 //They care not for standard physics.
/mob/observer/zMove(direction)
var/turf/destination = (direction == UP) ? GetAbove(src) : GetBelow(src)
if(destination)
@@ -116,6 +119,9 @@
/mob/observer/can_ztravel()
return 1
/mob/living/simple_animal/construct/can_ztravel()
return 1
/mob/living/carbon/human/can_ztravel()
if(incapacitated())
return 0
@@ -263,6 +269,9 @@
/mob/living/simple_animal/hostile/carp/can_fall() // So can carp apparently.
return FALSE
/mob/living/simple_animal/construct/can_fall() //As do Constructs.
return FALSE
// Check if this atom prevents things standing on it from falling. Return TRUE to allow the fall.
/obj/proc/CanFallThru(atom/movable/mover as mob|obj, turf/target as turf)
if(!isturf(mover.loc)) // VORESTATION EDIT. We clearly didn't have enough backup checks.