From 520fbf72cef9389b7c3c20d7ed18239a0aec2506 Mon Sep 17 00:00:00 2001 From: Vile Beggar Date: Fri, 19 Jul 2024 03:00:33 +0200 Subject: [PATCH] Changes the tank's primary flamer to fire a 3-tile wide glob of high-combustion napalm (#6579) # About the pull request the tank's primary flamer weapon (the "DRG-N Offensive Flamer Unit") now fires a glob of high-combustion napalm that spreads to a 3-tile wide circle, somewhat similar to what it was before. it burns slightly hotter than blue flame (45 vs 40 intensity). it also spawns a harmless smoke cloud for cosmetic effect. my reasoning behind this is that the tank does not have a way of extinguishing the flames on its own, and with how quickly it can fire off flame globs it could potentially stall pushes for a really, really long time. that kind of ruins the "offensive" part of the weapon imo. high-combustion napalm burns out quickly which would probably lessen this issue. the slightly higher damage output should be offset by the fact that you can extinguish the flames in one roll. ~~i am also unsure of why this glob radius got removed. i couldn't find anything relating to it's removal, nor if it was intended or not. it might be worthwhile to lower the radius by one tile (imo this a bit too much range) but for now i'm just reverting it to how it was before.~~ ~~i at least think this is how it acted before (barring the short duration, that's just something i changed). i'm just working off what i have since i don't have any memories of the tank from back then.~~
old picture for reference ![image](https://github.com/cmss13-devs/cmss13/assets/17518895/8b21eb74-d7fd-4ef1-a701-0580786e51bc)
# Explain why it's good for the game currently the primary flamer just fires 1 tile of blue flame which is very underwhelming for what is supposed to be a primary weapon for the tank. it might need a few tweaks but with these changes it will be a very potent weapon, fit for being a proper primary. # Testing Photographs and Procedure
Screenshots & Videos https://github.com/cmss13-devs/cmss13/assets/17518895/a04aaf55-7ab8-4446-82c3-cbe76b6c696f Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: balance: The DRG-N Offensive Flamer Unit now fires a 3-tile wide glob of high-combustion napalm. /:cl: --- code/datums/ammo/misc.dm | 15 +++++++++++++-- code/game/objects/effects/effect_system/smoke.dm | 2 +- .../hardpoint_ammo/primary_flamer_ammo.dm | 2 +- .../modules/vehicles/hardpoints/primary/flamer.dm | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/code/datums/ammo/misc.dm b/code/datums/ammo/misc.dm index 9a9ed2fb505b..28610f283df2 100644 --- a/code/datums/ammo/misc.dm +++ b/code/datums/ammo/misc.dm @@ -49,10 +49,21 @@ drop_flame(get_turf(P), P.weapon_cause_data) /datum/ammo/flamethrower/tank_flamer - flamer_reagent_id = "napalmx" - + flamer_reagent_id = "highdamagenapalm" max_range = 8 +/datum/ammo/flamethrower/tank_flamer/drop_flame(turf/turf, datum/cause_data/cause_data) + if(!istype(turf)) + return + + var/datum/reagent/napalm/high_damage/reagent = new() + new /obj/flamer_fire(turf, cause_data, reagent, 1) + + var/datum/effect_system/smoke_spread/landingsmoke = new /datum/effect_system/smoke_spread + landingsmoke.set_up(1, 0, turf, null, 4, cause_data) + landingsmoke.start() + landingsmoke = null + /datum/ammo/flamethrower/sentry_flamer flags_ammo_behavior = AMMO_IGNORE_ARMOR|AMMO_IGNORE_COVER|AMMO_FLAME flamer_reagent_id = "napalmx" diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm index d4152bdee37e..d0ea5d2ed5ef 100644 --- a/code/game/objects/effects/effect_system/smoke.dm +++ b/code/game/objects/effects/effect_system/smoke.dm @@ -731,7 +731,7 @@ location = get_turf(loca) if(direct) direction = direct - if(lifetime) + if(smoke_time) lifetime = smoke_time radius = min(radius, 10) amount = radius diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/primary_flamer_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/primary_flamer_ammo.dm index def6016f0759..a164b38383b8 100644 --- a/code/modules/vehicles/hardpoints/hardpoint_ammo/primary_flamer_ammo.dm +++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/primary_flamer_ammo.dm @@ -1,7 +1,7 @@ /obj/item/ammo_magazine/hardpoint/primary_flamer name = "DRG-N Offensive Flamer Unit Fuel Tank" desc = "A primary armament flamethrower magazine." - caliber = "Napalm X" //correlates to flamer mags + caliber = "High-Combustion Napalm" //correlates to flamer mags icon_state = "drgn_flametank" w_class = SIZE_LARGE max_rounds = 60 diff --git a/code/modules/vehicles/hardpoints/primary/flamer.dm b/code/modules/vehicles/hardpoints/primary/flamer.dm index fce6e7f6a410..60a7979cd5fb 100644 --- a/code/modules/vehicles/hardpoints/primary/flamer.dm +++ b/code/modules/vehicles/hardpoints/primary/flamer.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/primary/flamer name = "\improper DRG-N Offensive Flamer Unit" - desc = "A primary weapon for the tank that spews fire everywhere." + desc = "A primary weapon for the tank that spews out high-combustion napalm in a wide radius. The fuel burns intensely and quickly, which allows for it to be used offensively by armoured vehicles." icon_state = "drgn_flamer" disp_icon = "tank"