Territorial Guard

- Comm titles standardized as all caps - Type 71 suit storage onmob - Mild UPP armor improvements - Updated UPP uniform - Boots overhaul - New UPP boonie
cmss13-devs · Aug 19, 2024 · 35dbe77 · 35dbe77
1 parent 19b5a82
commit 35dbe77
Show file tree

Hide file tree

Showing 44 changed files with 369 additions and 496 deletions.
diff --git a/code/datums/paygrades/factions/upp/upp.dm b/code/datums/paygrades/factions/upp/upp.dm
@@ -119,3 +119,12 @@
 	name = "Army General"
 	prefix = "Gen."
 	pay_multiplier = 7
+
+
+//UPP Colonists
+
+/datum/paygrade/upp/constable
+	paygrade = "UC1"
+	name = "Constable"
+	prefix = "Const."
+	pay_multiplier = 0.3
diff --git a/code/game/gamemodes/colonialmarines/huntergames.dm b/code/game/gamemodes/colonialmarines/huntergames.dm
@@ -3,7 +3,7 @@
 								100; list(/obj/item/weapon/twohanded/yautja/glaive, /obj/item/clothing/mask/gas/yautja/hunter, /obj/item/clothing/suit/armor/yautja/hunter,/obj/item/clothing/shoes/yautja/hunter), \
 								50; list(/obj/item/weapon/yautja/combistick, /obj/item/clothing/mask/gas/yautja/hunter, /obj/item/clothing/suit/armor/yautja/hunter/full,/obj/item/clothing/shoes/yautja/hunter), \
 								150; list(/obj/item/stack/medical/advanced/ointment, /obj/item/stack/medical/advanced/bruise_pack, /obj/item/storage/belt/medical/lifesaver/full), \
-								50; list(/obj/item/clothing/under/marine/veteran/pmc/commando, /obj/item/clothing/suit/storage/marine/veteran/pmc/commando, /obj/item/clothing/gloves/marine/veteran/pmc/commando, /obj/item/clothing/shoes/veteran/pmc/commando, /obj/item/clothing/head/helmet/marine/veteran/pmc/commando), \
+								50; list(/obj/item/clothing/under/marine/veteran/pmc/commando, /obj/item/clothing/suit/storage/marine/veteran/pmc/commando, /obj/item/clothing/gloves/marine/veteran/pmc/commando, /obj/item/clothing/shoes/marine/rmc, /obj/item/clothing/head/helmet/marine/veteran/pmc/commando), \
 								125; list(/obj/item/weapon/yautja/chain, /obj/item/weapon/yautja/knife, /obj/item/weapon/yautja/scythe, /obj/item/hunting_trap, /obj/item/hunting_trap), \
 								75; list(/obj/item/weapon/gun/revolver/mateba/general, /obj/item/ammo_magazine/revolver/mateba, /obj/item/ammo_magazine/revolver/mateba, /obj/item/clothing/mask/balaclava/tactical), \
 								50; list(/obj/item/weapon/shield/energy, /obj/item/weapon/energy/axe, /obj/item/clothing/under/chainshirt/hunter, /obj/item/clothing/head/helmet/gladiator, /obj/item/clothing/suit/armor/gladiator) \
@@ -258,7 +258,7 @@ var/waiting_for_drop_votes = 0
 			H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(H), WEAR_FEET)
 		if(2) //Commander!
 			H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/command(H), WEAR_BODY)
-			H.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress/commander(H), WEAR_FEET)
+			H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), WEAR_FEET)
 		if(3) //CL
 			H.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit(H), WEAR_BODY)
 			H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), WEAR_FEET)

diff --git a/code/game/machinery/vending/essential_sets.dm b/code/game/machinery/vending/essential_sets.dm
@@ -8,7 +8,7 @@
 		/obj/item/clothing/gloves/marine/dress,
 		/obj/item/clothing/suit/storage/jacket/marine/dress/blues,
 		/obj/item/clothing/under/marine/dress/blues,
-		/obj/item/clothing/shoes/dress,
+		/obj/item/clothing/shoes/laceup,
 	)
 
 /obj/effect/essentials_set/dressblues/nco
@@ -17,7 +17,7 @@
 		/obj/item/clothing/gloves/marine/dress,
 		/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco,
 		/obj/item/clothing/under/marine/dress/blues/senior,
-		/obj/item/clothing/shoes/dress,
+		/obj/item/clothing/shoes/laceup,
 	)
 
 /obj/effect/essentials_set/dressblues/officer
