diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 7990329aa16..80cd56e8529 100755 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -232,6 +232,22 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee containername = "MULEbot Crate" group = "Operations" +/datum/supply_packs/cargotrain + name = "Cargo Train Tug" + contains = list(/obj/vehicle/train/cargo/engine) + cost = 30 + containertype = /obj/structure/largecrate + containername = "Cargo Train Tug Crate" + group = "Operations" + +/datum/supply_packs/cargotrailer + name = "Cargo Train Trolley" + contains = list(/obj/vehicle/train/cargo/trolley) + cost = 20 + containertype = /obj/structure/largecrate + containername = "Cargo Train Trolley Crate" + group = "Operations" + /datum/supply_packs/lisa name = "Corgi Crate" contains = list() diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index ba6318588ff..2b2e16e4293 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -1,8 +1,8 @@ /obj/vehicle/train/cargo/engine name = "cargo train tug" desc = "A ridable electric car designed for pulling cargo trolleys." - icon = 'icons/obj/aibots.dmi' - icon_state = "mulebot1" //mulebot icons until I get some proper icons + icon = 'icons/obj/vehicles.dmi' + icon_state = "cargo_engine" on = 0 powered = 1 locked = 0 @@ -10,7 +10,7 @@ standing_mob = 1 load_item_visible = 1 load_offset_x = 0 - load_offset_y = 9 + load_offset_y = 8 var/car_limit = 3 //how many cars an engine can pull before performance degrades active_engines = 1 @@ -25,8 +25,8 @@ /obj/vehicle/train/cargo/trolley name = "cargo train trolley" - icon = 'icons/obj/aibots.dmi' - icon_state = "mulebot0" + icon = 'icons/obj/vehicles.dmi' + icon_state = "cargo_trailer" anchored = 0 passenger_allowed = 0 locked = 0 @@ -34,7 +34,7 @@ standing_mob = 1 load_item_visible = 1 load_offset_x = 0 - load_offset_y = 9 + load_offset_y = 5 //------------------------------------------- // Standard procs @@ -76,14 +76,10 @@ /obj/vehicle/train/cargo/update_icon() if(open) - icon_state = "mulebot-hatch" + icon_state = initial(icon_state) + "_open" else icon_state = initial(icon_state) -/obj/vehicle/train/cargo/engine/Emag(mob/user as mob) - ..() - flick("mulebot-emagged", src) - /obj/vehicle/train/cargo/trolley/insert_cell(var/obj/item/weapon/cell/C, var/mob/living/carbon/human/H) return diff --git a/icons/obj/vehicles.dmi b/icons/obj/vehicles.dmi index 699a3729835..de24172c3a9 100644 Binary files a/icons/obj/vehicles.dmi and b/icons/obj/vehicles.dmi differ