cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-12 07:35:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4542 from Verkister/yeehowlayer

Browse Source 
Fixes some layering issues on taur/borg riding.
This commit is contained in:
Spades
2018-12-12 21:18:52 -05:00
committed by GitHub
parent 9393a57729 700a62dfee
commit d46b03c2ca
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot_vr.dm
+5 -11
View File
@@ -133,13 +133,7 @@
only_one_driver = TRUE // If true, only the person in 'front' (first on list of riding mobs) can drive.
/datum/riding/dogborg/handle_vehicle_layer()
if(ridden.has_buckled_mobs())
if(ridden.dir != NORTH)
ridden.layer = ABOVE_MOB_LAYER
else
ridden.layer = initial(ridden.layer)
else
ridden.layer = initial(ridden.layer)
ridden.layer = initial(ridden.layer)
/datum/riding/dogborg/ride_check(mob/living/M)
var/mob/living/L = ridden
@@ -158,10 +152,10 @@
var/scale = L.size_multiplier
var/list/values = list(
"[NORTH]" = list(0, 8*scale, ABOVE_MOB_LAYER),
"[SOUTH]" = list(0, 8*scale, BELOW_MOB_LAYER),
"[EAST]" = list(-5*scale, 8*scale, ABOVE_MOB_LAYER),
"[WEST]" = list(5*scale, 8*scale, ABOVE_MOB_LAYER))
"[NORTH]" = list(0, 10*scale, ABOVE_MOB_LAYER),
"[SOUTH]" = list(0, 10*scale, BELOW_MOB_LAYER),
"[EAST]" = list(-5*scale, 10*scale, ABOVE_MOB_LAYER),
"[WEST]" = list(5*scale, 10*scale, ABOVE_MOB_LAYER))
return values
code/modules/vore/appearance/sprite_accessories_taur_vr.dm
+1 -4
View File
@@ -6,10 +6,7 @@
/datum/riding/taur/handle_vehicle_layer()
if(ridden.has_buckled_mobs())
if(ridden.dir != NORTH)
ridden.layer = ABOVE_MOB_LAYER
else
ridden.layer = initial(ridden.layer)
ridden.layer = initial(ridden.layer)
else
var/mob/living/L = ridden
if(!(istype(L) && (L.status_flags & HIDING)))