diff --git a/code/modules/1713/machinery/modular_vehicles/axis.dm b/code/modules/1713/machinery/modular_vehicles/axis.dm index 5493f5262e..759a155cb0 100644 --- a/code/modules/1713/machinery/modular_vehicles/axis.dm +++ b/code/modules/1713/machinery/modular_vehicles/axis.dm @@ -2,6 +2,7 @@ var/global/list/tank_names_german = list("Lute", "Greta", "Erika", "Sieg", "Teuf var/global/list/tank_names_soviet = list("Slavianka", "Katya", "Rodina", "Vernyi", "Krasavets", "Grom","Gvozdika","Tyulpan","Krokodil","Grach","Bereza","Zhuravl","Topol","Bogatyr","Yenot","Orel","Natasha","Molodets","Rusalka","Volga","Molot","Serp","Zubr","Kazak") var/global/list/tank_names_japanese = list("Banzai", "Satsu-Jin", "Koroshite", "Sakura", "Chibi Chi-to", "I-Go","Bushido","Hinomaru","Shuriken") var/global/list/tank_names_usa = list("Charlie", "Alpha", "Foxtrot", "Tango", "Echo", "Zipper-maker", "Uncle Sam", "Steel Coffin", "Crusader","Iron Maiden","Thunderbolt","Hellcat","Black Baron","Raging Bull","Bulldog","Whiskey","Fury","Warthog","Sentinel","Cobra","Raptor","Steel Phantom") +var/global/list/tank_names_nato = list("Alpha", "Bravo", "Charlie", "Delta", "Echo", "Foxtrot", "Golf", "Hotel", "India", "Juliet", "Kilo", "Lima", "Mike", "November", "Oscar", "Papa", "Quebec", "Romeo", "Sierra", "Tango", "Uniform", "Victor", "Whiskey", "X-ray", "Yankee", "Zulu", "Avalanche", "Bandit", "Cyclone", "Defender", "Eagle", "Falcon", "Guardian", "Havoc", "Ironclad", "Jaguar", "Kodiak", "Lightning", "Maverick", "Nomad", "Panther", "Phantom", "Quicksilver", "Renegade", "Specter", "Sentinel", "Thunderbolt", "Viper", "Warlock", "Xenoh", "Yeti", "Zephyr") ////////AXIS: MOVEMENT LOOP///////// /obj/structure/vehicleparts/axis diff --git a/code/modules/1713/machinery/modular_vehicles/carparts/premade.dm b/code/modules/1713/machinery/modular_vehicles/carparts/premade.dm index 2939b28ab5..07687c9267 100644 --- a/code/modules/1713/machinery/modular_vehicles/carparts/premade.dm +++ b/code/modules/1713/machinery/modular_vehicles/carparts/premade.dm @@ -1155,8 +1155,8 @@ custom_color = "#4A5243" axis = /obj/structure/vehicleparts/axis/heavy/btr80 tocreate = list( - "1,1" = list(/obj/structure/vehicleparts/movement/armored/btr,/obj/structure/vehicleparts/frame/btr80/rf), - "2,1" = list(/obj/structure/vehicleparts/movement/armored/btr,/obj/structure/vehicleparts/frame/btr80/lf,/obj/structure/bed/chair/drivers/tank,/obj/structure/radio/transmitter_receiver/nopower/tank/faction2), + "1,1" = list(/obj/structure/vehicleparts/movement/armored/btr/right,/obj/structure/vehicleparts/frame/btr80/rf), + "2,1" = list(/obj/structure/vehicleparts/movement/armored/btr/left,/obj/structure/vehicleparts/frame/btr80/lf,/obj/structure/bed/chair/drivers/tank,/obj/structure/radio/transmitter_receiver/nopower/tank/faction2), "1,2" = list(/obj/structure/vehicleparts/frame/btr80/rfc,/obj/structure/turret/btr80), "2,2" = list(/obj/structure/vehicleparts/frame/btr80/lfc,/obj/item/ammo_magazine/pkm,/obj/item/ammo_magazine/pkm), @@ -1164,8 +1164,8 @@ "1,3" = list(/obj/structure/vehicleparts/frame/btr80/rbc,/obj/structure/lamp/lamp_small/tank/red), "2,3" = list(/obj/structure/vehicleparts/frame/btr80/lbc,/obj/item/ammo_magazine/a30mm_ap/btr80,/obj/item/ammo_magazine/a30mm_ap/btr80,/obj/item/ammo_magazine/a30mm_he/btr80), - "1,4" = list(/obj/structure/vehicleparts/movement/armored/reversed,/obj/structure/vehicleparts/frame/btr80/rb,/obj/structure/engine/internal/diesel/premade/btr80,/obj/item/weapon/reagent_containers/glass/barrel/fueltank/tank/fueleddiesel{density = 0}), - "2,4" = list(/obj/structure/vehicleparts/movement/armored/reversed,/obj/structure/vehicleparts/frame/btr80/lb), + "1,4" = list(/obj/structure/vehicleparts/movement/armored/btr/right/reversed,/obj/structure/vehicleparts/frame/btr80/rb,/obj/structure/engine/internal/diesel/premade/btr80,/obj/item/weapon/reagent_containers/glass/barrel/fueltank/tank/fueleddiesel{density = 0}), + "2,4" = list(/obj/structure/vehicleparts/movement/armored/btr/left/reversed,/obj/structure/vehicleparts/frame/btr80/lb), ) /obj/effects/premadevehicles/apc/cv90 @@ -1175,13 +1175,13 @@ axis = /obj/structure/vehicleparts/axis/heavy/cv90 tocreate = list( "1,1" = list(/obj/structure/vehicleparts/movement/tracks/right,/obj/structure/vehicleparts/frame/cv90/rf), - "2,1" = list(/obj/structure/vehicleparts/movement/tracks/left,/obj/structure/vehicleparts/frame/cv90/lf), + "2,1" = list(/obj/structure/vehicleparts/movement/tracks/left,/obj/structure/vehicleparts/frame/cv90/lf,/obj/structure/bed/chair/drivers/tank), - "1,2" = list(/obj/structure/vehicleparts/frame/cv90/rfc,/obj/item/tank_system/aps/ironfist,/obj/item/weapon/gun/projectile/automatic/stationary/autocannon/shipunov2a72), - "2,2" = list(/obj/structure/vehicleparts/frame/cv90/lfc,/obj/structure/bed/chair/drivers/tank), + "1,2" = list(/obj/structure/vehicleparts/frame/cv90/rfc,/obj/structure/turret/cv90{density = 0}), + "2,2" = list(/obj/structure/vehicleparts/frame/cv90/lfc), - "1,3" = list(/obj/structure/vehicleparts/frame/cv90/rbc,/obj/structure/lamp/lamp_small/tank/red,/obj/item/ammo_magazine/a30mm_ap/btr80,/obj/item/ammo_magazine/a30mm_ap/btr80,/obj/item/ammo_magazine/a30mm_he/btr80), - "2,3" = list(/obj/structure/vehicleparts/frame/cv90/lbc), + "1,3" = list(/obj/structure/vehicleparts/frame/cv90/rbc,/obj/structure/lamp/lamp_small/tank/red,/obj/item/ammo_magazine/a35mm_fap,/obj/item/ammo_magazine/a35mm_fap,/obj/item/ammo_magazine/a35mm_hei,/obj/item/ammo_magazine/a35mm_hei), + "2,3" = list(/obj/structure/vehicleparts/frame/cv90/lbc,/obj/item/ammo_magazine/m249,/obj/item/ammo_magazine/m249,/obj/item/ammo_magazine/m249), "1,4" = list(/obj/structure/vehicleparts/movement/tracks/left/reversed,/obj/structure/vehicleparts/frame/cv90/rb,/obj/structure/engine/internal/diesel/premade/btr80,/obj/item/weapon/reagent_containers/glass/barrel/fueltank/tank/fueleddiesel{density = 0}), "2,4" = list(/obj/structure/vehicleparts/movement/tracks/right/reversed,/obj/structure/vehicleparts/frame/cv90/lb), diff --git a/code/modules/1713/machinery/modular_vehicles/movement.dm b/code/modules/1713/machinery/modular_vehicles/movement.dm index 1a883f8fcf..79b07bc0c5 100644 --- a/code/modules/1713/machinery/modular_vehicles/movement.dm +++ b/code/modules/1713/machinery/modular_vehicles/movement.dm @@ -27,30 +27,32 @@ /obj/structure/vehicleparts/movement/armored/btr name = "armored wheels" - icon_state = "wheel_t_dark" - base_icon = "wheel_t_dark" - movement_icon = "wheel_t_dark_m" - ntype = "wheel" -/obj/structure/vehicleparts/movement/tracks/btr/left_front - icon = 'icons/obj/vehicles/apcparts96x96.dmi' - icon_state = "btr80_tracks_left_front" - base_icon = "btr80_tracks_left_front" - movement_icon = "btr80_tracks_left_front_m" -/obj/structure/vehicleparts/movement/tracks/btr/right_front - icon = 'icons/obj/vehicles/apcparts96x96.dmi' - icon_state = "btr80_tracks_right_front" - base_icon = "btr80_tracks_right_front" - movement_icon = "btr80_tracks_right_front_m" -/obj/structure/vehicleparts/movement/tracks/btr/left_back icon = 'icons/obj/vehicles/apcparts96x96.dmi' - icon_state = "btr80_tracks_left_back" - base_icon = "btr80_tracks_left_back" - movement_icon = "btr80_tracks_left_back_m" -/obj/structure/vehicleparts/movement/tracks/btr/right_back - icon = 'icons/obj/vehicles/apcparts96x96.dmi' - icon_state = "btr80_tracks_right_back" - base_icon = "btr80_tracks_right_back" - movement_icon = "btr80_tracks_right_back_m" + normal_icon = 'icons/obj/vehicles/apcparts96x96.dmi' + broken_icon = 'icons/obj/vehicles/apcparts96x96_damaged.dmi' + icon_state = "btr80_wheels_front_left" + base_icon = "btr80_wheels_front_left" + movement_icon = "btr80_wheels_front_left_m" + ntype = "wheel" +/obj/structure/vehicleparts/movement/armored/btr/left + icon_state = "btr80_wheels_front_left" + base_icon = "btr80_wheels_front_left" + movement_icon = "btr80_wheels_front_left_m" +/obj/structure/vehicleparts/movement/armored/btr/right + icon_state = "btr80_wheels_front_right" + base_icon = "btr80_wheels_front_right" + movement_icon = "btr80_wheels_front_right_m" +/obj/structure/vehicleparts/movement/armored/btr/left/reversed + reversed = TRUE + icon_state = "btr80_wheels_back_left" + base_icon = "btr80_wheels_back_left" + movement_icon = "btr80_wheels_back_left_m" +/obj/structure/vehicleparts/movement/armored/btr/right/reversed + icon_state = "btr80_wheels_back_right" + base_icon = "btr80_wheels_back_right" + movement_icon = "btr80_wheels_back_right_m" + reversed = TRUE + /obj/structure/vehicleparts/movement/tracks name = "armored tracks" diff --git a/code/modules/1713/machinery/vehicles.dm b/code/modules/1713/machinery/vehicles.dm index 2e289eff4f..f6a6b52d93 100644 --- a/code/modules/1713/machinery/vehicles.dm +++ b/code/modules/1713/machinery/vehicles.dm @@ -299,6 +299,11 @@ reg_number = "" color = "#5C5C4C" vehicle_type = "apc" + New() + ..() + var/pickedname = pick(tank_names_nato) + tank_names_nato -= pickedname + name = "[name] \'[pickedname]\'" /obj/structure/vehicleparts/axis/heavy/t80u name = "T-80U" diff --git a/code/modules/1713/siege/turret.dm b/code/modules/1713/siege/turret.dm index 4e5dcdfd51..cc317a46c8 100644 --- a/code/modules/1713/siege/turret.dm +++ b/code/modules/1713/siege/turret.dm @@ -103,6 +103,8 @@ for (var/obj/structure/vehicleparts/frame/F in loc) vehicle_dir = F.dir + if (F.axis && F.axis.color) + turret_color = F.axis.color if(vehicle_dir != 0) switch(vehicle_dir) @@ -832,7 +834,6 @@ name = "T-80UK" /obj/structure/turret/t90a - turret_color = "#4a5243" turret_icon = "t90a_turret" name = "T-90A" @@ -1107,7 +1108,6 @@ ..() /obj/structure/turret/bradley - turret_color = "#787859" turret_icon = "bradley_turret" name = "Bradley" @@ -1125,6 +1125,33 @@ rotation_speed = 0.3 + New() + gunner_seat = new /obj/structure/bed/chair/gunner(src.loc) + gunner_seat.setup(src) + commander_seat = new /obj/structure/bed/chair/commander(src.loc) + commander_seat.setup(src) + weapons.Add(new/obj/item/weapon/gun/projectile/automatic/stationary/autocannon/bushmaster/bradley(src)) + weapons.Add(new/obj/item/weapon/gun/projectile/automatic/manual/m249(src)) + ..() + +/obj/structure/turret/cv90 + turret_icon = "cv90_turret" + name = "CV90" + + icon = 'icons/obj/guns/mgs.dmi' + icon_state = "autocannon" + + turret_x = 16 + turret_y = 24 + + gunner_x = -8 + gunner_y = 0 + + commander_x = 8 + commander_y = 0 + + rotation_speed = 0.3 + New() gunner_seat = new /obj/structure/bed/chair/gunner(src.loc) gunner_seat.setup(src) @@ -1179,7 +1206,6 @@ */ /obj/structure/turret/m1abrams - turret_color = "#787859" turret_icon = "m1a1_turret" name = "M1A1_turret" @@ -1209,7 +1235,6 @@ ..() /obj/structure/turret/challenger2 - turret_color = "#787859" turret_icon = "challenger2_turret" name = "Challenger-2" diff --git a/code/modules/1713/weapons/guns/mg/stationary/mg.dm b/code/modules/1713/weapons/guns/mg/stationary/mg.dm index 1e7280e76e..8aa2b767fc 100644 --- a/code/modules/1713/weapons/guns/mg/stationary/mg.dm +++ b/code/modules/1713/weapons/guns/mg/stationary/mg.dm @@ -548,11 +548,11 @@ desc = "The Bushmaster III is a chain gun, like the other members of the Bushmaster family, which grants it great dependability and safety from ammunition cook-off even though it does result in lower rates of fire." icon_state = "autocannon" base_icon = "autocannon" - caliber = "a30" + caliber = "a35" fire_sound = 'sound/weapons/guns/fire/2a72.ogg' handle_casings = EJECT_CASINGS - magazine_type = /obj/item/ammo_magazine/a30mm_ap/btr80 - good_mags = list(/obj/item/ammo_magazine/a30mm_ap/btr80, /obj/item/ammo_magazine/a30mm_he/btr80) + magazine_type = /obj/item/ammo_magazine/a35mm_fap + good_mags = list(/obj/item/ammo_magazine/a35mm_fap, /obj/item/ammo_magazine/a35mm_hei) firemodes = list( list(name = "automatic", burst=1, burst_delay=3, accuracy=list(2)), ) diff --git a/icons/obj/vehicles/apcparts96x96.dmi b/icons/obj/vehicles/apcparts96x96.dmi index 6abe2c84b5..d314f9d040 100644 Binary files a/icons/obj/vehicles/apcparts96x96.dmi and b/icons/obj/vehicles/apcparts96x96.dmi differ diff --git a/icons/obj/vehicles/apcparts96x96_damaged.dmi b/icons/obj/vehicles/apcparts96x96_damaged.dmi index 473c031fba..2dfcadda40 100644 Binary files a/icons/obj/vehicles/apcparts96x96_damaged.dmi and b/icons/obj/vehicles/apcparts96x96_damaged.dmi differ diff --git a/icons/obj/vehicles/vehicles256x256.dmi b/icons/obj/vehicles/vehicles256x256.dmi index 21acfd0d7e..975e344693 100644 Binary files a/icons/obj/vehicles/vehicles256x256.dmi and b/icons/obj/vehicles/vehicles256x256.dmi differ