Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PVE TONK BUFFS #128

Merged
merged 44 commits into from
Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from 42 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
603f398
APC buffs
Kirshbia Feb 16, 2024
720f7f7
Update apc_wheels.dm
Kirshbia Feb 17, 2024
3109921
Update apc_wheels.dm
Kirshbia Feb 17, 2024
fa8da5c
Update tank.dm
Kirshbia Feb 18, 2024
c328157
Update dualcannon_ammo.dm
Kirshbia Feb 18, 2024
951589d
Update apc_wheels.dm
Kirshbia Feb 18, 2024
c689e7d
Update dual_cannon.dm
Kirshbia Feb 18, 2024
842e6c6
Update frontal_cannon.dm
Kirshbia Feb 18, 2024
948da72
Update dual_cannon.dm
Kirshbia Feb 18, 2024
d66477e
Update dual_cannon.dm
Kirshbia Feb 18, 2024
7b109bf
Hm
Kirshbia Feb 18, 2024
07d3a2c
Stuff
Kirshbia Feb 18, 2024
394dec6
Flare launcher and APC armor adjustment
Kirshbia Feb 18, 2024
46cdc32
Increase to Re-re cannon frontal rate
Kirshbia Feb 19, 2024
2cdd9d3
Merge branch 'master' into master
Kirshbia Feb 20, 2024
50f58b4
Merge branch 'PvE-CMSS13:master' into master
Kirshbia Feb 27, 2024
4c70688
PullingIncrease to Re-re cannon frontal rate
Kirshbia Feb 27, 2024
6d861b0
Revert "PullingIncrease to Re-re cannon frontal rate"
Kirshbia Feb 27, 2024
cad6882
Merge branch 'master' of https://github.com/Kirshbia/PvE-CMSS13
Kirshbia Feb 27, 2024
ca8d248
Synching
Kirshbia Feb 27, 2024
0d3f8a6
Tonk buffs
Kirshbia Feb 28, 2024
1e55108
Merge branch 'master' into master
Kirshbia Feb 28, 2024
84be84e
Update hardpoint.dm
Kirshbia Feb 28, 2024
6086bb0
Update tank.dm
Kirshbia Mar 1, 2024
bb413be
Update rocket.dm
Kirshbia Mar 1, 2024
61be86c
Update ltb_ammo.dm
Kirshbia Mar 1, 2024
b8f1faa
Update ltb.dm
Kirshbia Mar 1, 2024
cc12100
Update minigun.dm
Kirshbia Mar 1, 2024
35a9001
Update secondary.dm
Kirshbia Mar 1, 2024
4f01566
Update tow.dm
Kirshbia Mar 1, 2024
d27e354
Buffs to armor and other support modules that Kirsh forgot existed.
Kirshbia Mar 1, 2024
5338390
Increasing mag sizes of hard points
Kirshbia Mar 1, 2024
d6de36c
Update tank.dm
Kirshbia Mar 2, 2024
ecd3865
Update ltb.dm
Kirshbia Mar 2, 2024
4c81c6d
Update tow.dm
Kirshbia Mar 2, 2024
c0b5d23
Merge branch 'master' of https://github.com/Kirshbia/PvE-CMSS13
Kirshbia Mar 2, 2024
752d9d7
Update ballistic.dm
Kirshbia Mar 2, 2024
200772c
Merge branch 'master' into master
Kirshbia Mar 2, 2024
fbd0e39
Slight increase to tonk movement
Kirshbia Mar 3, 2024
7d8a037
Adjusting to the ACE. Tuned down it's damage and armor pen to keep th…
Kirshbia Mar 5, 2024
03cd972
Merge branch 'master' into master
Kirshbia Mar 8, 2024
13274ab
Changed to tank treads, made the tank a bit faster and need one less …
Kirshbia Mar 8, 2024
ea959ce
not that
morrowwolf Mar 11, 2024
3a7bd5e
I got it
morrowwolf Mar 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .vs/slnx.sqlite
Binary file not shown.
4 changes: 2 additions & 2 deletions code/datums/ammo/bullet/tank.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

accuracy = HIT_ACCURACY_TIER_8
scatter = 0
damage = 60
damage = 150
damage_var_high = PROJECTILE_VARIANCE_TIER_8
penetration = ARMOR_PENETRATION_TIER_6
penetration = ARMOR_PENETRATION_TIER_5
accurate_range = 32
max_range = 32
shell_speed = AMMO_SPEED_TIER_6
Expand Down
2 changes: 1 addition & 1 deletion code/datums/ammo/rocket.dm
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
accuracy = HIT_ACCURACY_TIER_3
accurate_range = 32
max_range = 32
damage = 25
damage = 200
shell_speed = AMMO_SPEED_TIER_3

