Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@AmoryBlaine
AmoryBlaine committed Sep 22, 2024
1 parent 026172a commit 440095a
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 9 deletions.
27 changes: 21 additions & 6 deletions code/game/objects/items/storage/misc.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
update_icon()
if(!length(contents))
..()
return
return

/obj/item/storage/donut_box/update_icon()
overlays.Cut()
Expand Down Expand Up @@ -120,17 +120,21 @@
max_w_class = SIZE_MEDIUM
storage_slots = 7

/obj/item/storage/box/loadout/t73
/obj/item/storage/box/loadout/T73_loadout
name = "Type 73 storing case"
desc = "A small case containing a loaded Type 73, and additional magazines."
/obj/item/storage/box/loadout/t73/fill_preset_inventory()
can_hold = list(/obj/item/weapon/gun/pistol/t73, /obj/item/ammo_magazine/pistol/t73)

/obj/item/storage/box/loadout/T73_loadout/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/pistol/t73())
for(var/i = 1 to storage_slots - 1)
new /obj/item/ammo_magazine/pistol/t73(src)

/obj/item/storage/box/loadout/zhnk72
/obj/item/storage/box/loadout/ZHNK72_loadout
name = "ZHNK-72 storing case"
desc = "A small case containing a loaded ZHNK-72, and additional speedloaders."
can_hold = list(/obj/item/weapon/gun/revolver/upp, /obj/item/ammo_magazine/revolver/upp)

/obj/item/storage/box/loadout/zhnk72/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/revolver/upp())
for(var/i = 1 to storage_slots - 1)
Expand All @@ -139,6 +143,7 @@
/obj/item/storage/box/loadout/M4A3_custom_loadout
name = "M4A3 storage case"
desc = "A relatively large storage case containing a loaded M4A3 and additional magazines."
can_hold = list(/obj/item/weapon/gun/pistol/m4a3/custom, /obj/item/ammo_magazine/pistol)

/obj/item/storage/box/loadout/M4A3_custom_loadout/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/pistol/m4a3/custom())
Expand All @@ -148,6 +153,7 @@
/obj/item/storage/box/loadout/HG45_civilian_loadout
name = "HG 45 'Aguila' storage case"
desc = "A relatively large storage case containing a loaded HG 45 'Aguila' and additional magazines."
can_hold = list(/obj/item/weapon/gun/pistol/highpower, /obj/item/ammo_magazine/pistol/highpower)

/obj/item/storage/box/loadout/HG45_civilian_loadout/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/pistol/highpower())
Expand All @@ -157,6 +163,7 @@
/obj/item/storage/box/loadout/HG45_marine_loadout
name = "HG 45 'Marina' storage case"
desc = "A relatively large storage case containing a loaded HG 45 'Marina' and additional magazines."
can_hold = list(/obj/item/weapon/gun/pistol/highpower/black, /obj/item/ammo_magazine/pistol/highpower/black)

/obj/item/storage/box/loadout/HG45_marine_loadout/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/pistol/highpower/black())
Expand All @@ -166,6 +173,7 @@
/obj/item/storage/box/loadout/HG44_loadout
name = "HG 44 'Automag' storage case"
desc = "A relatively large storage case containing a loaded HG 44 'Automag' and additional magazines."
can_hold = list(/obj/item/weapon/gun/pistol/highpower/automag, /obj/item/ammo_magazine/pistol/highpower/automag)

/obj/item/storage/box/loadout/HG44_loadout/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/pistol/highpower/automag())
Expand All @@ -175,6 +183,7 @@
/obj/item/storage/box/loadout/Spearhead_loadout
name = "Spearhead Armoury storage case"
desc = "A relatively large storage case containing a loaded Spearhead Armoury revolver and additional speedloaders."
can_hold = list(/obj/item/weapon/gun/revolver/spearhead, /obj/item/ammo_magazine/revolver/spearhead)

