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.

Sign up for GitHub

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

Jump to bottom

PVE TONK BUFFS #128

Merged
merged 44 commits into from
Mar 11, 2024
Merged

PVE TONK BUFFS #128

Show file tree
Hide file tree
Changes from 33 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
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions code/datums/ammo/bullet/tank.dm
View file
Open in desktop
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 = 170
damage_var_high = PROJECTILE_VARIANCE_TIER_8
penetration = ARMOR_PENETRATION_TIER_6
penetration = ARMOR_PENETRATION_TIER_7
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions code/modules/vehicles/hardpoints/armor/armor.dm
View file
Open in desktop
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
health = 2000
2 changes: 1 addition & 1 deletion code/modules/vehicles/hardpoints/hardpoint_ammo/ltb_ammo.dm
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion code/modules/vehicles/hardpoints/primary/autocannon.dm
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions code/modules/vehicles/hardpoints/secondary/cupola.dm
View file
Open in desktop
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 @@ -27,9 +27,9 @@
gun_firemode_list = list(
GUN_FIREMODE_BURSTFIRE,
)
burst_amount = 3
burst_amount = 5
burst_delay = 0.3 SECONDS
extra_delay = 0.6 SECONDS
extra_delay = 0.2 SECONDS

/obj/item/hardpoint/secondary/m56cupola/set_bullet_traits()
..()
Expand Down
6 changes: 3 additions & 3 deletions code/modules/vehicles/hardpoints/secondary/flamer.dm
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
disp_icon_state = "glauncher"
activation_sounds = list('sound/weapons/gun_m92_attachable.ogg')

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

Expand Down
2 changes: 1 addition & 1 deletion code/modules/vehicles/hardpoints/secondary/secondary.dm
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions code/modules/vehicles/hardpoints/secondary/tow.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
disp_icon = "tank"
disp_icon_state = "towlauncher"

health = 500
health = 2000
firing_arc = 60

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 = 10.0 SECONDS

2 changes: 1 addition & 1 deletion code/modules/vehicles/hardpoints/support/artillery.dm
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions code/modules/vehicles/tank/tank.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
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" = 0.4, // Slashing a massive, solid chunk of metal does very little except leave scratches
"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
Loading