From 17e7b155460130909bcf81753b22abea08072d99 Mon Sep 17 00:00:00 2001
From: Dumbgunner <minecraftfan030201@gmail.com>
Date: Fri, 16 Aug 2024 13:12:03 -0400
Subject: [PATCH] Changes

---
 code/game/objects/items/storage/misc.dm | 16 +++++++++++++++-
 code/modules/client/preferences_gear.dm | 17 ++++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/storage/misc.dm b/code/game/objects/items/storage/misc.dm
index 12f6fbb3d0..fe41189a88 100644
--- a/code/game/objects/items/storage/misc.dm
+++ b/code/game/objects/items/storage/misc.dm
@@ -146,7 +146,7 @@
 	w_class = SIZE_LARGE
 	max_w_class = SIZE_MEDIUM
 	storage_slots = 3
-	
+
 /obj/item/storage/box/M1911_loadout/fill_preset_inventory()
 	new /obj/item/weapon/gun/pistol/m1911(src)
 	new /obj/item/ammo_magazine/pistol/m1911(src)
@@ -166,3 +166,17 @@
 	new /obj/item/attachable/bayonet/co2(src)
 	new /obj/item/co2_cartridge(src)
 	new /obj/item/co2_cartridge(src)
+
+/obj/item/storage/box/cmb //looted cmb
+	name = "CMB storing case"
+	desc = "Taken from an Colonial Marshall armory of a colony you previously deployed to recover, since no one was left to miss it."
+	icon = 'icons/obj/items/storage.dmi'
+	icon_state = "matebacase"
+	w_class = SIZE_LARGE
+	max_w_class = SIZE_MEDIUM
+	storage_slots = 3
+
+/obj/item/storage/box/upp/fill_preset_inventory()
+	new /obj/item/weapon/gun/revolver/cmb(src)
+	new /obj/item/ammo_magazine/revolver/cmb/hollowpoint
+	new /obj/item/ammo_magazine/revolver/cmb/hollowpoint
diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm
index af1f6a03c9..7c5383784d 100644
--- a/code/modules/client/preferences_gear.dm
+++ b/code/modules/client/preferences_gear.dm
@@ -73,6 +73,7 @@ var/global/list/gear_datums_by_name = list()
 /datum/gear/eyewear/sunglasses
 	display_name = "Sunglasses"
 	path = /obj/item/clothing/glasses/sunglasses
+	cost = 0
 
 /datum/gear/eyewear/prescription_sunglasses
 	display_name = "Prescription sunglasses"
@@ -279,6 +280,10 @@ var/global/list/gear_datums_by_name = list()
 	display_name = "USCM cap"
 	path = /obj/item/clothing/head/cmcap
 
+/datum/gear/headwear/uscm/cap/flap
+	display_name = "USCM flapcap"
+	path = /obj/item/clothing/head/cmcap/flap
+
 /datum/gear/headwear/uscm/headband_brown
 	display_name = "USCM headband, brown"
 	path = /obj/item/clothing/head/headband/brown
@@ -726,6 +731,11 @@ var/global/list/gear_datums_by_name = list()
 	slot = WEAR_IN_BACK
 	cost = 4
 
+/datum/gear/weapon/upppistol //looted colony revolver
+	display_name = "Spearhead Revolver"
+	path = /obj/item/storage/box/cmb
+	slot = WEAR_IN_BACK
+
 /datum/gear/weapon/m4a3_custom
 	display_name = "M4A3 Custom Pistol"
 	path = /obj/item/weapon/gun/pistol/m4a3/custom
@@ -1079,7 +1089,7 @@ var/global/list/gear_datums_by_name = list()
 /datum/gear/misc/patch_uscm
 	display_name = "USCM shoulder patch"
 	path = /obj/item/clothing/accessory/patch
-	cost = 1
+	cost = 0
 	slot = WEAR_IN_ACCESSORY
 	allowed_origins = USCM_ORIGINS
 
@@ -1113,3 +1123,8 @@ var/global/list/gear_datums_by_name = list()
 	display_name = "M67 flak jacket"
 	path = /obj/item/clothing/accessory/flak
 	cost = 3
+
+/datum/gear/misc/servicejacket
+	display_name = "Marine Service Jacket"
+	path = /obj/item/clothing/suit/storage/jacket/marine/service
+	cost = 3