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

Fixes the storage of the First Responder Surgical kit and the Satchel Medical kit #3658

Merged
merged 1 commit into from
Oct 4, 2024
Merged

Fixes the storage of the First Responder Surgical kit and the Satchel Medical kit #3658

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
119 changes: 56 additions & 63 deletions monkestation/code/modules/blueshift/items/deforest.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,42 +815,13 @@
pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
drop_sound = 'sound/items/handling/cloth_drop.ogg'
slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT
storage_type = /datum/storage/duffel/deforest_medkit

/obj/item/storage/backpack/duffelbag/deforest_medkit/stocked

/obj/item/storage/backpack/duffelbag/deforest_medkit/stocked/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/hypospray/medipen/deforest/morpital = 1,
/obj/item/reagent_containers/hypospray/medipen/deforest/lepoturi = 1,
/obj/item/reagent_containers/hypospray/medipen/deforest/lipital = 1,
/obj/item/reagent_containers/hypospray/medipen/deforest/meridine = 1,
/obj/item/reagent_containers/hypospray/medipen/deforest/calopine = 1,
/obj/item/reagent_containers/hypospray/medipen/deforest/coagulants = 1,
/obj/item/bonesetter = 1,
/obj/item/hemostat = 1,
/obj/item/cautery = 1,
/obj/item/stack/medical/wound_recovery = 1,
/obj/item/stack/medical/wound_recovery/rapid_coagulant = 1,
/obj/item/stack/medical/suture/coagulant = 1,
/obj/item/stack/medical/mesh = 2,
/obj/item/stack/medical/gauze/sterilized = 1,
/obj/item/stack/medical/gauze = 1,
/obj/item/stack/medical/ointment/red_sun = 1,
/obj/item/storage/pill_bottle/painkiller = 1,
/obj/item/healthanalyzer/simple = 1,
)
generate_items_inside(items_inside,src)

/datum/storage/duffel/deforest_medkit
max_specific_storage = WEIGHT_CLASS_SMALL
max_total_storage = 21 * WEIGHT_CLASS_SMALL
max_slots = 21

/datum/storage/duffel/deforest_medkit/New()
/obj/item/storage/backpack/duffelbag/deforest_medkit/Initialize(mapload)
. = ..()

can_hold = typecacheof(list(
atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL
atom_storage.max_slots = 21
atom_storage.max_total_storage = 21 * WEIGHT_CLASS_SMALL
atom_storage.set_holdable(list(
/obj/item/bonesetter,
/obj/item/cautery,
/obj/item/clothing/neck/stethoscope,
Expand Down Expand Up @@ -888,6 +859,32 @@
/obj/item/bodybag,
))

/obj/item/storage/backpack/duffelbag/deforest_medkit/stocked

/obj/item/storage/backpack/duffelbag/deforest_medkit/stocked/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/hypospray/medipen/deforest/morpital = 1,
/obj/item/reagent_containers/hypospray/medipen/deforest/lepoturi = 1,
/obj/item/reagent_containers/hypospray/medipen/deforest/lipital = 1,
/obj/item/reagent_containers/hypospray/medipen/deforest/meridine = 1,
/obj/item/reagent_containers/hypospray/medipen/deforest/calopine = 1,
/obj/item/reagent_containers/hypospray/medipen/deforest/coagulants = 1,
/obj/item/bonesetter = 1,
/obj/item/hemostat = 1,
/obj/item/cautery = 1,
/obj/item/stack/medical/wound_recovery = 1,
/obj/item/stack/medical/wound_recovery/rapid_coagulant = 1,
/obj/item/stack/medical/suture/coagulant = 1,
/obj/item/stack/medical/mesh = 2,
/obj/item/stack/medical/gauze/sterilized = 1,
/obj/item/stack/medical/gauze = 1,
/obj/item/stack/medical/ointment/red_sun = 1,
/obj/item/storage/pill_bottle/painkiller = 1,
/obj/item/healthanalyzer/simple = 1,
)
generate_items_inside(items_inside,src)


// Big surgical kit that can be worn like a bag, holds 14 normal items (more than what a backpack can do!) but works like a duffelbag
/obj/item/storage/backpack/duffelbag/deforest_surgical
name = "first responder surgical kit"
Expand All @@ -902,37 +899,12 @@
pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
drop_sound = 'sound/items/handling/cloth_drop.ogg'
slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT
storage_type = /datum/storage/duffel/deforest_big_surgery

/obj/item/storage/backpack/duffelbag/deforest_surgical/stocked

/obj/item/storage/backpack/duffelbag/deforest_surgical/stocked/PopulateContents()
var/static/items_inside = list(
/obj/item/scalpel = 1,
/obj/item/hemostat = 1,
/obj/item/retractor = 1,
/obj/item/circular_saw = 1,
/obj/item/bonesetter = 1,
/obj/item/cautery = 1,
/obj/item/surgical_drapes = 1,
/obj/item/blood_filter = 1,
/obj/item/emergency_bed = 1,
/obj/item/stack/medical/gauze = 1,
/obj/item/stack/medical/gauze/sterilized = 1,
/obj/item/reagent_containers/medigel/sterilizine = 1,
/obj/item/stack/sticky_tape/surgical = 1,
/obj/item/stack/medical/bone_gel = 1,
)
generate_items_inside(items_inside,src)

/datum/storage/duffel/deforest_big_surgery
max_total_storage = 14 * WEIGHT_CLASS_NORMAL
max_slots = 14

/datum/storage/duffel/deforest_big_surgery/New()
/obj/item/storage/backpack/duffelbag/deforest_surgical/Initialize(mapload)
. = ..()

can_hold = typecacheof(list(
atom_storage.max_slots = 14
atom_storage.max_total_storage = 14 * WEIGHT_CLASS_NORMAL
atom_storage.set_holdable(list(
/obj/item/blood_filter,
/obj/item/bonesetter,
/obj/item/cautery,
Expand Down Expand Up @@ -987,6 +959,27 @@
/obj/item/bodybag,
))

/obj/item/storage/backpack/duffelbag/deforest_surgical/stocked

/obj/item/storage/backpack/duffelbag/deforest_surgical/stocked/PopulateContents()
var/static/items_inside = list(
/obj/item/scalpel = 1,
/obj/item/hemostat = 1,
/obj/item/retractor = 1,
/obj/item/circular_saw = 1,
/obj/item/bonesetter = 1,
/obj/item/cautery = 1,
/obj/item/surgical_drapes = 1,
/obj/item/blood_filter = 1,
/obj/item/emergency_bed = 1,
/obj/item/stack/medical/gauze = 1,
/obj/item/stack/medical/gauze/sterilized = 1,
/obj/item/reagent_containers/medigel/sterilizine = 1,
/obj/item/stack/sticky_tape/surgical = 1,
/obj/item/stack/medical/bone_gel = 1,
)
generate_items_inside(items_inside,src)

// Pre-packed medkit for healing synths and repairing their wounds rapidly in the field
/obj/item/storage/medkit/robotic_repair
name = "robotic repair equipment kit"
Expand Down
Loading