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

Tank Equipment Tweaks #591

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion code/datums/ammo/bullet/tank.dm
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
accuracy_var_low = PROJECTILE_VARIANCE_TIER_8
accuracy_var_high = PROJECTILE_VARIANCE_TIER_8
accurate_range = 12
damage = 40
damage = 125
penetration = ARMOR_PENETRATION_TIER_6
damage_armor_punch = 1

Expand Down
4 changes: 2 additions & 2 deletions code/datums/ammo/rocket.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
accuracy_var_low = PROJECTILE_VARIANCE_TIER_9
accurate_range = 6
max_range = 6
damage = 10
damage = 200
penetration= ARMOR_PENETRATION_TIER_10


Expand Down Expand Up @@ -163,7 +163,7 @@
accuracy = HIT_ACCURACY_TIER_3
accurate_range = 32
max_range = 32
damage = 200
damage = 300
shell_speed = AMMO_SPEED_TIER_3

/datum/ammo/rocket/ltb/on_hit_mob(mob/mob, obj/projectile/projectile)
Expand Down
13 changes: 7 additions & 6 deletions code/modules/cm_marines/dropship_ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -137,17 +137,18 @@
name = "\improper 25mm multipurpose ammunition crate"
icon_state = "30mm_crate"
desc = "A 400rnd reinforced crate of Armor Piercing High Explosive and Incendiary 25mm ammunition for use with the GAU-113 rotary autocannon. Best used against light structures, personnel in the open, or thinskin vehicles. Entirely ineffective against heavier armor."
travelling_time = 50
equipment_type = /obj/structure/dropship_equipment/weapon/heavygun
ammo_count = 400
max_ammo_count = 400
transferable_ammo = TRUE
ammo_used_per_firing = 40
point_cost = 275
fire_mission_delay = 2
var/bullet_spread_range = 3 //how far from the real impact turf can bullets land
var/bullet_spread_range = 2 //how far from the real impact turf can bullets land
var/shrapnel_type = /datum/ammo/bullet/shrapnel/gau //For siming 30mm bullet impacts.
var/directhit_damage = 105 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs.
var/penetration = 10 //AP value pretty much
var/directhit_damage = 150 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs.
var/penetration = 15 //AP value pretty much

/obj/structure/ship_ammo/heavygun/get_examine_text(mob/user)
. = ..()
Expand Down Expand Up @@ -199,11 +200,11 @@
ammo_count = 400
max_ammo_count = 400
ammo_used_per_firing = 40
bullet_spread_range = 4
bullet_spread_range = 3
point_cost = 325
fire_mission_delay = 2
shrapnel_type = /datum/ammo/bullet/shrapnel/gau/at
directhit_damage = 80 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs.
directhit_damage = 100 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs.
penetration = 40 //AP value pretty much

//laser battery
Expand Down Expand Up @@ -391,7 +392,7 @@
ammo_count = 6
max_ammo_count = 6
ammo_name = "minirocket"
travelling_time = 80 //faster than 30mm cannon, slower than real rockets
travelling_time = 40 //faster than 30mm cannon, slower than real rockets
transferable_ammo = TRUE
point_cost = 300
fire_mission_delay = 3 //high cooldown
Expand Down
4 changes: 2 additions & 2 deletions code/modules/vehicles/hardpoints/armor/ballistic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
disp_icon_state = "ballistic_armor"

type_multipliers = list(
"bullet" = 0.67,
"slash" = 0.67,
"bullet" = 0.87,
"slash" = 0.87,
"all" = 0.9
)
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 @@ -25,7 +25,7 @@
gun_firemode_list = list(
GUN_FIREMODE_AUTOMATIC,
)
fire_delay = 0.7 SECONDS
fire_delay = 0.5 SECONDS

/obj/item/hardpoint/primary/autocannon/set_bullet_traits()
..()
Expand Down
Loading