/obj/item/storage/box/loadout/Spearhead_loadout/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/revolver/spearhead())
Expand All @@ -184,6 +193,7 @@
/obj/item/storage/box/loadout/Spearhead_loadout/custom
name = "Spearhead Armoury storage case"
desc = "A relatively large storage case containing a loaded Spearhead Armoury revolver and additional speedloaders."
can_hold = list(/obj/item/weapon/gun/revolver/spearhead/black, /obj/item/ammo_magazine/revolver/spearhead)

/obj/item/storage/box/loadout/Spearhead_loadout/custom/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/revolver/spearhead/black())
Expand All @@ -193,6 +203,7 @@
/obj/item/storage/box/loadout/M1911_loadout
name = "M1911 storage case"
desc = "A relatively large storage case containing a loaded M1911 and additional magazines."
can_hold = list(/obj/item/weapon/gun/pistol/m1911, /obj/item/ammo_magazine/pistol/m1911)

/obj/item/storage/box/loadout/M1911_loadout/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/pistol/m1911())
Expand All @@ -202,6 +213,7 @@
/obj/item/storage/box/loadout/M44_loadout
name = "M44 storage case"
desc = "A relatively large storage case containing a loaded M44 revolver and additional speedloaders."
can_hold = list(/obj/item/weapon/gun/revolver/m44, /obj/item/ammo_magazine/revolver)

/obj/item/storage/box/loadout/M44_loadout/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/revolver/m44())
Expand All @@ -211,18 +223,20 @@
/obj/item/storage/box/loadout/M44_custom_loadout
name = "M44 storage case"
desc = "A relatively large storage case containing a loaded M44 revolver and additional speedloaders."
can_hold = list(/obj/item/weapon/gun/revolver/m44/custom, /obj/item/ammo_magazine/revolver)

/obj/item/storage/box/loadout/M44_custom_loadout/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/revolver/m44/custom())
for(var/i = 1 to storage_slots - 1)
new /obj/item/ammo_magazine/revolver(src)

/obj/item/storage/box/loadout/clf
/obj/item/storage/box/loadout/CLF_loadout
name = "Hummingbird storage box"
desc = "A slim storage case containing a loaded Hummingbird pistol and additional magazines."
w_class = SIZE_SMALL
max_w_class = SIZE_TINY
storage_slots = 4
can_hold = list(/obj/item/weapon/gun/pistol/clfpistol, /obj/item/ammo_magazine/pistol/clfpistol)

/obj/item/storage/box/loadout/clf/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/pistol/clfpistol())
Expand All @@ -232,12 +246,13 @@
/obj/item/storage/box/loadout/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!"
icon = 'icons/obj/items/storage/kits.dmi'
icon_state = "co2_box"
can_hold = list(/obj/item/attachable/bayonet/co2, /obj/item/co2_cartridge)
foldable = TRUE
storage_slots = 3
w_class = SIZE_SMALL
max_w_class = SIZE_SMALL
can_hold = list(/obj/item/attachable/bayonet/co2, /obj/item/co2_cartridge)

/obj/item/storage/box/loadout/co2_knife/fill_preset_inventory()
new /obj/item/attachable/bayonet/co2(src)
Expand Down
6 changes: 3 additions & 3 deletions code/modules/client/preferences_gear.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -746,15 +746,15 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name)

/datum/gear/weapon/clfpistol
display_name = "Hummingbird Pistol"
path = /obj/item/storage/box/loadout/clf
path = /obj/item/storage/box/loadout/CLF_loadout

/datum/gear/weapon/t73
display_name = "Type 73 Pistol"
path = /obj/item/storage/box/loadout/t73
path = /obj/item/storage/box/loadout/T73_loadout

/datum/gear/weapon/zhnk72
display_name = "ZHNK-72 Revolver"
path = /obj/item/storage/box/loadout/zhnk72
path = /obj/item/storage/box/loadout/ZHNK72_loadout

/datum/gear/weapon/m4a3_custom
display_name = "Custom M4A3 Pistol"
Expand Down

0 comments on commit 440095a

Please sign in to comment.