Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Medkit Pouch Change #4390

Closed
wants to merge 2 commits into from
Closed

Medkit Pouch Change #4390

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61e4b73
Commit
Sep 11, 2023
ed18a2a
FixSubtype
Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions code/game/objects/items/storage/pouch.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,11 +792,17 @@

/obj/item/storage/pouch/medkit
name = "medkit pouch"
max_w_class = SIZE_MEDIUM
storage_flags = STORAGE_FLAGS_POUCH|STORAGE_USING_DRAWING_METHOD
max_w_class = SIZE_SMALL
storage_flags = STORAGE_FLAGS_POUCH
icon_state = "medkit"
desc = "It's specifically made to hold a medkit."
can_hold = list(/obj/item/storage/firstaid)
storage_slots = 7
desc = "It's specifically made to hold medical items."
cant_hold = list(
/obj/item/ammo_magazine,
/obj/item/explosive/grenade,
/obj/item/tool,
/obj/item/storage,
)

/obj/item/storage/pouch/medkit/handle_mmb_open(mob/user)
var/obj/item/storage/firstaid/FA = locate() in contents
Expand All @@ -807,10 +813,22 @@


/obj/item/storage/pouch/medkit/full/fill_preset_inventory()
new /obj/item/storage/firstaid/regular(src)
new /obj/item/device/healthanalyzer(src)
new /obj/item/reagent_container/hypospray/autoinjector/skillless(src)
new /obj/item/reagent_container/hypospray/autoinjector/skillless/tramadol(src)
new /obj/item/reagent_container/hypospray/autoinjector/inaprovaline(src)
new /obj/item/stack/medical/bruise_pack(src)
new /obj/item/stack/medical/ointment(src)
new /obj/item/stack/medical/splint(src)

/obj/item/storage/pouch/medkit/full_advanced/fill_preset_inventory()
new /obj/item/storage/firstaid/adv(src)
new /obj/item/reagent_container/hypospray/autoinjector/tricord(src)
new /obj/item/stack/medical/advanced/bruise_pack(src)
new /obj/item/stack/medical/advanced/bruise_pack(src)
new /obj/item/stack/medical/advanced/bruise_pack(src)
new /obj/item/stack/medical/advanced/ointment(src)
new /obj/item/stack/medical/advanced/ointment(src)
new /obj/item/stack/medical/splint(src)


/obj/item/storage/pouch/pressurized_reagent_canister
Expand Down