@@ -26,7 +26,7 @@
 		/obj/item/clothing/gloves/marine/dress,
 		/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer,
 		/obj/item/clothing/under/marine/dress/blues/senior,
-		/obj/item/clothing/shoes/dress,
+		/obj/item/clothing/shoes/laceup,
 	)
 
 /obj/effect/essentials_set/dressblues/officer/sword
@@ -35,7 +35,7 @@
 		/obj/item/clothing/gloves/marine/dress,
 		/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer,
 		/obj/item/clothing/under/marine/dress/blues/senior,
-		/obj/item/clothing/shoes/dress,
+		/obj/item/clothing/shoes/laceup,
 		/obj/item/storage/large_holster/ceremonial_sword/full,
 	)
 
@@ -45,7 +45,7 @@
 		/obj/item/clothing/gloves/marine/dress,
 		/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer,
 		/obj/item/clothing/under/marine/dress/blues/general,
-		/obj/item/clothing/shoes/dress,
+		/obj/item/clothing/shoes/laceup,
 	)
 
 /obj/effect/essentials_set/dressblues/general/sword
@@ -54,7 +54,7 @@
 		/obj/item/clothing/gloves/marine/dress,
 		/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer,
 		/obj/item/clothing/under/marine/dress/blues/general,
-		/obj/item/clothing/shoes/dress,
+		/obj/item/clothing/shoes/laceup,
 		/obj/item/storage/large_holster/ceremonial_sword/full,
 	)
 
diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm
@@ -227,7 +227,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
 	list("Shoes, Red", 12, /obj/item/clothing/shoes/red, null, VENDOR_ITEM_REGULAR),
 	list("Shoes, White", 12, /obj/item/clothing/shoes/white, null, VENDOR_ITEM_REGULAR),
 	list("Shoes, Yellow", 12, /obj/item/clothing/shoes/yellow, null, VENDOR_ITEM_REGULAR),
-	list("Shoes, Seegson", 24, /obj/item/clothing/shoes/dress, null, VENDOR_ITEM_REGULAR),
+	list("Shoes, Seegson", 24, /obj/item/clothing/shoes/laceup, null, VENDOR_ITEM_REGULAR),
 
 	list("HEADWEAR", 0, null, null, null),
 	list("Beanie", 12, /obj/item/clothing/head/beanie, null, VENDOR_ITEM_REGULAR),

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm
@@ -350,7 +350,7 @@ GLOBAL_LIST_EMPTY(co_secure_boxes)
 	new /obj/item/device/binoculars/range(src)
 	new /obj/item/clothing/suit/armor/bulletproof/badge(src)
 	new /obj/item/clothing/under/marine/officer/bridge(src)
-	new /obj/item/clothing/shoes/dress(src)
+	new /obj/item/clothing/shoes/laceup(src)
 	new /obj/item/storage/backpack/marine/satchel(src)
 
 /obj/structure/closet/secure_closet/cmdcabinet

diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -423,7 +423,7 @@ var/global/list/activated_medevac_stretchers = list()
 
 /obj/item/roller/bedroll
 	name = "folded bedroll"
-	desc = "A standard issue USCMC bedroll, They've been in service for as long as you can remember. The tag on it states to unfold it before rest, but who needs rules anyway, right?"
+	desc = "A standard issue bedroll, They've been in service for as long as you can remember. The tag on it states to unfold it before rest, but who needs rules anyway, right?"
 	icon = 'icons/monkey_icos.dmi'
 	icon_state = "bedroll"
 	rollertype = /obj/structure/bed/bedroll
diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm
@@ -1061,7 +1061,7 @@ var/global/list/gear_datums_by_name = list()
 
 /datum/gear/misc/brown_boots
 	display_name = "brown combat boots"
-	path = /obj/item/clothing/shoes/marine/brown
+	path = /obj/item/clothing/shoes/marine/civilian/brown
 	cost = 2
 
 /datum/gear/misc/brown_gloves

diff --git a/code/modules/clothing/gloves/marine_gloves.dm b/code/modules/clothing/gloves/marine_gloves.dm
@@ -2,8 +2,8 @@
 //marine gloves
 
 /obj/item/clothing/gloves/marine
-	name = "marine combat gloves"
-	desc = "Standard USCMC issue combat gloves, reinforced against small sharp objects, and even insulated from electric shock. Very uncomfortable."
+	name = "combat gloves"
+	desc = "Combat gloves, reinforced against small sharp objects, and even insulated from electric shock. Very uncomfortable."
 	icon_state = "black"
 	item_state = "black"
 	siemens_coefficient = 0
