Skip to content

Commit

Permalink
Changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Dumbgunner committed Aug 16, 2024
1 parent cd11ccc commit 17e7b15
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 2 deletions.
16 changes: 15 additions & 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 All @@ -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

Check failure on line 181 in code/game/objects/items/storage/misc.dm

View workflow job for this annotation

GitHub Actions / Run Linters

failed to resolve path /obj/item/ammo_magazine/revolver/cmb/hollowpoint
new /obj/item/ammo_magazine/revolver/cmb/hollowpoint

Check failure on line 182 in code/game/objects/items/storage/misc.dm

View workflow job for this annotation

GitHub Actions / Run Linters

failed to resolve path /obj/item/ammo_magazine/revolver/cmb/hollowpoint
17 changes: 16 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 @@ -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
Expand Down Expand Up @@ -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

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

0 comments on commit 17e7b15

Please sign in to comment.