eh

code/__DEFINES/job.dm

@@ -264,6 +264,7 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_UPP_SPECIALIST "UPP Serzhant"
 #define JOB_UPP_LEADER "UPP Master Serzhant"
 #define JOB_UPP_POLICE "UPP Politsiya"
+#define JOB_UPP_SUPPLY "UPP Logistics Technician"
 #define JOB_UPP_LT_OFFICER "UPP Leytenant"
 #define JOB_UPP_LT_DOKTOR "UPP Leytenant Doktor"
 #define JOB_UPP_SRLT_OFFICER "UPP Senior Leytenant"
@@ -291,6 +292,8 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 
 #define JOB_UPP_CREWMAN "UPP Tank Crewman"
 
+#define JOB_UPP_COMMISSAR "UPP Political Commissar"
+
 //-------- CLF --------//
 #define JOB_CLF "CLF Guerilla"
 #define JOB_CLF_ENGI "CLF Field Technician"

code/__DEFINES/paygrade_defs/upp.dm

@@ -43,6 +43,9 @@
 /// UO4, Mayjor
 #define PAY_SHORT_UO4 "UO4"
 
+/// UO4P, Political Commissar
+#define PAY_SHORT_UO4P "UO4P"
+
 /// UO5, Leytenant Kolonel
 #define PAY_SHORT_UO5 "UO5"
 

code/controllers/configuration/configuration.dm

@@ -19,7 +19,7 @@
 	var/motd
 	var/policy
 
-	var/static/regex/ic_filter_regex
+	var/static/regex/word_filter_regex
 
 	var/is_loaded = FALSE
 
@@ -315,21 +315,21 @@
 
 
 /datum/controller/configuration/proc/LoadChatFilter()
-	var/list/in_character_filter = list()
+	var/list/word_filter = list()
 
-	if(!fexists("[directory]/in_character_filter.txt"))
+	if(!fexists("[directory]/word_filter.txt"))
 		return
 
-	log_config("Loading config file in_character_filter.txt...")
+	log_config("Loading config file word_filter.txt...")
 
-	for(var/line in file2list("[directory]/in_character_filter.txt"))
+	for(var/line in file2list("[directory]/word_filter.txt"))
 		if(!line)
 			continue
 		if(findtextEx(line,"#",1,2))
 			continue
-		in_character_filter += REGEX_QUOTE(line)
+		word_filter += REGEX_QUOTE(line)
 
-	ic_filter_regex = length(in_character_filter) ? regex("\\b([jointext(in_character_filter, "|")])\\b", "i") : null
+	word_filter_regex = length(word_filter) ? regex("\\b([jointext(word_filter, "|")])\\b", "i") : null
 
 //Message admins when you can.
 /datum/controller/configuration/proc/DelayedMessageAdmins(text)

code/datums/factions/upp.dm

@@ -53,6 +53,10 @@
 			hud_icon_state = "vc"
 		if(JOB_UPP_LT_DOKTOR)
 			hud_icon_state = "doc"
+		if(JOB_UPP_SUPPLY)
+			hud_icon_state = "log"
+		if(JOB_UPP_COMMISSAR)
+			hud_icon_state = "commi"
 	if(hud_icon_state)
 		holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "upp_[hud_icon_state]")
 

code/datums/paygrades/factions/upp/upp.dm

@@ -95,6 +95,13 @@
 	pay_multiplier = 2.5
 	officer_grade = GRADE_OFFICER
 
+/datum/paygrade/upp/uo4p
+	paygrade = PAY_SHORT_UO4P
+	name = "Political Commissar"
+	prefix = "Pol."
+	pay_multiplier = 5
+	officer_grade = GRADE_OFFICER
+
 /datum/paygrade/upp/uo5
 	paygrade = PAY_SHORT_UO5
 	name = "Leytenant Kolonel"

code/datums/skills/upp.dm

@@ -83,6 +83,34 @@ UNITED PROGRESSIVE PEOPLES
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
 	)
 
