Skip to content

Commit

Permalink
New Loadout Items (And some Adjustments) (#384)
Browse files Browse the repository at this point in the history
Co-authored-by: Dumbgunner <[email protected]>
  • Loading branch information
Max-023 and Dumbgunner committed Aug 18, 2024
1 parent 2605b80 commit 76d3bb5
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/items/storage/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 11 additions & 1 deletion code/modules/client/preferences_gear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

0 comments on commit 76d3bb5

Please sign in to comment.