flamer

code/datums/supply_packs/spec_ammo.dm

@@ -184,48 +184,48 @@
 	containername = "M4RA Scout Impact Magazine Crate"
 	group = "Weapons Specialist Ammo"
 
-//M240-T
+//M240E1
 
 /datum/supply_packs/ammo_pyro_mix
-	name = "M240-T Mixed Fuel Tank Crate (extended x1, type-B x1, type-X x1)"
+	name = "M240E1 Mixed Fuel Tank Crate (extended x1, type-B x1, type-X x1)"
 	contains = list(
 		/obj/item/ammo_magazine/flamer_tank/large,
 		/obj/item/ammo_magazine/flamer_tank/large/B,
 		/obj/item/ammo_magazine/flamer_tank/large/X,
 	)
 	cost = 60
 	containertype = /obj/structure/closet/crate/ammo/alt/flame
-	containername = "\improper M240-T Mixed Fuel Tank Crate"
+	containername = "\improper M240E1 Mixed Fuel Tank Crate"
 	group = "Weapons Specialist Ammo"
 
 /datum/supply_packs/ammo_pyro_extended
-	name = "M240-T Extended Fuel Tank Crate (extended x3)"
+	name = "M240E1 Extended Fuel Tank Crate (extended x3)"
 	contains = list(
 		/obj/item/ammo_magazine/flamer_tank/large,
 		/obj/item/ammo_magazine/flamer_tank/large,
 		/obj/item/ammo_magazine/flamer_tank/large,
 	)
 	cost = 30
 	containertype = /obj/structure/closet/crate/ammo/alt/flame
-	containername = "M240-T Extended Fuel Tank Crate"
+	containername = "M240E1 Extended Fuel Tank Crate"
 	group = "Weapons Specialist Ammo"
 
 /datum/supply_packs/ammo_pyro_b
-	name = "M240-T Type-B Fuel Tank Crate (x1)"
+	name = "M240E1 Type-B Fuel Tank Crate (x1)"
 	contains = list(
 		/obj/item/ammo_magazine/flamer_tank/large/B,
 	)
 	cost = 30
 	containertype = /obj/structure/closet/crate/ammo/alt/flame
-	containername = "M240-T Type-B Fuel Tank Crate"
+	containername = "M240E1 Type-B Fuel Tank Crate"
 	group = "Weapons Specialist Ammo"
 
 /datum/supply_packs/ammo_pyro_x
-	name = "M240-T Type-X Fuel Tank Crate (x1)"
+	name = "M240E1 Type-X Fuel Tank Crate (x1)"
 	contains = list(
 		/obj/item/ammo_magazine/flamer_tank/large/X,
 	)
 	cost = 40
 	containertype = /obj/structure/closet/crate/ammo/alt/flame
-	containername = "M240-T Type-X Fuel Tank Crate"
+	containername = "M240E1 Type-X Fuel Tank Crate"
 	group = "Weapons Specialist Ammo"

code/game/machinery/autolathe_datums.dm

@@ -322,12 +322,12 @@
 	category = AUTOLATHE_CATEGORY_EXPLOSIVES
 
 /datum/autolathe/recipe/armylathe/flamer_tank
-	name = "Custom M240A1 Fuel Tank"
+	name = "Custom M240 Fuel Tank"
 	path = /obj/item/ammo_magazine/flamer_tank/custom
 	category = AUTOLATHE_CATEGORY_EXPLOSIVES
 
 /datum/autolathe/recipe/armylathe/large_flamer_tank
-	name = "Custom M240-T Fuel Tank"
+	name = "Custom M240E1 Fuel Tank"
 	path = /obj/item/ammo_magazine/flamer_tank/custom/large
 	category = AUTOLATHE_CATEGORY_EXPLOSIVES
 

code/game/objects/items/storage/backpack.dm

@@ -901,7 +901,7 @@
 // Pyrotechnician Spec backpack fuel tank
 /obj/item/storage/backpack/marine/engineerpack/flamethrower
 	name = "\improper USCM Pyrotechnician G6-2 fueltank"