+/datum/skills/upp/logistics_technician
+	name = "UPP Logistics Technician"
+	skills = list(
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
+		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
+		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
+		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
+	)
+
+/datum/skills/upp/commissar
+	name = "UPP Starshy Politruk"
+	skills = list(
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
+		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
+		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
+		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
+		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
+		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
+		SKILL_INTEL = SKILL_INTEL_EXPERT,
+	)
+
 /datum/skills/upp/officer
 	name = "UPP Officer"
 	skills = list(

code/game/gamemodes/colonialmarines/whiskey_outpost.dm

@@ -614,6 +614,7 @@
 		"Explosives and grenades",
 		"Rocket ammo",
 		"Sniper ammo",
+		"Anti-Material Sniper ammo",
 		"Pyrotechnician tanks",
 		"Scout ammo",
 		"Smartgun ammo",
@@ -634,14 +635,17 @@
 		if("Sniper ammo")
 			supply_drop = 3
 			to_chat(usr, SPAN_NOTICE("Sniper ammo will now drop!"))
-		if("Explosives and grenades")
+		if("Anti-Material Sniper ammo")
 			supply_drop = 4
+			to_chat(usr, SPAN_NOTICE("Anti-Material Sniper ammo will now drop!"))
+		if("Explosives and grenades")
+			supply_drop = 5
 			to_chat(usr, SPAN_NOTICE("Explosives and grenades will now drop!"))
 		if("Pyrotechnician tanks")
-			supply_drop = 5
+			supply_drop = 6
 			to_chat(usr, SPAN_NOTICE("Pyrotechnician tanks will now drop!"))
 		if("Scout ammo")
-			supply_drop = 6
+			supply_drop = 7
 			to_chat(usr, SPAN_NOTICE("Scout ammo will now drop!"))
 		else
 			return
@@ -734,15 +738,21 @@
 							/obj/item/ammo_magazine/sniper,
 							/obj/item/ammo_magazine/sniper/incendiary,
 							/obj/item/ammo_magazine/sniper/flak)
-		if(4) // Give them explosives + Grenades for the Grenade spec. Might be too many grenades, but we'll find out.
+		if(4) //Amr sniper ammo.
+			spawnitems = list(/obj/item/ammo_magazine/sniper/anti_materiel,
+							/obj/item/ammo_magazine/sniper/anti_materiel,
+							/obj/item/ammo_magazine/sniper/anti_materiel,
+							/obj/item/ammo_magazine/sniper/anti_materiel,
+							/obj/item/ammo_magazine/sniper/anti_materiel)
+		if(5) // Give them explosives + Grenades for the Grenade spec. Might be too many grenades, but we'll find out.
 			spawnitems = list(/obj/item/storage/box/explosive_mines,
 							/obj/item/storage/belt/grenade/full)
-		if(5) // Pyrotech
+		if(6) // Pyrotech
 			var/fuel = pick(/obj/item/ammo_magazine/flamer_tank/large/B, /obj/item/ammo_magazine/flamer_tank/large/X)
 			spawnitems = list(/obj/item/ammo_magazine/flamer_tank/large,
 							/obj/item/ammo_magazine/flamer_tank/large,
 							fuel)
