manual merge

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
+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)