From 71ec6419d676d888713735d12528aebfe2fd1b27 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Fri, 27 Sep 2019 20:36:16 -0400 Subject: [PATCH] fixes and icon --- code/modules/vehicle/ambulance.dm | 2 +- code/modules/vehicle/atv.dm | 22 ++++++++++------------ code/modules/vehicle/janicart.dm | 17 ++++++++++------- code/modules/vehicle/motorcycle.dm | 14 +++++--------- code/modules/vehicle/speedbike.dm | 11 +++++------ code/modules/vehicle/sportscar.dm | 13 +++++-------- icons/vehicles/4wheeler.dmi | Bin 2250 -> 1529 bytes 7 files changed, 36 insertions(+), 43 deletions(-) diff --git a/code/modules/vehicle/ambulance.dm b/code/modules/vehicle/ambulance.dm index 91f333387fd..7b4797c6fe3 100644 --- a/code/modules/vehicle/ambulance.dm +++ b/code/modules/vehicle/ambulance.dm @@ -7,7 +7,7 @@ var/datum/action/ambulance_alarm/AA var/datum/looping_sound/ambulance_alarm/soundloop -/obj/vehicle/ambulance/New() +/obj/vehicle/ambulance/Initialize(mapload) . = ..() AA = new(src) soundloop = new(list(src), FALSE) diff --git a/code/modules/vehicle/atv.dm b/code/modules/vehicle/atv.dm index 1cfc47e53d8..1dfb844b8cb 100644 --- a/code/modules/vehicle/atv.dm +++ b/code/modules/vehicle/atv.dm @@ -2,18 +2,16 @@ name = "all-terrain vehicle" desc = "An all-terrain vehicle built for traversing rough terrain with ease. One of the few old-earth technologies that are still relevant on most planet-bound outposts." icon = 'icons/vehicles/4wheeler.dmi' - icon_state = "fourwheel" + icon_state = "atv" key_type = /obj/item/key generic_pixel_x = 0 generic_pixel_y = 4 vehicle_move_delay = 1.5 - var/static/image/atvcover = null + var/static/mutable_appearance/atvcover -/obj/vehicle/atv/New() - ..() - if(!atvcover) - atvcover = image("icons/vehicles/4wheeler.dmi", "4wheeler_north") - atvcover.layer = MOB_LAYER + 0.1 +/obj/vehicle/atv/Initialize(mapload) + . = ..() + atvcover = mutable_appearance(icon, atvcover, ABOVE_MOB_LAYER) /obj/vehicle/atv/post_buckle_mob(mob/living/M) add_overlay(atvcover) @@ -26,7 +24,7 @@ /obj/vehicle/atv/handle_vehicle_layer() if(dir == SOUTH) - layer = MOB_LAYER+0.1 + layer = ABOVE_MOB_LAYER else layer = OBJ_LAYER @@ -40,20 +38,20 @@ emp_vulnerable = 1 density = 0 -/obj/vehicle/atv/turret/New() - ..() +/obj/vehicle/atv/turret/Initialize(mapload) + . = ..() turret = new(loc) //turret.base = src /obj/vehicle/atv/turret/handle_vehicle_layer() if(dir == SOUTH) - layer = MOB_LAYER+0.1 + layer = ABOVE_MOB_LAYER else layer = OBJ_LAYER if(turret) if(dir == NORTH) - turret.layer = MOB_LAYER+0.1 + turret.layer = ABOVE_MOB_LAYER else turret.layer = OBJ_LAYER diff --git a/code/modules/vehicle/janicart.dm b/code/modules/vehicle/janicart.dm index 1a1855ba39d..319d2338128 100644 --- a/code/modules/vehicle/janicart.dm +++ b/code/modules/vehicle/janicart.dm @@ -7,6 +7,9 @@ var/obj/item/storage/bag/trash/mybag var/floorbuffer = FALSE +/obj/vehicle/janicart/Destroy() + QDEL_NULL(mybag) + return ..() /obj/vehicle/janicart/handle_vehicle_offsets() ..() @@ -65,7 +68,7 @@ if(istype(I, /obj/item/storage/bag/trash)) if(!user.drop_item()) return - to_chat(user, "You hook the trashbag onto \the [name].") + to_chat(user, "You hook [I] onto [src].") I.forceMove(src) mybag = I update_icon() @@ -73,24 +76,24 @@ if(istype(I, /obj/item/janiupgrade)) floorbuffer = TRUE qdel(I) - to_chat(user,"You upgrade [src] with the floor buffer.") + to_chat(user,"You upgrade [src] with [I].") update_icon() return return ..() /obj/vehicle/janicart/update_icon() - overlays.Cut() + cut_overlays() if(mybag) - overlays += "cart_garbage" + add_overlay("cart_garbage") if(floorbuffer) - overlays += "cart_buffer" + add_overlay("cart_buffer") /obj/vehicle/janicart/attack_hand(mob/user) if(..()) - return 1 + return TRUE else if(mybag) - mybag.loc = get_turf(user) + mybag.forceMove(get_turf(user)) user.put_in_hands(mybag) mybag = null update_icon() \ No newline at end of file diff --git a/code/modules/vehicle/motorcycle.dm b/code/modules/vehicle/motorcycle.dm index a79f8e3fa12..ea165c1c8df 100644 --- a/code/modules/vehicle/motorcycle.dm +++ b/code/modules/vehicle/motorcycle.dm @@ -6,15 +6,11 @@ generic_pixel_x = 0 generic_pixel_y = 4 vehicle_move_delay = 1 - var/static/image/bikecover = null - - -/obj/vehicle/motorcycle/New() - ..() - if(!bikecover) - bikecover = image("icons/vehicles/motorcycle.dmi", "motorcycle_overlay_4d") - bikecover.layer = MOB_LAYER + 0.1 + var/mutable_appearance/bikecover +/obj/vehicle/motorcycle/Initialize(mapload) + . = ..() + bikecover = mutable_appearance(icon, "motorcycle_overlay_4d", ABOVE_MOB_LAYER) /obj/vehicle/motorcycle/post_buckle_mob(mob/living/M) add_overlay(bikecover) @@ -28,6 +24,6 @@ /obj/vehicle/motorcycle/handle_vehicle_layer() if(dir == SOUTH) - layer = MOB_LAYER+0.1 + layer = ABOVE_MOB_LAYER else layer = OBJ_LAYER \ No newline at end of file diff --git a/code/modules/vehicle/speedbike.dm b/code/modules/vehicle/speedbike.dm index 0d3018c5452..75e25c2c5e6 100644 --- a/code/modules/vehicle/speedbike.dm +++ b/code/modules/vehicle/speedbike.dm @@ -5,13 +5,12 @@ layer = MOB_LAYER - 0.1 vehicle_move_delay = 0 var/overlay_state = "cover_blue" - var/image/overlay = null + var/mutable_appearance/overlay -/obj/vehicle/space/speedbike/New() - ..() - overlay = image("icons/obj/bike.dmi", overlay_state) - overlay.layer = MOB_LAYER + 0.1 - overlays += overlay +/obj/vehicle/space/speedbike/Initialize(mapload) + . = ..() + overlay = mutable_appearance(icon, overlay_state, ABOVE_MOB_LAYER) + add_overlay(overlay) /obj/vehicle/space/speedbike/Move(newloc,move_dir) if(has_buckled_mobs()) diff --git a/code/modules/vehicle/sportscar.dm b/code/modules/vehicle/sportscar.dm index f52f4b77a92..0f9543d4811 100644 --- a/code/modules/vehicle/sportscar.dm +++ b/code/modules/vehicle/sportscar.dm @@ -6,14 +6,11 @@ generic_pixel_x = 0 generic_pixel_y = 4 vehicle_move_delay = 1 - var/static/image/carcover = null + var/mutable_appearance/carcover - -/obj/vehicle/car/New() - ..() - if(!carcover) - carcover = image("icons/vehicles/sportscar.dmi", "sportscar_cover") - carcover.layer = MOB_LAYER + 0.1 +/obj/vehicle/car/Initialize(mapload) + . = ..() + carcover = mutable_appearance(icon, "sportscar_cover", ABOVE_MOB_LAYER) /obj/vehicle/car/post_buckle_mob(mob/living/M) add_overlay(carcover) @@ -46,6 +43,6 @@ /obj/vehicle/car/handle_vehicle_layer() if(dir == SOUTH) - layer = MOB_LAYER+0.1 + layer = ABOVE_MOB_LAYER else layer = OBJ_LAYER \ No newline at end of file diff --git a/icons/vehicles/4wheeler.dmi b/icons/vehicles/4wheeler.dmi index 0378b865fd306532f9491005a90cce0dac07d0cf..e1bfd5e18fd04ef0db04a6932af23099b272ebf7 100644 GIT binary patch delta 1476 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