/datum/ammo/rocket/ltb/on_hit_mob(mob/M, obj/projectile/P)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vehicles/hardpoints/armor/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
slot = HDPT_ARMOR
hdpt_layer = HDPT_LAYER_ARMOR

damage_multiplier = 0.5
damage_multiplier = 0.10

health = 1000
2 changes: 1 addition & 1 deletion code/modules/vehicles/hardpoints/armor/snowplow.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
disp_icon = "tank"
disp_icon_state = "snowplow"

health = 600
health = 1500
activatable = 1

/obj/item/hardpoint/armor/snowplow/livingmob_interact(mob/living/M)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
icon_state = "ace_autocannon"
w_class = SIZE_LARGE
default_ammo = /datum/ammo/bullet/tank/flak
max_rounds = 40
max_rounds = 100
gun_type = /obj/item/hardpoint/primary/autocannon

/obj/item/ammo_magazine/hardpoint/ace_autocannon/update_icon()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vehicles/hardpoints/hardpoint_ammo/gl_ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
icon_state = "glauncher_2"
w_class = SIZE_LARGE
default_ammo = /datum/ammo/grenade_container
max_rounds = 10
max_rounds = 20
gun_type = /obj/item/hardpoint/secondary/grenade_launcher

/obj/item/ammo_magazine/hardpoint/tank_glauncher/update_icon()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
icon_state = "ltbcannon_4"
w_class = SIZE_LARGE //Heavy fucker
default_ammo = /datum/ammo/rocket/ltb
max_rounds = 4
max_rounds = 8
gun_type = /obj/item/hardpoint/primary/cannon

/obj/item/ammo_magazine/hardpoint/ltb_cannon/update_icon()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
icon_state = "quad_rocket"
w_class = SIZE_LARGE
default_ammo = /datum/ammo/rocket/ap
max_rounds = 5
max_rounds = 10
gun_type = /obj/item/hardpoint/secondary/towlauncher
14 changes: 7 additions & 7 deletions code/modules/vehicles/hardpoints/holder/tank_turret.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/hardpoint/holder/tank_turret
name = "M34A2-A Multipurpose Turret"
desc = "The centerpiece of the tank. Designed to support quick installation and deinstallation of various tank weapon modules. Has inbuilt smoke screen deployment system."
desc = "The centerpiece of the tank. Designed to support quick installation and deinstallation of various tank weapon modules. Has inbuilt flare deployment system."

icon = 'icons/obj/vehicles/tank.dmi'
icon_state = "tank_turret_0"
Expand All @@ -14,8 +14,8 @@

activatable = TRUE

ammo = new /obj/item/ammo_magazine/hardpoint/turret_smoke
max_clips = 2
ammo = new /obj/item/ammo_magazine/hardpoint/flare_launcher
max_clips = 5
use_muzzle_flash = FALSE

w_class = SIZE_MASSIVE
Expand All @@ -27,7 +27,7 @@
slot = HDPT_TURRET

// big beefy chonk of metal
health = 750
health = 1500
damage_multiplier = 0.05

