changes the fuel from snowflake blueflame to high-combustion napalm, …

…reduces the radius by 1 tile
cmss13-devs · Jun 28, 2024 · f9600b8 · f9600b8
1 parent acb92cc
commit f9600b8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/code/datums/ammo/misc.dm b/code/datums/ammo/misc.dm
@@ -49,20 +49,20 @@
 	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
-	icon_state = "pulse1"
 
 /datum/ammo/flamethrower/tank_flamer/drop_flame(turf/turf, datum/cause_data/cause_data)
 	if(!istype(turf))
 		return
 
-	var/datum/reagent/napalm/blue/reagent = new()
-	reagent.durationfire = BURN_TIME_TIER_1
-	new /obj/flamer_fire(turf, cause_data, reagent, 2)
+	var/datum/reagent/napalm/high_damage/reagent = new()
+	//This weapon originally fired Napalm X. To keep the same damage output as before, we'll change the intensity.
+	reagent.intensityfire = BURN_LEVEL_TIER_7
+	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(2, 0, turf, null, 4, cause_data)
+	landingsmoke.set_up(1, 0, turf, null, 4, cause_data)
 	landingsmoke.start()
 	landingsmoke = null
 

diff --git 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
@@ -1,6 +1,6 @@
 /obj/item/hardpoint/primary/flamer
 	name = "DRG-N Offensive Flamer Unit"
-	desc = "A primary weapon for the tank that spews out a custom variant of X-Napathal in a wide radius. The fuel burns intensely and quickly, which allows for it to be used offensively by armoured vehicles."
+	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"