Skip to content

Commit

Permalink
yes
Browse files Browse the repository at this point in the history
  • Loading branch information
githubuser4141 committed May 25, 2024
1 parent 699a8c9 commit 01e6eba
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 42 deletions.
1 change: 0 additions & 1 deletion code/game/mecha/combat/combat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion code/game/mecha/combat/phazon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/game/mecha/equipment/weapons/fallout/ballistic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions code/game/mecha/fallout/armored.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
36 changes: 5 additions & 31 deletions code/game/mecha/fallout/birds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion code/game/mecha/fallout/buggies.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 6 additions & 0 deletions code/game/mecha/fallout/carriages.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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()
Expand Down
8 changes: 5 additions & 3 deletions code/game/mecha/fallout/cars.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
6 changes: 5 additions & 1 deletion code/game/mecha/fallout/pickuptrucks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions code/game/mecha/fallout/trucks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion code/game/mecha/mecha.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 01e6eba

Please sign in to comment.