Implements M1911 pistol into Loadout Options and changes its sprite. (#…

…126) Implements all of the previous changes. Looks good to me. Flavorful.
cmss13-devs · Feb 28, 2024 · 3cac2d9 · 3cac2d9
1 parent 9083c47
commit 3cac2d9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/code/game/objects/items/storage/misc.dm b/code/game/objects/items/storage/misc.dm
@@ -138,6 +138,20 @@
 	new /obj/item/ammo_magazine/pistol/t73(src)
 	new /obj/item/ammo_magazine/pistol/t73(src)
 
+/obj/item/storage/box/M1911_loadout
+	name = "M1911 storage case"
+	desc = "A relatively large storage case containing the 1911 and additional magazines. Purchased by enlisted or aspiring PMCs looking to carry a timeless classic"
+	icon = 'icons/obj/items/storage.dmi'
+	icon_state = "matebacase"
+	w_class = SIZE_MEDIUM
+	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)
+	new /obj/item/ammo_magazine/pistol/m1911(src)
+
 /obj/item/storage/box/co2_knife
 	name = "M8 cartridge bayonet packaging"
 	desc = "Contains one M8 Cartridge Bayonet and two sister CO2 cartridges. Thanks for being a dedicated Boots magazine subscriber!"

diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm
@@ -623,6 +623,11 @@ var/global/list/gear_datums_by_name = list()
 	path = /obj/item/weapon/gun/revolver/m44/custom
 	allowed_origins = USCM_ORIGINS
 
+/datum/gear/weapon/m1911
+	display_name = "M1911 Service Pistol"
+	path = /obj/item/storage/box/M1911_loadout
+	allowed_origins = USCM_ORIGINS
+
 /datum/gear/drink
 	category = "Canned drinks"
 

diff --git a/icons/obj/items/clothing/belts.dmi b/icons/obj/items/clothing/belts.dmi
diff --git a/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi b/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi