shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

manual merge

Browse Source
This commit is contained in:
LetterJay
2017-04-29 07:57:16 -05:00
parent bcab389ca2
commit 0cf401934b
4 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vehicles/atv.dm
+2 -2
View File
@@ -9,8 +9,8 @@
. = ..()
riding_datum = new/datum/riding/atv
/obj/vehicle/atv/New()
..()
/obj/vehicle/atv/Initialize()
.=..()
atvcover = atvcover || mutable_appearance(icon, "atvcover", ABOVE_MOB_LAYER)
code/modules/vehicles/speedbike.dm
+1 -10
View File
@@ -15,20 +15,11 @@
overlay = overlay || mutable_appearance(icon, overlay_state, ABOVE_MOB_LAYER)
add_overlay(overlay)
/obj/effect/overlay/temp/speedbike_trail
name = "speedbike trails"
icon_state = "ion_fade"
layer = BELOW_MOB_LAYER
duration = 10
randomdir = 0
/obj/effect/overlay/temp/speedbike_trail/New(loc,move_dir)
..()
setDir(move_dir)
/obj/vehicle/space/speedbike/Move(newloc,move_dir)
if(has_buckled_mobs())
new /obj/effect/overlay/temp/speedbike_trail(loc,move_dir)
new /obj/effect/overlay/temp/dir_setting/speedbike_trail(loc,move_dir)
. = ..()
/obj/vehicle/space/speedbike/red