From 76d3bb56150140fc83a937ef87d7385b788ee0b3 Mon Sep 17 00:00:00 2001 From: Max-023 <42359139+Max-023@users.noreply.github.com> Date: Sun, 18 Aug 2024 15:24:53 -0400 Subject: [PATCH] New Loadout Items (And some Adjustments) (#384) Co-authored-by: Dumbgunner --- code/game/objects/items/storage/misc.dm | 2 +- code/modules/client/preferences_gear.dm | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/storage/misc.dm b/code/game/objects/items/storage/misc.dm index 12f6fbb3d0..19e680a197 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) diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index ef8cc16051..2c9b5ba243 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 @@ -1083,7 +1088,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 @@ -1117,3 +1122,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