@@ -21,7 +21,7 @@
 	armor_bio = CLOTHING_ARMOR_MEDIUM
 	armor_rad = CLOTHING_ARMOR_NONE
 	armor_internaldamage = CLOTHING_ARMOR_LOW
-	var/adopts_squad_color = TRUE
+	var/adopts_squad_color = FALSE
 	/// The dmi where the grayscale squad overlays are contained
 	var/squad_overlay_icon = 'icons/mob/humans/onmob/hands_garb.dmi'
 
@@ -43,29 +43,25 @@
 
 /obj/item/clothing/gloves/marine/black
 	name = "marine black combat gloves"
-	adopts_squad_color = FALSE
 
 /obj/item/clothing/gloves/marine/brown
 	name = "marine brown combat gloves"
-	desc = "USCMC issue combat gloves, now in brown rather than black, reinforced against small sharp objects, and even insulated from electric shock. Very uncomfortable."
+	desc = "Combat gloves, now in brown rather than black, reinforced against small sharp objects, and even insulated from electric shock. Very uncomfortable."
 	icon_state = "brown"
 	item_state = "brown"
-	adopts_squad_color = FALSE
 
 /obj/item/clothing/gloves/marine/medical
 	name = "marine medical combat gloves"
 	desc = "Special USCMC issue to hospital corpsmen or other field medical workers. Offers protection from shock and cuts while also improving one's grip on medical tools. Unlike the regular gloves, these are relatively comfortable to wear."
 	icon_state = "latex"
 	item_state = "lgloves"
-	adopts_squad_color = FALSE
 
 
 /obj/item/clothing/gloves/marine/officer
 	name = "officer gloves"
 	desc = "Shiny and impressive. They look expensive."
 	icon_state = "black"
 	item_state = "bgloves"
-	adopts_squad_color = FALSE
 
 /obj/item/clothing/gloves/marine/officer/chief
 	name = "chief officer gloves"
@@ -78,7 +74,6 @@
 	item_state = "ygloves"
 	siemens_coefficient = 0
 	permeability_coefficient = 0.01
-	adopts_squad_color = FALSE
 
 /obj/item/clothing/gloves/marine/techofficer/commander
 	name = "commanding officer's gloves"
@@ -112,7 +107,6 @@
 	armor_internaldamage = CLOTHING_ARMOR_VERYHIGH
 	unacidable = TRUE
 	flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE
-	adopts_squad_color = FALSE
 
 /obj/item/clothing/gloves/marine/pve_mopp
 	name = "\improper M2 MOPP gloves"
@@ -133,7 +127,6 @@
 	armor_bomb = CLOTHING_ARMOR_MEDIUM
 	armor_rad = CLOTHING_ARMOR_MEDIUM
 	armor_internaldamage = CLOTHING_ARMOR_HIGH
-	adopts_squad_color = FALSE
 
 /obj/item/clothing/gloves/marine/veteran/upp
 	icon_state = "brown"
@@ -188,7 +181,6 @@
 	armor_rad = CLOTHING_ARMOR_HARDCORE
 	armor_internaldamage = CLOTHING_ARMOR_HARDCORE
 	unacidable = TRUE
-	adopts_squad_color = FALSE
 
 /obj/item/clothing/gloves/marine/veteran/insulated/van_bandolier
 	name = "custom shooting gloves"
@@ -207,7 +199,6 @@
 	armor_rad = CLOTHING_ARMOR_VERYHIGH
 	armor_internaldamage = CLOTHING_ARMOR_MEDIUM
 	unacidable = TRUE
-	adopts_squad_color = FALSE
 
 //=ROYAL MARINES=\\
 

diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
@@ -1162,6 +1162,13 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	flags_inventory = BLOCKSHARPOBJ
 	flags_inv_hide = HIDEEARS
 
+
+/obj/item/clothing/head/uppcap/boonie
+	name = "\improper UL3 UPP hat"
+	desc = "UPP headgear issued to soldiers when they're not expected to face combat, and may be requested by officers and above."
+	icon = 'icons/obj/items/clothing/cm_hats.dmi'
+	icon_state = "upp_boonie"
+
 /obj/item/clothing/head/uppcap/civi
 	name = "\improper UL2 UPP cap"
 	desc = "UPP civilian headgear. It's of poor quality, and isn't expected to last all that long, however for as long as it's whole, it appears quite stylish."