More Fluff Things

code/datums/ammo/bullet/lever_action.dm

@@ -50,7 +50,7 @@
 	handful_state = "marksman_lever_action_bullet"
 
 /datum/ammo/bullet/lever_action/xm88
-	name = ".458 SOCOM round"
+	name = "smart heavy rifle bullet"
 
 	damage = 80
 	penetration = ARMOR_PENETRATION_TIER_2

code/datums/supply_packs/ammo.dm

@@ -37,11 +37,11 @@
 	group = "Ammo"
 
 /datum/supply_packs/ammo_rounds_box_xm88
-	name = ".458 bullets box crate (x300 rounds)"
+	name = "smart anti-materiel bullets box crate (x300 rounds)"
 	contains = list(/obj/item/ammo_box/magazine/lever_action/xm88)
 	cost = 40
 	containertype = /obj/structure/closet/crate/ammo
-	containername = "\improper .458 bullets crate"
+	containername = "\improper smart anti-materiel bullets crate"
 	group = "Ammo"
 
 //------------------------Magazine Boxes crates----------------

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/datums/supply_packs/weapons.dm

@@ -114,10 +114,10 @@
 		/obj/item/storage/box/guncase/xm88,
 		/obj/item/storage/box/guncase/xm88,
 	)
-	name = "XM88 Heavy Rifle crate (XM88 x2)"
+	name = "XM88A Heavy Rifle crate (XM88A x2)"
 	cost = 40
 	containertype = /obj/structure/closet/crate/weapon
