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.

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

Medical pouches tweaks. #96

Merged
merged 6 commits into from
Aug 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions code/datums/jobs/job/shipside.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1094,6 +1094,7 @@ Make sure that the doctors and nurses are doing their jobs and keeping the marin
/datum/outfit/job/medical/professor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
H.equip_to_slot_or_hand(new /obj/item/tweezers, SLOT_IN_R_POUCH)
H.equip_to_slot_or_hand(new /obj/item/tool/surgery/scalpel/manager, SLOT_IN_R_POUCH)
H.equip_to_slot_or_hand(new /obj/item/reagent_containers/glass/bottle/lemoline/doctor, SLOT_S_STORE)

//Medical Officer
Expand Down
23 changes: 12 additions & 11 deletions code/game/objects/items/reagent_containers/autoinjectors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

/obj/item/reagent_containers/hypospray/autoinjector/combat
name = "combat autoinjector"
desc = "An autoinjector loaded with 2 doses of healing and painkilling chemicals. Intended for use in active combat."
desc = "An autoinjector loaded with 3 doses of healing and painkilling chemicals. Intended for use in active combat."
icon_state = "RedGreen"
amount_per_transfer_from_this = 15
list_reagents = list(
Expand All @@ -55,7 +55,7 @@

/obj/item/reagent_containers/hypospray/autoinjector/combat_advanced
name = "advanced combat autoinjector"
desc = "An autoinjector loaded with 2 doses of advanced healing and painkilling chemicals. Intended for use in active combat."
desc = "An autoinjector loaded with 3 doses of advanced healing and painkilling chemicals. Intended for use in active combat."
icon_state = "Lilac"
amount_per_transfer_from_this = 15
list_reagents = list(
Expand Down Expand Up @@ -140,7 +140,7 @@

/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline
name = "inaprovaline autoinjector"
desc = "An auto-injector loaded with 2 doses of inaprovaline, an emergency stabilization medicine for patients in critical condition."
desc = "An auto-injector loaded with 3 doses of inaprovaline, an emergency stabilization medicine for patients in critical condition."
icon_state = "autoinjector-9"
amount_per_transfer_from_this = 15
list_reagents = list(/datum/reagent/medicine/inaprovaline = 45)
Expand All @@ -157,30 +157,31 @@

/obj/item/reagent_containers/hypospray/autoinjector/spaceacillin
name = "spaceacillin autoinjector"
desc = "An auto-injector loaded with 3 doses of spaceacillin, an antibiotic medicine that helps combat infection and fight necrosis."
desc = "An auto-injector loaded with 9 doses of spaceacillin, an antibiotic medicine that helps combat infection and fight necrosis."
icon_state = "autoinjector-1"
amount_per_transfer_from_this = 5
list_reagents = list(/datum/reagent/medicine/spaceacillin = 45)
description_overlay = "Sp"

/obj/item/reagent_containers/hypospray/autoinjector/alkysine
name = "alkysine autoinjector"
desc = "An auto-injector loaded with 3 doses of alkysine, long-living medicine for fixing brain and ear damage."
desc = "An auto-injector loaded with 9 doses of alkysine, long-living medicine for fixing brain and ear damage."
icon_state = "autoinjector-12"
amount_per_transfer_from_this = 5
list_reagents = list(/datum/reagent/medicine/alkysine = 45)
description_overlay = "Al"

/obj/item/reagent_containers/hypospray/autoinjector/imidazoline
name = "imidazoline autoinjector"
desc = "An auto-injector loaded with 3 doses of imidazoline, medicine for fixing eyesight."
desc = "An auto-injector loaded with 6 doses of imidazoline, medicine for fixing eyesight."
icon_state = "autoinjector-5"
amount_per_transfer_from_this = 7.5
list_reagents = list(/datum/reagent/medicine/imidazoline = 45)
description_overlay = "Im"

/obj/item/reagent_containers/hypospray/autoinjector/hypervene
name = "hypervene autoinjector"
desc = "An auto-injector loaded with 3 uses of hypervene, an emergency medicine that rapidly purges chems. Causes pain and vomiting."
desc = "An auto-injector loaded with 15 uses of hypervene, an emergency medicine that rapidly purges chems. Causes pain and vomiting."
icon_state = "Toxic"
amount_per_transfer_from_this = 3
list_reagents = list(/datum/reagent/hypervene = 45)
Expand Down Expand Up @@ -243,7 +244,7 @@
name = "Peridaxon autoinjector"
desc = "An auto-injector loaded with 3 doses of Peridaxon, a chemical that removes the consequences from organs !DO NOT USE MORE THAN ONCE AT A TIME!"
amount_per_transfer_from_this = 5
volume = 3
volume = 15
icon_state = "VioWhite"
list_reagents = list(/datum/reagent/medicine/peridaxon = 15)
description_overlay = "Pe"
Expand All @@ -262,7 +263,7 @@

/obj/item/reagent_containers/hypospray/autoinjector/russian_red
name = "emergency autoinjector"
desc = "An autoinjector loaded with a single use of Russian Red. Restores a significant amount of stamina and heals a large amount of damage, but causes slight permanent damage."
desc = "An autoinjector loaded with 3 doses of Russian Red. Restores a significant amount of stamina and heals a large amount of damage, but causes slight permanent damage."
icon_state = "Redwood"
amount_per_transfer_from_this = 15
list_reagents = list(
Expand All @@ -282,7 +283,7 @@

/obj/item/reagent_containers/hypospray/autoinjector/isotonic
name = "isotonic solution autoinjector"
desc = "An auto-injector loaded with 2 doses of isotonic solution, formulated to quickly recover fluid volume after blood loss or trauma."
desc = "An auto-injector loaded with 3 doses of isotonic solution, formulated to quickly recover fluid volume after blood loss or trauma."
icon_state = "autoinjector-8"
amount_per_transfer_from_this = 15
list_reagents = list(
Expand Down Expand Up @@ -348,7 +349,7 @@
icon_state = "Toxic"
amount_per_transfer_from_this = 30
volume = 30
list_reagents = list(/datum/reagent/toxin/mindbreaker = 50)
list_reagents = list(/datum/reagent/toxin/mindbreaker = 30)

/obj/item/reagent_containers/hypospray/autoinjector/yautja
name = "unusual crystal"
Expand Down
11 changes: 3 additions & 8 deletions code/game/objects/items/storage/belt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,7 @@
/obj/item/tool/taperoll/engineering,
/obj/item/tool/extinguisher/mini,
/obj/item/tool/shovel/etool,
//RUTGMC EDIT ADDITION BEGIN - SOLDERING_TOOL
/obj/item/tool/surgery/solderingtool,
//RUTGMC EDIT ADDITION END
)

/obj/item/storage/belt/utility/full/Initialize(mapload)
Expand Down Expand Up @@ -126,11 +124,9 @@
/obj/item/storage/syringe_case,
/obj/item/reagent_containers/hypospray/autoinjector,
/obj/item/stack/medical,
//RUTGMC EDIT ADDITION BEGIN
/obj/item/tool/surgery/solderingtool,
/obj/item/tweezers,
/obj/item/tweezers_advanced
//RUTGMC EDIT ADDITION END
)

/obj/item/storage/belt/lifesaver/full/Initialize(mapload) //The belt, with all it's magic inside!
Expand All @@ -142,6 +138,7 @@
new /obj/item/storage/pill_bottle/dylovene(src)
new /obj/item/storage/pill_bottle/inaprovaline(src)
new /obj/item/storage/pill_bottle/isotonic(src)
new /obj/item/storage/pill_bottle/dexalin(src)
new /obj/item/storage/pill_bottle/spaceacillin(src)
new /obj/item/storage/pill_bottle/imialky(src)
new /obj/item/storage/pill_bottle/hypervene(src)
Expand Down Expand Up @@ -294,11 +291,9 @@
/obj/item/defibrillator,
/obj/item/roller,
/obj/item/tool/research,
//RUTGMC EDIT ADDITION BEGIN
/obj/item/tool/surgery/solderingtool,
/obj/item/tweezers,
/obj/item/tweezers_advanced
//RUTGMC EDIT ADDITION END
)

/obj/item/storage/belt/rig/medical/Initialize(mapload) //The belt, with all it's magic inside!
Expand All @@ -310,9 +305,9 @@
new /obj/item/storage/pill_bottle/dylovene(src)
new /obj/item/storage/pill_bottle/inaprovaline(src)
new /obj/item/storage/pill_bottle/isotonic(src)
new /obj/item/storage/pill_bottle/dexalin(src)
new /obj/item/storage/pill_bottle/spaceacillin(src)
new /obj/item/storage/pill_bottle/alkysine(src)
new /obj/item/storage/pill_bottle/imidazoline(src)
new /obj/item/storage/pill_bottle/imialky(src)
new /obj/item/storage/pill_bottle/hypervene(src)
new /obj/item/bodybag/cryobag(src)
new /obj/item/roller(src)
Expand Down
16 changes: 7 additions & 9 deletions code/game/objects/items/storage/pouch.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
desc = "A general purpose pouch used to carry small items."
icon_state = "small_drop"
draw_mode = 1
bypass_w_limit = list(/obj/item/ammo_magazine/packet, /obj/item/ammo_magazine/shotgun) // RU TGMC EDIT
bypass_w_limit = list(/obj/item/ammo_magazine/packet, /obj/item/ammo_magazine/shotgun)

/obj/item/storage/pouch/general/medium
name = "medium general pouch"
Expand Down Expand Up @@ -507,9 +507,8 @@
/obj/item/storage/pouch/medkit/medic/Initialize(mapload)
. = ..()
new /obj/item/stack/medical/heal_pack/advanced/bruise_combat_pack(src)
new /obj/item/stack/medical/heal_pack/advanced/bruise_combat_pack(src)
new /obj/item/stack/medical/heal_pack/advanced/burn_combat_pack(src)
new /obj/item/stack/medical/heal_pack/advanced/burn_combat_pack(src)
new /obj/item/stack/medical/splint(src)
new /obj/item/reagent_containers/hypospray/advanced/meraderm(src)
new /obj/item/reagent_containers/hypospray/advanced/meraderm(src)
new /obj/item/reagent_containers/hypospray/advanced/nanoblood(src)
Expand Down Expand Up @@ -562,8 +561,8 @@
new /obj/item/reagent_containers/hypospray/autoinjector/dexalinplus(src)
new /obj/item/reagent_containers/hypospray/autoinjector/quickclot(src)
new /obj/item/reagent_containers/hypospray/autoinjector/quickclot(src)
//new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon(src)
//new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon(src)
new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon(src)
new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon(src)

/obj/item/storage/pouch/medical_injectors/som
desc = "A specialized medical pouch that can only hold auto-injectors. This one looks to be made out of traditional SOM leather."
Expand All @@ -589,8 +588,8 @@
new /obj/item/reagent_containers/hypospray/autoinjector/dexalinplus(src)
new /obj/item/reagent_containers/hypospray/autoinjector/quickclot(src)
new /obj/item/reagent_containers/hypospray/autoinjector/quickclot(src)
//new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon(src)
//new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon(src)
new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon(src)
new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon(src)

/obj/item/storage/pouch/medical_injectors/icc
desc = "A specialized medical pouch that can only hold auto-injectors. This one looks to be made out of a synthetic tan fabric."
Expand Down Expand Up @@ -658,7 +657,6 @@

/obj/item/storage/pouch/surgery/Initialize(mapload)
. = ..()
//new /obj/item/tool/surgery/scalpel/manager(src) RUTGMC REMOVAL
new /obj/item/tool/surgery/scalpel(src)
new /obj/item/tool/surgery/hemostat(src)
new /obj/item/tool/surgery/retractor(src)
Expand Down Expand Up @@ -842,7 +840,7 @@
desc = "A pouch specialized for holding shotgun ammo."
icon_state = "shotshells"
sprite_slots = 4
storage_slots = 7 //RUTGMC EDIT
storage_slots = 7
draw_mode = 0
can_hold = list(/obj/item/ammo_magazine/handful)

Expand Down
Loading