Skip to content

Commit

Permalink
General Pouches Tweaks & Fixes (#3764)
Browse files Browse the repository at this point in the history 
# About the pull request

large general pouch has stricter restriction against internal boxes.

Remove the one medium item restriction for large general pouch, makes it
more competitive with other pouches

Added Large general pouch to REQ at the same rarity as Large Shotgun
pouch, why wasn't it there before? we can reduce further if it's
necessary

Reshuffled Req Pouch order, Grouped pouches by type, medical >
engineering> Misc > Ammo, RIP muscle memory

Remove some useless code

# Explain why it's good for the game

more gameplay option good, QOL good, useless code bad

# Changelog

:cl: ghostsheet
add: Large General Pouch has stricter restriction against internal
boxes.
add: Large General Pouch no longer restricted to 1 medium item.
add: Large General Pouch added to REQ.
add: Shuffled REQ pouch order into Meds, Engi, Misc, Ammo.
/:cl:
  • Loading branch information
@ghostsheet
ghostsheet committed Jul 24, 2023
1 parent 8963358 commit 31bbe21
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 39 deletions.
27 changes: 14 additions & 13 deletions code/game/machinery/vending/vendor_types/requisitions.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,26 +92,27 @@

list("POUCHES", -1, null, null),
list("Autoinjector Pouch", round(scale * 2), /obj/item/storage/pouch/autoinjector, VENDOR_ITEM_REGULAR),
list("Bayonet Pouch", round(scale * 2), /obj/item/storage/pouch/bayonet, VENDOR_ITEM_REGULAR),
list("Medkit Pouch", round(scale * 2), /obj/item/storage/pouch/medkit, VENDOR_ITEM_REGULAR),
list("Medical Pouch", round(scale * 2), /obj/item/storage/pouch/medical, VENDOR_ITEM_REGULAR),
list("First-Aid Pouch (Full)", round(scale * 5), /obj/item/storage/pouch/firstaid/full, VENDOR_ITEM_REGULAR),
list("First Responder Pouch", round(scale * 2), /obj/item/storage/pouch/first_responder, VENDOR_ITEM_REGULAR),
list("Syringe Pouch", round(scale * 2), /obj/item/storage/pouch/syringe, VENDOR_ITEM_REGULAR),
list("Tools Pouch (Full)", round(scale * 2), /obj/item/storage/pouch/tools/full, VENDOR_ITEM_REGULAR),
list("Construction Pouch", round(scale * 2), /obj/item/storage/pouch/construction, VENDOR_ITEM_REGULAR),
list("Document Pouch", round(scale * 2), /obj/item/storage/pouch/document/small, VENDOR_ITEM_REGULAR),
list("Electronics Pouch", round(scale * 2), /obj/item/storage/pouch/electronics, VENDOR_ITEM_REGULAR),
list("Explosive Pouch", round(scale * 2), /obj/item/storage/pouch/explosive, VENDOR_ITEM_REGULAR),
list("First-Aid Pouch (Full)", round(scale * 5), /obj/item/storage/pouch/firstaid/full, VENDOR_ITEM_REGULAR),
list("First Responder Pouch", round(scale * 2), /obj/item/storage/pouch/first_responder, VENDOR_ITEM_REGULAR),
list("Flare Pouch (Full)", round(scale * 5), /obj/item/storage/pouch/flare/full, VENDOR_ITEM_REGULAR),
list("Fuel Tank Strap Pouch", round(scale * 4), /obj/item/storage/pouch/flamertank, VENDOR_ITEM_REGULAR),
list("Large Pistol Magazine Pouch", round(scale * 5), /obj/item/storage/pouch/magazine/pistol/large, VENDOR_ITEM_REGULAR),
list("Magazine Pouch", round(scale * 5), /obj/item/storage/pouch/magazine, VENDOR_ITEM_REGULAR),
list("Shotgun Shell Pouch", round(scale * 5), /obj/item/storage/pouch/shotgun, VENDOR_ITEM_REGULAR),
list("Document Pouch", round(scale * 2), /obj/item/storage/pouch/document/small, VENDOR_ITEM_REGULAR),
list("Sling Pouch", round(scale * 2), /obj/item/storage/pouch/sling, VENDOR_ITEM_REGULAR),
list("Machete Pouch (Full)", round(scale * 4), /obj/item/storage/pouch/machete/full, VENDOR_ITEM_REGULAR),
list("Medical Pouch", round(scale * 2), /obj/item/storage/pouch/medical, VENDOR_ITEM_REGULAR),
list("Bayonet Pouch", round(scale * 2), /obj/item/storage/pouch/bayonet, VENDOR_ITEM_REGULAR),
list("Medium General Pouch", round(scale * 2), /obj/item/storage/pouch/general/medium, VENDOR_ITEM_REGULAR),
list("Medkit Pouch", round(scale * 2), /obj/item/storage/pouch/medkit, VENDOR_ITEM_REGULAR),
list("Magazine Pouch", round(scale * 5), /obj/item/storage/pouch/magazine, VENDOR_ITEM_REGULAR),
list("Shotgun Shell Pouch", round(scale * 5), /obj/item/storage/pouch/shotgun, VENDOR_ITEM_REGULAR),
list("Sidearm Pouch", round(scale * 5), /obj/item/storage/pouch/pistol, VENDOR_ITEM_REGULAR),
list("Syringe Pouch", round(scale * 2), /obj/item/storage/pouch/syringe, VENDOR_ITEM_REGULAR),
list("Tools Pouch (Full)", round(scale * 2), /obj/item/storage/pouch/tools/full, VENDOR_ITEM_REGULAR),
list("Sling Pouch", round(scale * 2), /obj/item/storage/pouch/sling, VENDOR_ITEM_REGULAR),
list("Large Pistol Magazine Pouch", round(scale * 5), /obj/item/storage/pouch/magazine/pistol/large, VENDOR_ITEM_REGULAR),
list("Fuel Tank Strap Pouch", round(scale * 4), /obj/item/storage/pouch/flamertank, VENDOR_ITEM_REGULAR),
list("Large General Pouch", round(scale * 2), /obj/item/storage/pouch/general/large, VENDOR_ITEM_REGULAR),
list("Large Magazine Pouch", round(scale * 2), /obj/item/storage/pouch/magazine/large, VENDOR_ITEM_REGULAR),
list("Large Shotgun Shell Pouch", round(scale * 2), /obj/item/storage/pouch/shotgun/large, VENDOR_ITEM_REGULAR),

Expand Down
28 changes: 2 additions & 26 deletions code/game/objects/items/storage/pouch.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,29 +58,12 @@
max_w_class = SIZE_MEDIUM
cant_hold = list( //Prevent inventory bloat
/obj/item/storage/firstaid,
/obj/item/storage/bible
/obj/item/storage/bible,
/obj/item/storage/box,
)
storage_slots = null
max_storage_space = 2

/obj/item/storage/pouch/general/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/ammo_magazine/shotgun))
var/obj/item/ammo_magazine/shotgun/M = W
dump_ammo_to(M,user)
else if(istype(W, /obj/item/storage/box/nade_box) || istype(W, /obj/item/storage/box/m94))
dump_into(W, user)
else
return ..()

/obj/item/storage/pouch/general/can_be_inserted(obj/item/W, stop_messages)
. = ..()
if(. && W.w_class == SIZE_MEDIUM)
for(var/obj/item/I in return_inv())
if(I.w_class >= SIZE_MEDIUM)
if(!stop_messages)
to_chat(usr, SPAN_NOTICE("[src] is already too bulky with [I]."))
return FALSE

/obj/item/storage/pouch/general/medium
name = "medium general pouch"
desc = "A general-purpose pouch used to carry a variety of differently sized items."
Expand Down Expand Up @@ -468,13 +451,6 @@
for(var/i = 1 to storage_slots)
new /obj/item/ammo_magazine/pistol/vp78(src)

/obj/item/storage/pouch/magazine/shotgun/attackby(obj/item/W, mob/living/user)
if(istype(W, /obj/item/ammo_magazine/shotgun))
var/obj/item/ammo_magazine/shotgun/M = W
dump_ammo_to(M, user, M.transfer_handful_amount)
else
return ..()

/obj/item/storage/pouch/magazine/pulse_rifle/fill_preset_inventory()
for(var/i = 1 to storage_slots)
new /obj/item/ammo_magazine/rifle(src)
Expand Down

0 comments on commit 31bbe21

Please sign in to comment.