-	containername = "\improper XM88 Heavy Rifle crate"
+	containername = "\improper XM88A Heavy Rifle crate"
 	group = "Weapons"
 
 /* Uncomment me if it's decided to let the m707 be purchasable through req

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/machinery/vending/vendor_types/requisitions.dm

@@ -39,7 +39,7 @@
 		list("VP78 Pistol", round(scale * 4), /obj/item/storage/box/guncase/vp78, VENDOR_ITEM_REGULAR),
 		list("SU-6 Smart Pistol", round(scale * 3), /obj/item/storage/box/guncase/smartpistol, VENDOR_ITEM_REGULAR),
 		list("MOU-53 Shotgun", round(scale * 2), /obj/item/storage/box/guncase/mou53, VENDOR_ITEM_REGULAR),
-		list("XM88 Heavy Rifle", round(scale * 3), /obj/item/storage/box/guncase/xm88, VENDOR_ITEM_REGULAR),
+		list("XM88A Heavy Rifle", round(scale * 3), /obj/item/storage/box/guncase/xm88, VENDOR_ITEM_REGULAR),
 		list("M41AE2 Heavy Pulse Rifle", round(scale * 2.5), /obj/item/storage/box/guncase/lmg, VENDOR_ITEM_REGULAR),
 		list("M41A Pulse Rifle MK1", round(scale * 3), /obj/item/storage/box/guncase/m41aMK1, VENDOR_ITEM_REGULAR),
 		list("M56D Heavy Machine Gun", round(scale * 2), /obj/item/storage/box/guncase/m56d, VENDOR_ITEM_REGULAR),

code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm

@@ -12,7 +12,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list(
 		list("M56D Heavy Machine Gun", 0, /obj/item/storage/box/guncase/m56d, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
 		list("M79 Grenade Launcher", 0, /obj/item/storage/box/guncase/m79, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
 		list("MOU-53 Shotgun", 0, /obj/item/storage/box/guncase/mou53, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
-		list("XM88 Heavy Rifle", 0, /obj/item/storage/box/guncase/xm88, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
+		list("XM88A Heavy Rifle", 0, /obj/item/storage/box/guncase/xm88, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
 		list("Basic Engineering Supplies", 0, /obj/item/storage/box/kit/engineering_supply_kit, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
 
 		list("ARMORS", 0, null, null, null),

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/belt.dm

@@ -813,8 +813,8 @@
 		return ..()
 
 /obj/item/storage/belt/shotgun/xm88
-	name = "\improper M300 pattern .458 SOCOM loading rig"
-	desc = "An ammunition belt designed to hold the large .458 SOCOM caliber bullets for the XM88 heavy rifle."
+	name = "\improper M300 pattern XM88A loading rig"
+	desc = "An ammunition belt designed to hold the massive 10x38mm combustible case bullets for the XM88A heavy rifle."
 	icon_state = "boomslang-belt"
 	item_state = "marinebelt"
 	w_class = SIZE_LARGE

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

@@ -125,8 +125,8 @@
 	new /obj/item/storage/belt/gun/m44/lever_action/attach_holster(src)
 
 /obj/item/storage/box/guncase/xm88
-	name = "\improper XM88 heavy rifle case"
-	desc = "A gun case containing the XM88 Heavy Rifle, a prototype weapon designed for use against heavily armored infantry targets and light vehicles. Contains an ammunition belt, two boxes of ammunition, the XS-9 Targeting Relay attachment, and the stock for the rifle."
+	name = "\improper XM88A heavy rifle case"
+	desc = "A gun case containing the XM88A Heavy Rifle, a prototype weapon designed for use against heavily armored infantry targets and light vehicles. Contains an ammunition belt, two boxes of ammunition, the XS-9 Targeting Relay attachment, and the stock for the rifle."
 	storage_slots = 6
 	can_hold = list(/obj/item/weapon/gun/lever_action/xm88, /obj/item/attachable/stock/xm88, /obj/item/attachable/scope/mini/xm88, /obj/item/ammo_magazine/lever_action/xm88, /obj/item/storage/belt/shotgun/xm88)
 
@@ -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

@@ -1785,8 +1785,8 @@ Defined in conflicts.dm of the #defines folder.
 	scatter_unwielded_mod = SCATTER_AMOUNT_TIER_4
 
 /obj/item/attachable/stock/xm88
-	name = "\improper XM88 padded stock"
-	desc = "A specially made compound polymer stock reinforced with aluminum rods and thick rubber padding to shield the user from recoil. Fitted specifically for the XM88 Heavy Rifle."
+	name = "\improper XM88A padded stock"
+	desc = "A specially made compound polymer stock reinforced with aluminum rods and thick rubber padding to shield the user from recoil. Fitted specifically for the XM88A Heavy Rifle."
 	icon_state = "boomslang-stock"
 	wield_delay_mod = WIELD_DELAY_NORMAL
 	hud_offset_mod = 6
@@ -3096,8 +3096,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/guns/lever_action.dm

@@ -341,7 +341,7 @@ their unique feature is that a direct hit will buff your damage and firerate
 /obj/item/weapon/gun/lever_action/r4t/set_gun_attachment_offsets()
 	attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 19, "rail_x" = 11, "rail_y" = 21, "under_x" = 24, "under_y" = 16, "stock_x" = 15, "stock_y" = 14)
 
-//===================THE XM88===================\\
+//===================THE XM88A===================\\
 
 #define FLOATING_PENETRATION_TIER_0 0
 #define FLOATING_PENETRATION_TIER_1 1
@@ -350,9 +350,8 @@ their unique feature is that a direct hit will buff your damage and firerate
 #define FLOATING_PENETRATION_TIER_4 4
 
 /obj/item/weapon/gun/lever_action/xm88
-	name = "\improper XM88 heavy rifle"
-	desc = "An experimental man-portable anti-material rifle chambered in .458 SOCOM. It must be manually chambered for every shot.\nIt has a special property - when you obtain multiple direct hits in a row, its armor penetration and damage will increase."
-	desc_lore = "Originally developed by ARMAT Battlefield Systems for the government of the state of Greater Brazil for use in the Favela Wars (2161 - Ongoing) against mechanized infantry. The platform features an onboard computerized targeting system, sensor array, and an electronic autoloader; these features work in tandem to reduce and render inert armor on the users target with successive hits. The Almayer was issued a small amount of XM88s while preparing for Operation Swamp Hopper with the USS Nan-Shan."
+	name = "\improper XM88A heavy rifle"
+	desc = "Experimental AMR from ARMAT chambered in 10x38mm combustible case smart anti-materiel rounds, must be manually chambered for every shot. \nOnboard computer modifies targeting to improve ballistic impact by analyzing feedback from successive hits."
 	icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' // overriden with camos anyways
 	icon_state = "boomslang"
 	item_state = "boomslang"

code/modules/projectiles/guns/specialist/sniper.dm

@@ -284,8 +284,8 @@
 // end of actions sniper spe can take.
 
 /obj/item/weapon/gun/rifle/sniper/M42A
-	name = "\improper M42A scoped rifle"
-	desc = "A heavy sniper rifle manufactured by Armat Systems. It has a scope system and fires armor penetrating rounds out of a 15-round magazine.\n'Peace Through Superior Firepower'"
+	name = "\improper M42A scope rifle"
+	desc = "A scoped 10x28mm semi automatic rifle. The ARMAT M42A can file a complaint up to 3,800 meters, and feeds from 15rnd magazines. Comes with a multiple magnification scope, but is painfully useless up close."
 	icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi'
 	icon_state = "m42a"
 	item_state = "m42a"