accepted_hardpoints = list(
Expand All @@ -54,18 +54,18 @@
var/gyro = FALSE

// How long the windup is before the turret rotates
var/rotation_windup = 15
var/rotation_windup = 5
// Used during the windup
var/rotating = FALSE

scatter = 4
scatter = 2
gun_firemode = GUN_FIREMODE_BURSTFIRE
gun_firemode_list = list(
GUN_FIREMODE_BURSTFIRE,
)
burst_amount = 2
burst_delay = 1.0 SECONDS
extra_delay = 13.0 SECONDS
extra_delay = 5.0 SECONDS

/obj/item/hardpoint/holder/tank_turret/update_icon()
var/broken = (health <= 0)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vehicles/hardpoints/primary/autocannon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
disp_icon_state = "ace_autocannon"
activation_sounds = list('sound/weapons/vehicles/autocannon_fire.ogg')

health = 500
health = 2000
firing_arc = 60

origins = list(0, -3)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vehicles/hardpoints/primary/flamer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
disp_icon_state = "drgn_flamer"
activation_sounds = list('sound/weapons/vehicles/flamethrower.ogg')

health = 400
health = 2000
firing_arc = 90

origins = list(0, -3)
Expand Down
8 changes: 4 additions & 4 deletions code/modules/vehicles/hardpoints/primary/ltb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
disp_icon_state = "ltb_cannon"
activation_sounds = list('sound/weapons/vehicles/cannon_fire1.ogg', 'sound/weapons/vehicles/cannon_fire2.ogg')

health = 500
health = 2000
firing_arc = 60

origins = list(0, -3)

ammo = new /obj/item/ammo_magazine/hardpoint/ltb_cannon
max_clips = 3
max_clips = 4

px_offsets = list(
"1" = list(0, 21),
Expand All @@ -29,5 +29,5 @@
"8" = list(-89, -4)
)

scatter = 2
fire_delay = 20.0 SECONDS
scatter = 0
fire_delay = 10.0 SECONDS
8 changes: 4 additions & 4 deletions code/modules/vehicles/hardpoints/primary/minigun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
disp_icon = "tank"
disp_icon_state = "ltaaap_minigun"

health = 350
health = 2000
firing_arc = 90

origins = list(0, -3)

ammo = new /obj/item/ammo_magazine/hardpoint/ltaaap_minigun
max_clips = 1
max_clips = 2

px_offsets = list(
"1" = list(0, 21),
Expand All @@ -28,12 +28,12 @@
"8" = list(-77, 0)
)

scatter = 7
scatter = 3
gun_firemode = GUN_FIREMODE_AUTOMATIC
gun_firemode_list = list(
GUN_FIREMODE_AUTOMATIC,
)
fire_delay = 0.8 SECONDS //base fire rate, modified by stage_delay_mult
fire_delay = 0.2 SECONDS //base fire rate, modified by stage_delay_mult

activation_sounds = list('sound/weapons/gun_minigun.ogg')
/// Active firing time to reach max spin_stage.
Expand Down
12 changes: 5 additions & 7 deletions code/modules/vehicles/hardpoints/secondary/cupola.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
disp_icon_state = "m56cupola"
activation_sounds = list('sound/weapons/gun_smartgun1.ogg', 'sound/weapons/gun_smartgun2.ogg', 'sound/weapons/gun_smartgun3.ogg', 'sound/weapons/gun_smartgun4.ogg')

health = 350
health = 2000
firing_arc = 120

origins = list(0, -2)
Expand All @@ -22,14 +22,12 @@
"8" = list(-5, 7)
)

scatter = 3
gun_firemode = GUN_FIREMODE_BURSTFIRE
scatter = 1
gun_firemode = GUN_FIREMODE_AUTOMATIC
gun_firemode_list = list(
GUN_FIREMODE_BURSTFIRE,
GUN_FIREMODE_AUTOMATIC,
)
burst_amount = 3
burst_delay = 0.3 SECONDS
extra_delay = 0.6 SECONDS
fire_delay = 0.1 SECONDS

/obj/item/hardpoint/secondary/m56cupola/set_bullet_traits()
..()
Expand Down
6 changes: 3 additions & 3 deletions code/modules/vehicles/hardpoints/secondary/flamer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
disp_icon_state = "flamer"
activation_sounds = list('sound/weapons/vehicles/flamethrower.ogg')

health = 300
health = 2000
firing_arc = 120

origins = list(0, -2)
Expand All @@ -26,8 +26,8 @@
"8" = list(-3, 18)
)

scatter = 6
fire_delay = 3.0 SECONDS
scatter = 2
fire_delay = 1.5 SECONDS

/obj/item/hardpoint/secondary/small_flamer/handle_fire(atom/target, mob/living/user, params)
var/turf/origin_turf = get_origin_turf()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
disp_icon_state = "glauncher"
activation_sounds = list('sound/weapons/gun_m92_attachable.ogg')

health = 500
firing_arc = 90
health = 2000
firing_arc = 120
var/max_range = 7

origins = list(0, -2)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vehicles/hardpoints/secondary/secondary.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

slot = HDPT_SECONDARY

damage_multiplier = 0.125
damage_multiplier = 0.10

activatable = TRUE
8 changes: 4 additions & 4 deletions code/modules/vehicles/hardpoints/secondary/tow.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
disp_icon = "tank"
disp_icon_state = "towlauncher"

health = 500
firing_arc = 60
health = 2000
firing_arc = 120

origins = list(0, -2)