-		if(6) // Scout
+		if(7) // Scout
 			spawnitems = list(/obj/item/ammo_magazine/rifle/m4ra/custom,
 							/obj/item/ammo_magazine/rifle/m4ra/custom,
 							/obj/item/ammo_magazine/rifle/m4ra/custom/incendiary,

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

@@ -178,6 +178,7 @@
 		list("M42A Flak Magazine (10x28mm)", floor(scale * 1), /obj/item/ammo_magazine/sniper/flak, VENDOR_ITEM_REGULAR),
 		list("M42A Incendiary Magazine (10x28mm)", floor(scale * 1), /obj/item/ammo_magazine/sniper/incendiary, VENDOR_ITEM_REGULAR),
 		list("M42A Marksman Magazine (10x28mm Caseless)", floor(scale * 1.5), /obj/item/ammo_magazine/sniper, VENDOR_ITEM_REGULAR),
+		list("XM43E1 Marksman Magazine (10x99mm Caseless)", floor(scale * 3), /obj/item/ammo_magazine/sniper/anti_materiel, VENDOR_ITEM_REGULAR),
 
 		list("EXTRA DEMOLITIONIST AMMUNITION", -1, null, null, null),
 		list("84mm Anti-Armor Rocket", floor(scale * 1), /obj/item/ammo_magazine/rocket/ap, VENDOR_ITEM_REGULAR),

code/game/objects/effects/spawners/wo_spawners/supplies.dm

@@ -106,7 +106,6 @@
 
 
 /obj/effect/landmark/wo_supplies/storage
-	icon = 'icons/obj/items/storage.dmi'
 	icon_state = null
 	amount = list(1,5)
 
@@ -117,6 +116,7 @@
 
 /obj/effect/landmark/wo_supplies/storage/machete
 	icon_state = "machete_holster_full"
+	icon = 'icons/obj/items/storage/holsters.dmi'
 	stuff = list(/obj/item/storage/large_holster/machete/full)
 
 /obj/effect/landmark/wo_supplies/storage/m56d
@@ -126,15 +126,18 @@
 
 /obj/effect/landmark/wo_supplies/storage/mines
 	icon_state = "minebox"
+	icon = 'icons/obj/items/storage/packets.dmi'
 	stuff = list(/obj/item/storage/box/explosive_mines)
 
 /obj/effect/landmark/wo_supplies/storage/grenades
 	amount = list(0,2)
 	icon_state = "nade_placeholder"
+	icon = 'icons/obj/items/storage/packets.dmi'
 	stuff = list(/obj/item/storage/box/nade_box)
 
 /obj/effect/landmark/wo_supplies/storage/m37holster
 	icon_state = "m37_holster"
+	icon = 'icons/obj/items/storage/holsters.dmi'
 	stuff = list(/obj/item/storage/large_holster/m37)
 
 /obj/effect/landmark/wo_supplies/storage/belts

code/game/objects/items/devices/clue_scanner.dm

@@ -1,6 +1,6 @@
 /obj/item/device/clue_scanner
 	name = "forensic scanner"
-	desc = "A modern handheld scanner to gather fingerprints. Guaranteed increase of effectivity and almost perfect accuracy of results. DISCLAIMER: Incorrect results are not covered by insurance."
+	desc = "A modern handheld scanner to gather fingerprints. Must be analyzed at a security records terminal after prints are gathered."
 	icon_state = "forensic1"
 	w_class = SIZE_MEDIUM
 	item_state = "electronic"

code/game/objects/items/devices/personal_data_transmitter.dm

@@ -161,6 +161,7 @@
 	name = "\improper Boots! PDT/L Battle Buddy kit"
 	desc = "Contains a PDT/L set, consisting of the PDT bracelet and its sister locator tube, alongside a spare cell seemingly wedged into the kit."
 	desc_lore = "This kit was distributed in the 200th (Season 4) Issue of the Boots! magazine, 'Privates die without their battlebuddy!', to drive up sales. Many have noted the poor battery life of these units, leading many to speculate that these were faulty units that were repackaged and shipped off to various USCM-adjacent mil-surplus good stores. The Department of the Navy Observation in Photographs (DNOP) has not released a statement regarding these theories."
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "pdt_box"
 	can_hold = list(/obj/item/device/pdt_locator_tube, /obj/item/clothing/accessory/pdt_bracelet)
 	foldable = /obj/item/stack/sheet/cardboard

code/game/objects/items/devices/portable_vendor.dm

@@ -5,7 +5,7 @@
 /obj/item/device/portable_vendor
 	name = "\improper Automated Storage Briefcase"
 	desc = "A suitcase-sized automated storage and retrieval system. Designed to efficiently store and selectively dispense small items."
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/briefcases.dmi'
 	icon_state = "secure"
 	flags_atom = FPRINT|CONDUCT
 	force = 8

code/game/objects/items/misc.dm

@@ -164,7 +164,7 @@
 	desc = "A debug item for research."
 
 /obj/item/moneybag
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/bags.dmi'
 	name = "Money bag"
 	icon_state = "moneybag"
 	force = 10
@@ -178,7 +178,7 @@
 /obj/item/evidencebag
 	name = "evidence bag"
 	desc = "An empty evidence bag."
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/bags.dmi'
 	icon_state = "evidenceobj"
 	item_state = ""
 	w_class = SIZE_SMALL

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

@@ -93,7 +93,7 @@
 // -----------------------------
 
 /obj/item/storage/bag/plants
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/bags.dmi'
 	icon_state = "plantbag"
 	name = "Plant Bag"
 	storage_slots = 50; //the number of plant pieces it can carry.
@@ -253,7 +253,7 @@
 // -----------------------------
 
 /obj/item/storage/bag/cash
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/bags.dmi'
 	icon_state = "cashbag"
 	name = "Cash bag"
 	desc = "A bag for carrying lots of cash. It's got a big dollar sign printed on the front."

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

@@ -1,6 +1,7 @@
 /obj/item/storage/bible
 	name = "bible"
 	desc = "Apply to head repeatedly."
+	icon = 'icons/obj/items/books.dmi'
 	icon_state ="bible"
 	throw_speed = SPEED_FAST
 	throw_range = 5

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

@@ -27,6 +27,7 @@
 	name = "box"
 	desc = "It's just an ordinary box."
 	icon_state = "box"
+	icon = 'icons/obj/items/storage/boxes.dmi'
 	item_state = "syringe_kit"
 	foldable = TRUE
 	storage_slots = null
@@ -150,6 +151,7 @@
 /obj/item/storage/box/flashbangs
 	name = "box of flashbangs (WARNING)"
 	desc = "<B>WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.</B>"
+	icon = 'icons/obj/items/storage/packets.dmi'
 	icon_state = "flashbang"
 	can_hold = list(/obj/item/explosive/grenade/flashbang)
 	w_class = SIZE_MEDIUM
@@ -181,6 +183,7 @@
 /obj/item/storage/box/emps
 	name = "box of emp grenades"
 	desc = "A box with 5 emp grenades."
+	icon = 'icons/obj/items/storage/packets.dmi'
 	icon_state = "emp"
 
 /obj/item/storage/box/emps/fill_preset_inventory()
@@ -500,7 +503,7 @@
 
 /obj/item/storage/box/lights
 	name = "box of replacement bulbs"
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/boxes.dmi'
 	icon_state = "light"
 	desc = "This box is shaped on the inside so that only light tubes and bulbs fit."
 	item_state = "syringe_kit"
@@ -548,6 +551,7 @@
 /obj/item/storage/box/twobore
 	name = "box of 2 bore shells"
 	icon_state = "twobore"
+	icon = 'icons/obj/items/storage/kits.dmi'
 	desc = "A box filled with enormous slug shells, for hunting only the most dangerous game. 2 Bore."
 	storage_slots = 5
 	can_hold = list(/obj/item/ammo_magazine/handful/shotgun/twobore)
@@ -562,6 +566,7 @@
 /obj/item/storage/box/explosive_mines
 	name = "\improper M20 mine box"
 	desc = "A secure box holding five M20 anti-personnel proximity mines."
+	icon = 'icons/obj/items/storage/packets.dmi'
 	icon_state = "minebox"
 	w_class = SIZE_MEDIUM
 	max_storage_space = 10
@@ -582,6 +587,7 @@
 	name = "\improper M94 marking flare pack"
 	desc = "A packet of eight M94 Marking Flares. Carried by USCM soldiers to light dark areas that cannot be reached with the usual TNR Shoulder Lamp."
 	icon_state = "m94"
+	icon = 'icons/obj/items/storage/packets.dmi'
 	w_class = SIZE_MEDIUM
 	storage_slots = 8
 	max_storage_space = 8
@@ -618,6 +624,7 @@
 	name = "\improper M40 HEDP grenade box"
 	desc = "A secure box holding 25 M40 High-Explosive Dual-Purpose grenades. High explosive, don't store near the flamer fuel."
 	icon_state = "nade_placeholder"
+	icon = 'icons/obj/items/storage/packets.dmi'
 	w_class = SIZE_LARGE
 	storage_slots = 25
 	max_storage_space = 50
@@ -758,6 +765,7 @@
 	name = "\improper USCM MRE"
 	desc = "A Meal, Ready-to-Eat. A single-meal combat ration designed to provide a soldier with enough nutrients for a day of strenuous work. Its expiration date is at least 20 years ahead of your combat life expectancy."
 	icon_state = "mealpack"
+	icon = 'icons/obj/items/storage/mre.dmi'
 	w_class = SIZE_SMALL
 	can_hold = list()
 	storage_slots = 7

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

@@ -1,6 +1,7 @@
 /obj/item/storage/briefcase
 	name = "briefcase"
 	desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional."
+	icon = 'icons/obj/items/storage/briefcases.dmi'
 	icon_state = "briefcase"
 	item_state = "briefcase"
 	flags_atom = FPRINT|CONDUCT

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

@@ -9,6 +9,7 @@
 /obj/item/storage/firstaid
 	name = "first-aid kit"
 	desc = "It's an emergency medical kit for those serious boo-boos. With medical training you can fit this in a backpack."
+	icon = 'icons/obj/items/storage/medical.dmi'
 	icon_state = "firstaid"
 	throw_speed = SPEED_FAST
 	throw_range = 8
@@ -254,6 +255,7 @@
 /obj/item/storage/syringe_case
 	name = "syringe case"
 	desc = "It's a medical case for storing syringes and bottles."
+	icon = 'icons/obj/items/storage/medical.dmi'
 	icon_state = "syringe_case"
 	throw_speed = SPEED_FAST
 	throw_range = 8
@@ -308,7 +310,7 @@
 		\nStep three: Draw back the skin with the retracter.\
 		\nStep four: Patch the damaged vein with a surgical line.\
 		\nStep five: Close the incision with a surgical line."
-
+	icon = 'icons/obj/items/storage/medical.dmi'
 	icon_state = "surgical_case"
 	throw_speed = SPEED_FAST
 	throw_range = 8