Misc PVP Flavor Text Removal

code/game/machinery/vending/vendor_types/food.dm

@@ -1,7 +1,7 @@
 //------------CANTEEN MRE VENDOR---------------
 /obj/structure/machinery/cm_vending/sorted/marine_food
-	name = "\improper ColMarTech Food Vendor"
-	desc = "USCM Food Vendor, containing standard military Prepared Meals."
+	name = "\improper Shipborne Auto-Chef"
+	desc = "A robotic food preparation complex, dispensing meals from a list of options. After some few decades of subjective time, the fact that it can put together edible food from ship stores is a miracle. A second miracle would be making it consistently tasty..."
 	icon_state = "marine_food"
 	hackable = TRUE
 	unacidable = FALSE
@@ -11,13 +11,13 @@
 /obj/structure/machinery/cm_vending/sorted/marine_food/populate_product_list(scale)
 	listed_products = list(
 		list("PREPARED MEALS", -1, null, null),
-		list("USCM Prepared Meal (Chicken)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal5, VENDOR_ITEM_REGULAR),
-		list("USCM Prepared Meal (Cornbread)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal1, VENDOR_ITEM_REGULAR),
-		list("USCM Prepared Meal (Pasta)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal3, VENDOR_ITEM_REGULAR),
-		list("USCM Prepared Meal (Pizza)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal4, VENDOR_ITEM_REGULAR),
-		list("USCM Prepared Meal (Pork)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal2, VENDOR_ITEM_REGULAR),
-		list("USCM Prepared Meal (Tofu)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal6, VENDOR_ITEM_REGULAR),
-		list("USCM Protein Bar", 50, /obj/item/reagent_container/food/snacks/protein_pack, VENDOR_ITEM_REGULAR),
+		list("Prepared Meal (Chicken)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal5, VENDOR_ITEM_REGULAR),
+		list("Prepared Meal (Cornbread)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal1, VENDOR_ITEM_REGULAR),
+		list("Prepared Meal (Pasta)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal3, VENDOR_ITEM_REGULAR),
+		list("Prepared Meal (Pizza)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal4, VENDOR_ITEM_REGULAR),
+		list("Prepared Meal (Pork)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal2, VENDOR_ITEM_REGULAR),
+		list("Prepared Meal (Tofu)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal6, VENDOR_ITEM_REGULAR),
+		list("Protein Bar", 50, /obj/item/reagent_container/food/snacks/protein_pack, VENDOR_ITEM_REGULAR),
 		list("FLASKS", -1, null, null),
 		list("Canteen", 10, /obj/item/reagent_container/food/drinks/flask/canteen, VENDOR_ITEM_REGULAR),
 		list("Metal Flask", 10, /obj/item/reagent_container/food/drinks/flask, VENDOR_ITEM_REGULAR),

code/game/objects/items/cosmetics.dm

@@ -31,7 +31,7 @@
 
 /obj/item/facepaint/sniper
 	name = "fullbody paint"
-	desc = "Paint, for your face. This facepaint is meant to help you blend in with the foliage, but studies on this are at best inconclusive. Wipe it off your face with some paper if you need to."
+	desc = "Paint, for your entire body. Not incredibly useful unless you plan to really go commando. Wipe it off your face with some paper if you need to."
 	paint_type = "full_camo"
 	icon_state = "full_camo"
 
@@ -42,8 +42,8 @@
 	icon_state = "skull_camo"
 
 /obj/item/facepaint/sunscreen_stick
-	name= "\improper USCM issue sunscreen"
-	desc = "A stick of SPF 50 sunscreen, issued to you by the good brass of the Corps. Whereas the previously issued sunscreen was toxic upon ingestion, this batch improves upon that by only containing excessive amounts of cadmium."
+	name= "\improper service issue sunscreen"
+	desc = "A stick of service issue SPF 50 sunscreen with the Marine logo on the bottom. Nontoxic, weather-resistant, smells horrible even after it's been washed off."
 	paint_type = "sunscreen_stick"
 	icon_state = "sunscreen_stick"
 

code/modules/client/preferences_gear.dm

@@ -1071,9 +1071,9 @@ var/global/list/gear_datums_by_name = list()
 	cost = 3
 
 /datum/gear/misc/sunscreen_stick
-	display_name = "USCM issue sunscreen"
+	display_name = "Service issue sunscreen"
 	path = /obj/item/facepaint/sunscreen_stick
-	cost = 1 //The cadmium poisoning pays for the discounted cost longterm
+	cost = 1
 	allowed_origins = USCM_ORIGINS
 
 /datum/gear/misc/patch_uscm

code/modules/cm_marines/equipment/gear.dm

@@ -198,8 +198,8 @@
 
 
 /obj/item/reagent_container/food/snacks/protein_pack
-	name = "stale USCM protein bar"
-	desc = "The most fake-looking protein bar you have ever laid eyes on, covered in a substitution chocolate. The powder used to make these is a substitute of a substitute of whey substitute."
+	name = "chocolate coated protein bar"
+	desc = "Sort of chocolate flavored nutrient bar that theoretically provides all of the resources the body needs for a few hours of combat. Excessively sweetened with long-stability sweeteners."
 	icon_state = "yummers"
 	filling_color = "#ED1169"
 	w_class = SIZE_TINY
@@ -212,13 +212,12 @@
 
 /obj/item/reagent_container/food/snacks/mre_pack
 	name = "\improper generic MRE pack"
-	//trash = /obj/item/trash/USCMtray
-	trash = null
+	trash = /obj/item/trash/USCMtray
 	w_class = SIZE_SMALL
 
 /obj/item/reagent_container/food/snacks/mre_pack/meal1
-	name = "\improper USCM Prepared Meal (cornbread)"
-	desc = "A tray of standard USCM food. Stale cornbread, tomato paste and some green goop fill this tray."
+	name = "\improper Prepared Meal (cornbread)"
+	desc = "A tray of machine prepared food. Consists of what is supposedly cornbread, slightly bitter tomato paste, and some green... sauce?"
 	icon_state = "MREa"
 	filling_color = "#ED1169"
 
@@ -228,8 +227,8 @@
 	bitesize = 3
 
 /obj/item/reagent_container/food/snacks/mre_pack/meal2
-	name = "\improper USCM Prepared Meal (pork)"
-	desc = "A tray of standard USCM food. Partially raw pork, goopy corn and some watery mashed potatoes fill this tray."
+	name = "\improper Prepared Meal (pork)"
+	desc = "A tray of machine prepared food. Consists of well prepared pork, oversalted mashed potatoes, and weirdly watery corn."
 	icon_state = "MREb"
 
 /obj/item/reagent_container/food/snacks/mre_pack/meal2/Initialize()
@@ -238,8 +237,8 @@
 	bitesize = 2
 
 /obj/item/reagent_container/food/snacks/mre_pack/meal3
-	name = "\improper USCM Prepared Meal (pasta)"
-	desc = "A tray of standard USCM food. Overcooked spaghetti, waterlogged carrots and two french fries fill this tray."
+	name = "\improper Prepared Meal (pasta)"
+	desc = "A tray of machine prepared food. Consists of over-soft spaghetti, flavorless french fries, and poorly reflavored carrots."
 	icon_state = "MREc"
 
 /obj/item/reagent_container/food/snacks/mre_pack/meal3/Initialize()
@@ -248,8 +247,8 @@
 	bitesize = 3
 
 /obj/item/reagent_container/food/snacks/mre_pack/meal4
-	name = "\improper USCM Prepared Meal (pizza)"
-	desc = "A tray of standard USCM food. Cold pizza, wet green beans and a shitty egg fill this tray. Get something other than pizza, lardass."
+	name = "\improper Prepared Meal (pizza)"
+	desc = "A tray of machine prepared food. Consists of a square, stale-ish 'pizza' and some limp green beans, combined with some slightly burnt scrambled eggs."
 	icon_state = "MREd"
 
 /obj/item/reagent_container/food/snacks/mre_pack/meal4/Initialize()
@@ -258,8 +257,8 @@
 	bitesize = 1
 
 /obj/item/reagent_container/food/snacks/mre_pack/meal5
-	name = "\improper USCM Prepared Meal (chicken)"
-	desc = "A tray of standard USCM food. Moist chicken, dry rice and a mildly depressed piece of broccoli fill this tray."
+	name = "\improper Prepared Meal (chicken)"
+	desc = "A tray of machine prepared food. Consists of moist chicken, warm rice and some bitter broccoli that's seen better days."
 	icon_state = "MREe"
 
 /obj/item/reagent_container/food/snacks/mre_pack/meal5/Initialize()
@@ -268,8 +267,8 @@
 	bitesize = 3
 
 /obj/item/reagent_container/food/snacks/mre_pack/meal6
-	name = "\improper USCM Prepared Meal (tofu)"
-	desc = "The USCM doesn't serve tofu you grass sucking hippie. The flag signifies your defeat."
+	name = "\improper Prepared Meal (tofu)"
+	desc = "A tray of machine prepared food. Consists of weirdly grainy tofu, some spicy beans, and a sour, once-zingy sauce."
 	icon_state = "MREf"
 
 /obj/item/reagent_container/food/snacks/mre_pack/meal6/Initialize()
@@ -278,8 +277,8 @@
 	bitesize = 1
 
 /obj/item/reagent_container/food/snacks/mre_pack/xmas1
-	name = "\improper USCM M25 'X-MAS' Meal: Sugar Cookies"
-	desc = "The USCM M25 Sugar Cookies Meal was designed to give marines a feeling of Christmas joy. But to the bemusement of superior officers, the costs-savings measure of simply fabricating protein bars in the shape of cookies with chocolate substitute chips and the replacement of the expected milk with artificially colored water did not go over well with most marines."
+	name = "\improper Holiday Prepared Meal (sugar cookies)"
+	desc = "A tray of machine prepared food. The cookies taste... wrong. The milk is alright though. Consists of sugar cookies and milk."
 	icon_state = "mreCookies"
 	black_market_value = 10
 
@@ -290,8 +289,8 @@
 	bitesize = 8
 
 /obj/item/reagent_container/food/snacks/mre_pack/xmas2
-	name = "\improper USCM M25 'X-MAS' Meal: Gingerbread Cookies"
-	desc = "The USCM M25 Gingerbread Cookies Meal was designed to give marines convenient and cheap access to gingerbread cookies as a replacement for annual gingerbread making classes due to rising expenses and comically low success rates for the Basic Holidays Festivities Course. However, due to cost saving measures, these cookies seldom inspire happiness, nor holiday spirit."
+	name = "\improper Holiday Prepared Meal (gingerbread cookies)"
+	desc = "Somehow, you feel like there's either too much or too little ginger in each one of these, and never quite a good balance. Consists of a few gingerbread cookies and a packet of frosting."
 	icon_state = "mreGingerbread"
 	black_market_value = 10
 
@@ -302,8 +301,8 @@
 	bitesize = 8
 
 /obj/item/reagent_container/food/snacks/mre_pack/xmas3
-	name = "\improper USCM M25 'X-MAS' Meal: Fruitcake"
-	desc = "The USCM M25 Fruitcake Meal was the third meal designed by an officers' committee as part of the M25 Project; this shows through the terrible hardness and tartness of the bread and raisined fruits. It can be logically deduced that the people who vended this option are worse than the Grinch and the Miser combined, along with the people who designed and prepared this fruitcake."
+	name = "\improper Holiday Prepared Meal (fruitcake)"
+	desc = "Battalion has repeatedly assured everyone from private to platoon commander that the rumors of the fruitcake being chewy enough to stop bullets is unfounded. You're not quite sure. Consists of a dense block of pastry filled with dried fruit."
 	icon_state = "mreFruitcake"
 	black_market_value = 10
 
@@ -314,8 +313,8 @@
 	bitesize = 8
 
 /obj/item/reagent_container/food/snacks/mre_pack/thanksgiving
-	name = "\improper USCM Prepared Meal (turkey)"
-	desc = "A tray of standard USCM food. A few slices of turkey and some regenerated mashed potatos with a rather viscous gravy on top. A classic, if rather half-hearted, Thanksgiving meal."
+	name = "\improper Prepared Meal (turkey)"
+	desc = "A tray of machine prepared food. Consists of some overcooked turkey slices, weirdly crunchy mashed potatoes, and slightly underflavored gravy."
 	icon_state = "MREe"
 
 /obj/item/reagent_container/food/snacks/mre_pack/thanksgiving/Initialize()