Expand All @@ -28,6 +28,6 @@
"8" = list(-5, 10)
)

scatter = 4
fire_delay = 15.0 SECONDS
scatter = 2
fire_delay = 7.0 SECONDS

2 changes: 1 addition & 1 deletion code/modules/vehicles/hardpoints/support/artillery.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
disp_icon = "tank"
disp_icon_state = "artillerymod"

health = 250
health = 2000

activatable = TRUE

Expand Down
2 changes: 1 addition & 1 deletion code/modules/vehicles/hardpoints/support/iwsa.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
disp_icon = "tank"
disp_icon_state = "warray"

health = 250
health = 2000

buff_multipliers = list(
"cooldown" = 0.67,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vehicles/hardpoints/support/overdrive.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
disp_icon = "tank"
disp_icon_state = "odrive_enhancer"

health = 250
health = 2000

// 20% movespeed increase. Remember that movespeed is given in delay
buff_multipliers = list(
Expand Down
8 changes: 4 additions & 4 deletions code/modules/vehicles/hardpoints/wheels/treads.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@

slot = HDPT_TREADS

health = 500
health = 1500

//with this settings, takes 3 tiles to reach top speed
move_delay = 3.8
move_delay = 2.0
move_max_momentum = 3
move_momentum_build_factor = 1.8
move_momentum_build_factor = 1.5
move_turn_momentum_loss_factor = 0.6

/obj/item/hardpoint/locomotion/treads/robust
name = "Reinforced Treads"
desc = "These treads are made of a tougher material and are more durable. However, the extra weight slows the tank down slightly."

health = 750
health = 2500
acid_resistant = TRUE

move_max_momentum = 5 //same top speed, but takes 5 tiles to reach it
Expand Down
16 changes: 8 additions & 8 deletions code/modules/vehicles/tank/tank.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@

vehicle_flags = VEHICLE_CLASS_MEDIUM

move_max_momentum = 3
move_momentum_build_factor = 1.8
move_max_momentum = 2
move_momentum_build_factor = 1.5
move_turn_momentum_loss_factor = 0.6

light_range = 4
Expand Down Expand Up @@ -65,15 +65,15 @@

dmg_multipliers = list(
"all" = 1,
"acid" = 1.5, // Acid melts the tank
"slash" = 0.7, // Slashing a massive, solid chunk of metal does very little except leave scratches
"acid" = 0.5, // Acid melts the tank
"slash" = 1.6, // Slashing a massive, solid chunk of metal does very little except leave scratches
morrowwolf marked this conversation as resolved.
Show resolved Hide resolved
"bullet" = 0.4,
"explosive" = 0.8,
"blunt" = 0.8,
"abstract" = 1
)

explosive_resistance = 400
explosive_resistance = 500

/obj/vehicle/multitile/tank/initialize_cameras(change_tag = FALSE)
if(!camera)
Expand Down Expand Up @@ -220,7 +220,7 @@
TANK.update_icon()

/obj/effect/vehicle_spawner/tank/decrepit/load_hardpoints(obj/vehicle/multitile/tank/V)
V.add_hardpoint(new /obj/item/hardpoint/support/artillery_module)
V.add_hardpoint(new /obj/item/hardpoint/support/weapons_sensor)
V.add_hardpoint(new /obj/item/hardpoint/armor/paladin)
V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads)
V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret)
Expand All @@ -231,7 +231,7 @@

//PRESET: default hardpoints
/obj/effect/vehicle_spawner/tank/fixed/load_hardpoints(obj/vehicle/multitile/tank/V)
V.add_hardpoint(new /obj/item/hardpoint/support/artillery_module)
V.add_hardpoint(new /obj/item/hardpoint/support/weapons_sensor)
V.add_hardpoint(new /obj/item/hardpoint/armor/paladin)
V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads)
V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret)
Expand Down Expand Up @@ -264,7 +264,7 @@

//PRESET: autocannon kit
/obj/effect/vehicle_spawner/tank/fixed/autocannon/load_hardpoints(obj/vehicle/multitile/tank/V)
V.add_hardpoint(new /obj/item/hardpoint/support/artillery_module)
V.add_hardpoint(new /obj/item/hardpoint/support/weapons_sensor)
V.add_hardpoint(new /obj/item/hardpoint/armor/ballistic)
V.add_hardpoint(new /obj/item/hardpoint/locomotion/treads)
V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret)
Expand Down
Loading