From 01e6eba262ad56247d681e2a824447224689ea7c Mon Sep 17 00:00:00 2001 From: githubuser4141 <61243846+githubuser4141@users.noreply.github.com> Date: Sat, 25 May 2024 18:51:45 +1200 Subject: [PATCH] yes --- code/game/mecha/combat/combat.dm | 1 - code/game/mecha/combat/phazon.dm | 1 - .../equipment/weapons/fallout/ballistic.dm | 2 +- code/game/mecha/fallout/armored.dm | 2 ++ code/game/mecha/fallout/birds.dm | 36 +++---------------- code/game/mecha/fallout/buggies.dm | 3 +- code/game/mecha/fallout/carriages.dm | 6 ++++ code/game/mecha/fallout/cars.dm | 8 +++-- code/game/mecha/fallout/pickuptrucks.dm | 6 +++- code/game/mecha/fallout/trucks.dm | 6 ++-- code/game/mecha/mecha.dm | 2 +- 11 files changed, 31 insertions(+), 42 deletions(-) diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index e6e9a0b8012..86e68ce9fb8 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -3,7 +3,6 @@ internal_damage_threshold = 50 armor = ARMOR_VALUE_HEAVY mouse_pointer = 'icons/mecha/mecha_mouse.dmi' - deflect_chance = 0 stepsound = 'sound/mecha/neostep2.ogg' /obj/mecha/combat/proc/max_ammo() //Max the ammo stored for Nuke Ops mechs, or anyone else that calls this diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm index a14037ecb03..c9f0b0199c7 100644 --- a/code/game/mecha/combat/phazon.dm +++ b/code/game/mecha/combat/phazon.dm @@ -6,7 +6,6 @@ dir_in = 2 //Facing South. step_energy_drain = 3 max_integrity = 200 - deflect_chance = 30 armor = ARMOR_VALUE_HEAVY max_temperature = 25000 infra_luminosity = 3 diff --git a/code/game/mecha/equipment/weapons/fallout/ballistic.dm b/code/game/mecha/equipment/weapons/fallout/ballistic.dm index cfb13e16d0a..7ab4d802e2d 100644 --- a/code/game/mecha/equipment/weapons/fallout/ballistic.dm +++ b/code/game/mecha/equipment/weapons/fallout/ballistic.dm @@ -18,7 +18,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/hobo name = "\improper Improvised HMG" desc = "A automatic machine gun make with scraps." - icon_state = "mecha_uac2" + icon_state = "mecha_lmg_fo" fire_sound = 'sound/f13weapons/boltfire.ogg' equip_cooldown = 5 projectile = /obj/item/projectile/bullet/lmg/hobo diff --git a/code/game/mecha/fallout/armored.dm b/code/game/mecha/fallout/armored.dm index 13c60913b8b..0c2efc3e1be 100644 --- a/code/game/mecha/fallout/armored.dm +++ b/code/game/mecha/fallout/armored.dm @@ -4,6 +4,8 @@ icon = 'icons/mecha/armoredjeep.dmi' icon_state = "armoredjeep" max_integrity = 400 + step_energy_drain = 1.5 + step_in = 1.5 armor = ARMOR_VALUE_VEHICLE_ARMORED wreckage = /obj/structure/mecha_wreckage/buggy max_utility_equip = 2 diff --git a/code/game/mecha/fallout/birds.dm b/code/game/mecha/fallout/birds.dm index d55b3d020e0..ab9916f56a2 100644 --- a/code/game/mecha/fallout/birds.dm +++ b/code/game/mecha/fallout/birds.dm @@ -8,24 +8,17 @@ pixel_x = -138 pixel_y = -138 layer = ABOVE_MOB_LAYER - can_be_locked = TRUE - dna_lock step_in = 0.6 dir_in = 2 step_energy_drain = 0.75 max_integrity = 150 - deflect_chance = 30 - armor = ARMOR_VALUE_LIGHT - max_temperature = 25000 - infra_luminosity = 1 + armor = ARMOR_VALUE_VEHICLE_CAR wreckage = /obj/structure/mecha_wreckage/vertibird add_req_access = 1 internal_damage_threshold = 25 - force = 15 max_utility_equip = 4 max_weapons_equip = 4 max_misc_equip = 2 - opacity = 1 canstrafe = TRUE movement_type = FLYING stepsound = 'sound/f13machines/vertibird_loop.ogg' @@ -73,7 +66,7 @@ /obj/mecha/combat/phazon/vertibird/loaded/Initialize() . = ..() - var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg + var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/auto ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/seat ME.attach(src) @@ -95,16 +88,10 @@ step_in = 0.8 step_energy_drain = 0.7 max_integrity = 200 - deflect_chance = 30 - armor = ARMOR_VALUE_LIGHT wreckage = /obj/structure/mecha_wreckage/vertibird add_req_access = 1 max_utility_equip = 8 max_weapons_equip = 1 - canstrafe = TRUE - movement_type = FLYING - stepsound = 'sound/f13machines/vertibird_loop.ogg' - turnsound = 'sound/f13machines/vertibird_loop.ogg' /obj/mecha/combat/phazon/vertibird/ncr/GrantActions(mob/living/user, human_occupant = 0) internals_action.Grant(user, src) @@ -130,7 +117,7 @@ /obj/mecha/combat/phazon/vertibird/ncr/loaded/Initialize() . = ..() - var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg + var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/auto ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/seat ME.attach(src) @@ -156,17 +143,11 @@ step_in = 0.6 step_energy_drain = 0.75 max_integrity = 150 - deflect_chance = 30 - armor = ARMOR_VALUE_LIGHT wreckage = /obj/structure/mecha_wreckage/vertibird add_req_access = 1 max_utility_equip = 4 max_weapons_equip = 4 max_misc_equip = 2 - canstrafe = TRUE - movement_type = FLYING - stepsound = 'sound/f13machines/vertibird_loop.ogg' - turnsound = 'sound/f13machines/vertibird_loop.ogg' /obj/mecha/combat/phazon/vertibird/enclave/GrantActions(mob/living/user, human_occupant = 0) internals_action.Grant(user, src) @@ -198,7 +179,7 @@ /obj/mecha/combat/phazon/vertibird/enclave/loaded/Initialize() . = ..() - var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg + var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/auto ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/seat ME.attach(src) @@ -218,18 +199,11 @@ step_in = 0.6 step_energy_drain = 0.75 max_integrity = 150 - deflect_chance = 30 - armor = ARMOR_VALUE_LIGHT wreckage = /obj/structure/mecha_wreckage/vertibird add_req_access = 1 - internal_damage_threshold = 25 max_utility_equip = 4 max_weapons_equip = 4 max_misc_equip = 2 - canstrafe = TRUE - movement_type = FLYING - stepsound = 'sound/f13machines/vertibird_loop.ogg' - turnsound = 'sound/f13machines/vertibird_loop.ogg' /obj/mecha/combat/phazon/vertibird/brotherhood/GrantActions(mob/living/user, human_occupant = 0) internals_action.Grant(user, src) @@ -261,7 +235,7 @@ /obj/mecha/combat/phazon/vertibird/brotherhood/loaded/Initialize() . = ..() - var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg + var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/auto ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/seat ME.attach(src) diff --git a/code/game/mecha/fallout/buggies.dm b/code/game/mecha/fallout/buggies.dm index 2daafef2cbf..0a17a8ec83f 100644 --- a/code/game/mecha/fallout/buggies.dm +++ b/code/game/mecha/fallout/buggies.dm @@ -6,8 +6,9 @@ icon = 'icons/mecha/buggy.dmi' icon_state = "buggygreen" pixel_x = -15 - pixel_y = 0 + pixel_y = -5 max_integrity = 200 + step_in = 0.8 armor = ARMOR_VALUE_VEHICLE_BUGGY stepsound = 'sound/f13machines/buggy_loop.ogg' turnsound = 'sound/f13machines/buggy_loop.ogg' diff --git a/code/game/mecha/fallout/carriages.dm b/code/game/mecha/fallout/carriages.dm index 643048bb06d..7a98de69c9d 100644 --- a/code/game/mecha/fallout/carriages.dm +++ b/code/game/mecha/fallout/carriages.dm @@ -8,6 +8,8 @@ pixel_x = -18 pixel_y = 0 max_integrity = 250 + step_energy_drain = 0.8 + step_in = 1.2 armor = ARMOR_VALUE_VEHICLE_TRUCK stepsound = 'sound/effects/footstep/gallop2.ogg' turnsound = 'sound/effects/footstep/gallop1.ogg' @@ -49,6 +51,8 @@ icon = 'icons/mecha/buggy-legiongun.dmi' icon_state = "legiongun" max_integrity = 250 + step_energy_drain = 0.8 + step_in = 1.2 armor = ARMOR_VALUE_VEHICLE_TRUCK /obj/mecha/combat/phazon/buggy/legionarmed/GrantActions(mob/living/user, human_occupant = 0) @@ -86,6 +90,8 @@ pixel_x = -20 pixel_y = 0 max_integrity = 250 + step_in = 1.6 + step_energy_drain = 0.8 armor = ARMOR_VALUE_VEHICLE_TRUCK /obj/mecha/combat/phazon/truckcaravan/loaded/Initialize() diff --git a/code/game/mecha/fallout/cars.dm b/code/game/mecha/fallout/cars.dm index f9b2d590064..6441b6780fd 100644 --- a/code/game/mecha/fallout/cars.dm +++ b/code/game/mecha/fallout/cars.dm @@ -5,11 +5,12 @@ desc = "A fast vehicule, runing on powercell. YUP ! ITS THE HIGHWAYMAN ! Kinda. Its not the original, but a budget version." icon = 'icons/mecha/highwayman.dmi' icon_state = "highwayman" - pixel_x = -15 - pixel_y = 0 + pixel_x = -16 + pixel_y = -5 max_integrity = 250 + step_energy_drain = 1 + step_in = 0.7 armor = ARMOR_VALUE_VEHICLE_CAR - armor = list("melee" = 30, "bullet" = 25, "laser" = 20, "energy" = 20, "bomb" = 40, "bio" = 0, "rad" = 100, "fire" = 100, "acid" = 100) stepsound = 'sound/f13machines/buggy_loop.ogg' turnsound = 'sound/f13machines/buggy_loop.ogg' wreckage = /obj/structure/mecha_wreckage/buggy @@ -69,6 +70,7 @@ icon = 'icons/mecha/corvega-police.dmi' icon_state = "corvega" max_integrity = 280 + step_energy_drain = 1.3 armor = ARMOR_VALUE_VEHICLE_ARMORED_LIGHT wreckage = /obj/structure/mecha_wreckage/buggy diff --git a/code/game/mecha/fallout/pickuptrucks.dm b/code/game/mecha/fallout/pickuptrucks.dm index 662436e27ef..c6cc0a3dff8 100644 --- a/code/game/mecha/fallout/pickuptrucks.dm +++ b/code/game/mecha/fallout/pickuptrucks.dm @@ -5,7 +5,11 @@ desc = "A old vehicule, runing on powercell." icon = 'icons/mecha/pickuptruck.dmi' icon_state = "pickuptruck" + pixel_x = -17 + pixel_y = -3 max_integrity = 300 + step_in = 1.4 + step_energy_drain = 1.5 armor = ARMOR_VALUE_VEHICLE_CAR stepsound = 'sound/f13machines/buggy_loop.ogg' turnsound = 'sound/f13machines/buggy_loop.ogg' @@ -87,7 +91,7 @@ /obj/mecha/combat/phazon/pickuptruck/bos/armed name = "\improper BoS pickup truck with gunner" - desc = "A old vehicule, runing on powercell. Its a A modified brotherhood truck, with the addition of a laser rifle at the back, maned by Paladin Kiana Davberg. Consumes more and is a more fragile." + desc = "A old vehicule, runing on powercell. Its a A modified brotherhood truck, with the addition of a laser rifle at the back, maned by Paladin Kiana Davberg." icon = 'icons/mecha/pickuptruck-gunbos.dmi' icon_state = "pickuptruck" max_integrity = 300 diff --git a/code/game/mecha/fallout/trucks.dm b/code/game/mecha/fallout/trucks.dm index 85a184fad1c..e3d4d518493 100644 --- a/code/game/mecha/fallout/trucks.dm +++ b/code/game/mecha/fallout/trucks.dm @@ -5,9 +5,10 @@ desc = "A truck running on powercells. Nice eh ? still a wreck." icon = 'icons/mecha/ncrtruck.dmi' icon_state = "ncrtruck" - pixel_x = -15 - pixel_y = 0 + pixel_x = -22 + pixel_y = -5 max_integrity = 600 + step_in = 1 armor = ARMOR_VALUE_VEHICLE_TRUCK max_weapons_equip = 1 max_utility_equip = 8 @@ -77,6 +78,7 @@ icon = 'icons/mecha/ncrtruck-mp.dmi' icon_state = "ncrtruck" max_integrity = 600 + step_in = 0.8 armor = ARMOR_VALUE_VEHICLE_TRUCK wreckage = /obj/structure/mecha_wreckage/ncrtruck diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 1168173cc66..daaa27d9a1b 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -44,7 +44,7 @@ move_force = MOVE_FORCE_VERY_STRONG move_resist = MOVE_FORCE_EXTREMELY_STRONG light_range = 9 - var/deflect_chance = 10 //chance to deflect the incoming projectiles, hits, or lesser the effect of ex_act. + var/deflect_chance = 0 //chance to deflect the incoming projectiles, hits, or lesser the effect of ex_act. armor = ARMOR_VALUE_HEAVY var/list/facing_modifiers = list(FRONT_ARMOUR = 1.5, SIDE_ARMOUR = 1, BACK_ARMOUR = 0.5) //var/obj/item/stock_parts/cell/cell