cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-17 05:31:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

These are not Vorestation edits. (#4088)

Browse Source 
Y'all are confusing the shit out of us.
This commit is contained in:
Spades
2017-10-17 00:01:30 -04:00
committed by Anewbe
parent 7cdf8355a2
commit edfa947278
12 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/multiz/movement.dm
View File

@@ -57,10 +57,8 @@
if(!A.CanPass(src, start, 1.5, 0))
to_chat(src, "<span class='warning'>\The [A] blocks you.</span>")
return 0
//VOREStation Edit
if(!Move(destination))
return 0
//VOREStation Edit End
return 1
/mob/observer/zMove(direction)
@@ -199,7 +197,7 @@
/obj/structure/catwalk/CanFallThru(atom/movable/mover as mob|obj, turf/target as turf)
if(target.z < z)
return FALSE // TODO - Technically should be density = 1 and flags |= ON_BORDER
if(!isturf(mover.loc)) // VORESTATION EDIT. Feel free to do an upstream suggestion as well.
if(!isturf(mover.loc))
return FALSE // Only let loose floor items fall. No more snatching things off people's hands.
else
return TRUE
@@ -213,7 +211,7 @@
return TRUE // We don't block sideways or upward movement.
else if(istype(mover) && mover.checkpass(PASSGRILLE))
return TRUE // Anything small enough to pass a grille will pass a lattice
if(!isturf(mover.loc)) // VORESTATION EDIT. Feel free to do an upstream suggestion as well.
if(!isturf(mover.loc))
return FALSE // Only let loose floor items fall. No more snatching things off people's hands.
else
return FALSE // TODO - Technically should be density = 1 and flags |= ON_BORDER

3
code/modules/multiz/turf.dm
View File

@@ -85,13 +85,12 @@
bottom_turf.plane = src.plane
bottom_turf.color = below.color
underlays = list(bottom_turf)
// VOREStation Edit - Hack workaround to byond crash bug - Include the magic overlay holder object.
// Hack workaround to byond crash bug - Include the magic overlay holder object.
overlays += below.overlays
// if(below.overlay_holder)
// overlays += (below.overlays + below.overlay_holder.overlays)
// else
// overlays += below.overlays
// VOREStation Edit End
// get objects (not mobs, they are handled by /obj/zshadow)
var/list/o_img = list()

2
code/modules/multiz/zshadow.dm
View File

@@ -121,7 +121,7 @@
/mob/zshadow/set_typing_indicator(var/state)
if(!typing_indicator)
typing_indicator = new
typing_indicator.icon = 'icons/mob/talk.dmi' //VOREStation Edit - Looks better on the right with job icons.
typing_indicator.icon = 'icons/mob/talk.dmi' // Looks better on the right with job icons.
typing_indicator.icon_state = "typing"
if(state && !typing)
overlays += typing_indicator