-	desc = "A specialized fueltank worn by USCM Pyrotechnicians for use with the M240-T incinerator unit. A small general storage compartment is installed."
+	desc = "A specialized tank pack for the M240E1 incinerator unit. A small general storage compartment is installed."
 	icon_state = "flamethrower_tank"
 	max_fuel = 500
 	fuel_type = "utnapthal"

code/game/objects/items/storage/large_holster.dm

@@ -187,7 +187,7 @@
 
 /obj/item/storage/large_holster/fuelpack
 	name = "\improper Broiler-T flexible refueling system"
-	desc = "A specialized back harness that carries the Broiler-T flexible refueling system. Designed by and for USCM Pyrotechnicians."
+	desc = "Reinforced backpack tank complex for the M240E1 Incinerator, used by some USCMC units making more aggressive use of the M240 Incinerator."
 	icon = 'icons/obj/items/clothing/backpacks.dmi'
 	icon_state = "flamethrower_broiler"
 	flags_atom = FPRINT|CONDUCT
@@ -263,7 +263,7 @@
 
 	var/obj/item/weapon/gun/flamer/M240T/flamer = user.get_active_hand()
 	if(!istype(flamer))
-		to_chat(user, "You must be holding the M240-T incinerator unit to use [src]")
+		to_chat(user, "You must be holding the M240E1 incinerator unit to use [src]")
 		return
 
 	if(!active_fuel)
@@ -337,7 +337,7 @@
 /obj/item/storage/large_holster/fuelpack/get_examine_text(mob/user)
 	. = ..()
 	if(contents.len)
-		. += "It is storing a M240-T incinerator unit."
+		. += "It is storing a M240E1 incinerator unit."
 	if (get_dist(user, src) <= 1)
 		if(fuel)
 			. += "The [fuel.caliber] currently contains: [round(fuel.get_ammo_percent())]% fuel."

code/game/objects/items/storage/pouch.dm

@@ -80,7 +80,7 @@
 
 /obj/item/storage/pouch/flamertank
 	name = "fuel tank strap pouch"
-	desc = "Two ring straps to loop around M240-pattern napalm tanks. Handle with care."
+	desc = "Two ring straps to loop around M240-pattern napthal tanks. Handle with care."
 	storage_slots = 2
 	icon_state = "fueltank_pouch"
 	storage_flags = STORAGE_FLAGS_POUCH

code/game/objects/structures/crates_lockers/largecrate_supplies.dm

@@ -126,8 +126,8 @@
 	supplies = list(/obj/item/weapon/gun/revolver/m44 = 6, /obj/item/weapon/gun/pistol/m4a3 = 12)
 
 /obj/structure/largecrate/supply/weapons/flamers
-	name = "\improper M240A1 incinerator weapons chest (x4)"
-	desc = "A weapons chest containing four M240A1 incinerator units."
+	name = "\improper M240 incinerator weapons chest (x4)"
+	desc = "A weapons chest containing four M240 incinerator units."
 	supplies = list(/obj/item/weapon/gun/flamer = 4)
 
 /obj/structure/largecrate/supply/weapons/hpr

code/modules/cm_marines/equipment/guncases.dm

@@ -141,7 +141,7 @@
 //------------
 /obj/item/storage/box/guncase/flamer
 	name = "\improper M240 incinerator case"
-	desc = "A gun case containing the M240A1 incinerator unit. It does come loaded, but you'll still have to find extra tanks as you go."
+	desc = "A gun case containing the M240 incinerator unit, underbarrel extinguisher, and two spare tanks."
 	storage_slots = 4
 	can_hold = list(/obj/item/weapon/gun/flamer, /obj/item/ammo_magazine/flamer_tank, /obj/item/attachable/attached_gun/extinguisher)
 
@@ -152,6 +152,7 @@
 	new /obj/item/attachable/attached_gun/extinguisher(src)
 
 /obj/item/storage/box/guncase/flamer/special
