From 6c11cc072aa44e47058c8fbaae3eec584d14bdb6 Mon Sep 17 00:00:00 2001 From: Roxy <75404941+TealSeer@users.noreply.github.com> Date: Fri, 7 Mar 2025 22:17:36 -0500 Subject: [PATCH] Projectile speed fixes (#3265) ## About The Pull Request https://github.com/tgstation/tgstation/pull/87740 changed projectile math so that lower numbers are slower instead of faster, this PR tweaks our modular projectiles to match this. ## Why It's Good For The Game Fixes #3234 and fixes #3220 ## Proof Of Testing TRUST ## Changelog :cl: fix: fixed various projectiles having inverted speeds /:cl: --------- Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com> --- .../modules/microfusion/code/projectiles.dm | 4 ++-- .../carwo_defense_systems/ammo/grenade.dm | 2 +- .../carwo_defense_systems/ammo/rifle.dm | 2 +- .../romulus_technology/ammo/pistol.dm | 2 +- .../saibasan/projectiles.dm | 12 ++++++------ .../szot_dynamica/ammo/plasma.dm | 2 +- .../szot_dynamica/ammo/rifle.dm | 2 +- modular_zubbers/code/game/objects/items/more_pkas.dm | 2 +- .../bloodsucker/powers/tremere/thaumaturgy.dm | 1 - 9 files changed, 14 insertions(+), 15 deletions(-) diff --git a/modular_skyrat/modules/microfusion/code/projectiles.dm b/modular_skyrat/modules/microfusion/code/projectiles.dm index abf33c01d5d..83749597ca3 100644 --- a/modular_skyrat/modules/microfusion/code/projectiles.dm +++ b/modular_skyrat/modules/microfusion/code/projectiles.dm @@ -52,7 +52,7 @@ icon_state = "laser_greyscale" wound_bonus = 0 damage = 25 // Basically a hellfire beam - speed = 0.6 + speed = 1.6 color = LIGHT_COLOR_FLARE light_color = LIGHT_COLOR_FLARE @@ -78,7 +78,7 @@ tracer_type = /obj/effect/projectile/tracer/heavy_laser muzzle_type = /obj/effect/projectile/muzzle/heavy_laser impact_type = /obj/effect/projectile/impact/heavy_laser - speed = 0.4 + speed = 2.5 /obj/projectile/beam/laser/microfusion/xray name = "x-ray microfusion laser" diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/grenade.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/grenade.dm index fa3e2e80460..79c051eb5fa 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/grenade.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/grenade.dm @@ -47,7 +47,7 @@ range = 14 - speed = 2 // Higher means slower, y'all + speed = 0.5 sharpness = NONE diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/rifle.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/rifle.dm index 74e317db678..2c2d37fc93b 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/rifle.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/rifle.dm @@ -113,7 +113,7 @@ icon_state = "gaussphase" - speed = 0.5 + speed = 2 damage = 25 armour_penetration = 20 diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/pistol.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/pistol.dm index 66126cac161..c53b7cc3767 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/pistol.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/pistol.dm @@ -70,5 +70,5 @@ wound_bonus = -10 bare_wound_bonus = -10 armour_penetration = 45 - speed = 0.5 + speed = 2 range = 14 diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/saibasan/projectiles.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/saibasan/projectiles.dm index 57979b1191a..4df222b5ee6 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/saibasan/projectiles.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/saibasan/projectiles.dm @@ -26,7 +26,7 @@ icon_state = "sniper" damage = 50 impact_effect_type = /obj/effect/temp_visual/impact_effect/yellow_laser - speed = 0.4 + speed = 2.5 light_range = 2 light_color = COLOR_VERY_SOFT_YELLOW wound_falloff_tile = -0.1 @@ -58,7 +58,7 @@ name = "plasma grenade" icon_state = "grenade" damage = 50 - speed = 2 + speed = 0.5 range = 6 impact_effect_type = /obj/effect/temp_visual/impact_effect/green_laser light_color = COLOR_PALE_GREEN @@ -86,7 +86,7 @@ name = "plasma globule" icon_state = "flare" damage = 10 - speed = 2.5 + speed = 0.4 bare_wound_bonus = 55 // Lasers have a wound bonus of 40, this is a bit higher wound_bonus = -50 // However we do not very much against armor range = 2 @@ -114,7 +114,7 @@ icon_state = "because_it_doesnt_miss" damage = 10 impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser - speed = 0.8 + speed = 1.25 light_color = COLOR_SCIENCE_PINK range = 9 damage_falloff_tile = -0.5 @@ -131,7 +131,7 @@ icon_state = "hellfire" damage = 30 impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser - speed = 0.6 + speed = 1.6 wound_bonus = 0 light_color = COLOR_SOFT_RED @@ -172,7 +172,7 @@ name = "plasma flare" icon_state = "flare" damage = 30 - speed = 2 + speed = 0.5 range = 6 impact_effect_type = /obj/effect/temp_visual/impact_effect/green_laser light_color = COLOR_PALE_GREEN diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/plasma.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/plasma.dm index a3cb7af0b03..396bae41b43 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/plasma.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/plasma.dm @@ -14,7 +14,7 @@ icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/ammo.dmi' icon_state = "plasma_glob" damage = 10 - speed = 1.5 + speed = 0.6 bare_wound_bonus = 55 // Lasers have a wound bonus of 40, this is a bit higher wound_bonus = -50 // However we do not very much against armor pass_flags = PASSTABLE | PASSGRILLE // His ass does NOT pass through glass! diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/rifle.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/rifle.dm index 562734bbfee..3fc907c7c1c 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/rifle.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/rifle.dm @@ -53,7 +53,7 @@ /obj/projectile/bullet/p60strela // The funny thing is, these are wild but you only get three of them a magazine name =".60 Strela bullet" icon_state = "gaussphase" - speed = 0.4 + speed = 2.5 damage = 50 armour_penetration = 50 wound_bonus = 20 diff --git a/modular_zubbers/code/game/objects/items/more_pkas.dm b/modular_zubbers/code/game/objects/items/more_pkas.dm index 87247e20b6f..17fb460cc44 100644 --- a/modular_zubbers/code/game/objects/items/more_pkas.dm +++ b/modular_zubbers/code/game/objects/items/more_pkas.dm @@ -166,7 +166,7 @@ armor_flag = BOMB range = 6 pressure_decrease = 0.10 //Pressured enviorments are a no go for the railgun - speed = 0.1 //NYOOM + speed = 10 //NYOOM projectile_piercing = PASSMOB /obj/projectile/kinetic/repeater diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm index 4913dc2171b..a310295eeb5 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm @@ -219,7 +219,6 @@ damage = 1 wound_bonus = 20 armour_penetration = 30 - speed = 1 speed = 0.6 impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser range = 30