+	desc = "A gun case containing the M240 incinerator unit, underbarrel extinguisher, and spare tank."
 	storage_slots = 3
 
 /obj/item/storage/box/guncase/flamer/special/fill_preset_inventory()

code/modules/projectiles/gun_attachables.dm

@@ -3092,8 +3092,7 @@ Defined in conflicts.dm of the #defines folder.
 
 /obj/item/attachable/attached_gun/flamer_nozzle
 	name = "XM-VESG-1 flamer nozzle"
-	desc = "A special nozzle designed to alter flamethrowers to be used in a more offense orientated manner. As the inside of the nozzle is coated in a special gel and resin substance that takes the fuel that passes through and hardens it. Upon exiting the barrel, a cluster of burning gel is projected instead of a stream of burning naphtha."
-	desc_lore = "The Experimental Volatile-Exothermic-Sphere-Generator clip-on nozzle attachment for the M240A1 incinerator unit was specifically designed to allow marines to launch fireballs into enemy foxholes and bunkers. Despite the gel and resin coating, the flaming ball of naptha tears apart due the drag caused by launching it through the air, leading marines to use the attachment as a makeshift firework launcher during shore leave."
+	desc = "The Experimental Volatile Exothermic Sphere Generator is a replacement nozzle attachment which allows for the firing of semi-solidified napthal balls instead of a continuous stream."
 	icon_state = "flamer_nozzle"
 	attach_icon = "flamer_nozzle_a_1"
 	w_class = SIZE_MEDIUM

code/modules/projectiles/guns/flamer/flamer.dm

@@ -4,8 +4,8 @@
 //FLAMETHROWER
 
 /obj/item/weapon/gun/flamer
-	name = "\improper M240A1 incinerator unit"
-	desc = "M240A1 incinerator unit has proven to be one of the most effective weapons at clearing out soft-targets. This is a weapon to be feared and respected as it is quite deadly."
+	name = "\improper M240 incinerator unit"
+	desc = "The M240 incinerator is a carbine-length flamethrower. It is fed by a highly pressurized ultra-thick napthal tank. The initial stream is more effective than the ground tiles.\nUnique-Action to toggle the pilot light."
 	icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi'
 	icon_state = "m240"
 	item_state = "m240"
@@ -260,8 +260,8 @@
 	current_mag = /obj/item/ammo_magazine/flamer_tank
 
 /obj/item/weapon/gun/flamer/M240T
-	name = "\improper M240-T incinerator unit"
-	desc = "An improved version of the M240A1 incinerator unit, the M240-T model is capable of dispersing a larger variety of fuel types."
+	name = "\improper M240E1 incinerator unit"
+	desc = "Tmproved version of the M240 incinerator unit, the M240E1 enhancement is capable of dispersing a larger variety of fuel types."
 	icon_state = "m240t"
 	item_state = "m240t"
 	unacidable = TRUE
@@ -372,8 +372,8 @@
 	return FALSE
 
 /obj/item/weapon/gun/flamer/M240T/auto // With NEW advances in science, we've learned how to drain a pyro's tank in 6 seconds, or your money back!
-	name = "\improper M240-T2 incinerator unit"
-	desc = "A prototyped model of the M240-T incinerator unit, it was discontinued after its automatic mode was deemed too expensive to deploy in the field."
+	name = "\improper XM240E1 incinerator unit"
+	desc = "A prototyped model of the M240E1 incinerator unit, it was discontinued after its automatic mode was deemed too expensive to deploy in the field."
 	start_semiauto = FALSE
 	start_automatic = TRUE
 

code/modules/projectiles/magazines/flamer.dm

@@ -4,7 +4,7 @@
 
 /obj/item/ammo_magazine/flamer_tank
 	name = "incinerator tank"
-	desc = "A fuel tank used to store fuel for use in the M240 incinerator unit. Handle with care."
+	desc = "A fuel tank used to store the M240 incinerator unit's UT-Napthal. Handle with care."
 	icon = 'icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi'
 	icon_state = "flametank_custom"
 	item_state = "flametank"
@@ -147,7 +147,7 @@
 
 /obj/item/ammo_magazine/flamer_tank/EX
 	name = "incinerator tank (EX)"
-	desc = "A fuel tank of Ultra Thick Napthal Fuel type EX, a sticky combustible liquid chemical that burns so hot it melts straight through flame-resistant material, for use in the M240-T incinerator unit. Handle with care."
+	desc = "A fuel tank of Ultra Thick Napthal Fuel type EX, a sticky combustible liquid chemical that burns so hot it melts straight through flame-resistant material, for use in the M240E1 incinerator unit. Handle with care."
 	caliber = "Napalm EX"
 	flamer_chem = "napalmex"
 
@@ -185,7 +185,7 @@
 // Pyro regular flamer tank just bigger than the base flamer tank.
 /obj/item/ammo_magazine/flamer_tank/large
 	name = "large incinerator tank"
-	desc = "A large fuel tank used to store fuel for use in the M240-T incinerator unit. Handle with care."
+	desc = "A large fuel tank used to store fuel for use in the M240E1 incinerator unit. Handle with care."
 	icon_state = "flametank_large_custom"
 	item_state = "flametank_large"
 	max_rounds = 250
@@ -202,8 +202,8 @@
 
 // This is the green flamer fuel for the pyro.
 /obj/item/ammo_magazine/flamer_tank/large/B
-	name = "large incinerator tank (B)"
-	desc = "A large fuel tank of Ultra Thick Napthal Fuel type B, a special variant of napalm that is easily extinguished, but disperses over a wide area while burning slowly. The composition reacts with inorganic materials to break them down, causing severe damage. For use in the M240-T incinerator unit. Handle with care."
+	name = "large incinerator tank (Grn)"
+	desc = "A large tank of Chemically Reactive Antistructure, M240E1 compatible. Reacts aggressively with inorganic compounds, for use against protected structures or protected personnel. Easier to extinguish, and thermal effect is lessened."
 	caliber = "Napalm B"
 	flamer_chem = "napalmb"
 
@@ -212,15 +212,15 @@
 // This is the blue flamer fuel for the pyro.
 /obj/item/ammo_magazine/flamer_tank/large/X
 	name = "large incinerator tank (X)"
-	desc = "A large fuel tank of Ultra Thick Napthal Fuel type X, a sticky combustible liquid chemical that burns extremely hot, for use in the M240-T incinerator unit. Handle with care."
+	desc = "A large tank of U-T Napthal-X, M240E1 compatible. Intended to cause maximum thermal damage to hit targets."
 	caliber = "Napalm X"
 	flamer_chem = "napalmx"
 
 	max_range = 6
 
 /obj/item/ammo_magazine/flamer_tank/large/EX
 	name = "large incinerator tank (EX)"
-	desc = "A large fuel tank of Ultra Thick Napthal Fuel type EX, a sticky combustible liquid chemical that burns so hot it melts straight through flame-resistant material, for use in the M240-T incinerator unit. Handle with care."
+	desc = "A large tank of U-T Napthal-EX, M240E1 compatible. Formulated for maximum temperature and capable of reacting with nearly any substance."
 	caliber = "Napalm EX"
 	flamer_chem = "napalmex"
 
@@ -229,7 +229,7 @@
 //Custom pyro tanks
 /obj/item/ammo_magazine/flamer_tank/custom/large
 	name = "large custom incinerator tank"
-	desc = "A large fuel tank for use in the M240-T incinerator unit. This one has been modified with a pressure regulator and a large internal propellant tank. Must be manually attached."
+	desc = "A large fuel tank for use in the M240E1 incinerator unit. This one has been modified with a pressure regulator and a large internal propellant tank. Must be manually attached."
 	gun_type = /obj/item/weapon/gun/flamer/M240T
 	max_rounds = 250