Skip to content

Commit

Permalink
Adds Medpouches (and other Bay Stuff) (Aurorastation#15505)
Browse files Browse the repository at this point in the history
  • Loading branch information
alsoandanswer authored Feb 8, 2023
1 parent a4e2901 commit 12ddd59
Show file tree
Hide file tree
Showing 35 changed files with 591 additions and 283 deletions.
2 changes: 2 additions & 0 deletions aurorastation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1096,8 +1096,10 @@
#include "code\game\objects\items\weapons\storage\internal.dm"
#include "code\game\objects\items\weapons\storage\laundry_basket.dm"
#include "code\game\objects\items\weapons\storage\lockbox.dm"
#include "code\game\objects\items\weapons\storage\med_pouch.dm"
#include "code\game\objects\items\weapons\storage\misc.dm"
#include "code\game\objects\items\weapons\storage\mre.dm"
#include "code\game\objects\items\weapons\storage\pill_bottle.dm"
#include "code\game\objects\items\weapons\storage\secure.dm"
#include "code\game\objects\items\weapons\storage\slime_core_bag.dm"
#include "code\game\objects\items\weapons\storage\storage.dm"
Expand Down
6 changes: 6 additions & 0 deletions code/datums/uplink/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@
item_cost = 1
path = /obj/item/storage/box/syndie_kit/stimulants

/datum/uplink_item/item/medical/stabilisation
name = "Slimline Stabilisation Kit"
desc = "A pocket-sized medkit filled with lifesaving equipment."
item_cost = 2
path = /obj/item/storage/firstaid/sleekstab

/datum/uplink_item/item/medical/berserk_injectors
name = "Box of Berserk Injectors"
item_cost = 2
Expand Down
28 changes: 18 additions & 10 deletions code/game/machinery/vending_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@


/obj/machinery/vending/wallmed1
name = "NanoMed"
name = "\improper NanoMed"
desc = "A wall-mounted version of the NanoMed."
product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?"
icon_state = "wallmed"
Expand All @@ -591,10 +591,13 @@
density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude
vend_id = "meds"
products = list(
/obj/item/stack/medical/bruise_pack = 2,
/obj/item/stack/medical/ointment = 2,
/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 4,
/obj/item/reagent_containers/hypospray/autoinjector/dylovene = 4,
/obj/item/stack/medical/bruise_pack = 3,
/obj/item/stack/medical/ointment = 3,
/obj/item/reagent_containers/pill/perconol = 4,
/obj/item/storage/box/fancy/med_pouch/trauma = 1,
/obj/item/storage/box/fancy/med_pouch/burn = 1,
/obj/item/storage/box/fancy/med_pouch/oxyloss = 1,
/obj/item/storage/box/fancy/med_pouch/toxin = 1,
/obj/item/device/healthanalyzer = 1,
/obj/item/device/breath_analyzer = 1
)
Expand All @@ -611,7 +614,7 @@
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED

/obj/machinery/vending/wallmed2
name = "NanoMed"
name = "\improper NanoMed Mini"
desc = "A wall-mounted version of the NanoMed, containing only vital first aid equipment."
icon_state = "wallmed"
deny_time = 15
Expand All @@ -620,10 +623,15 @@
vend_id = "meds"
products = list(
/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 5,
/obj/item/reagent_containers/syringe/dylovene = 3,
/obj/item/stack/medical/bruise_pack = 3,
/obj/item/stack/medical/ointment = 3,
/obj/item/device/healthanalyzer = 3
/obj/item/stack/medical/bruise_pack = 4,
/obj/item/stack/medical/ointment = 4,
/obj/item/storage/box/fancy/med_pouch/trauma = 1,
/obj/item/storage/box/fancy/med_pouch/burn = 1,
/obj/item/storage/box/fancy/med_pouch/oxyloss = 1,
/obj/item/storage/box/fancy/med_pouch/toxin = 1,
/obj/item/storage/box/fancy/med_pouch/radiation = 1,
/obj/item/device/healthanalyzer = 1,
/obj/item/device/breath_analyzer = 1
)
contraband = list(
/obj/item/reagent_containers/pill/tox = 3
Expand Down
3 changes: 2 additions & 1 deletion code/game/objects/items/weapons/storage/belt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,8 @@
/obj/item/device/flashlight,
/obj/item/extinguisher/mini,
/obj/item/device/radio,
/obj/item/taperoll/medical
/obj/item/taperoll/medical,
/obj/item/storage/box/fancy/med_pouch
)

/obj/item/storage/belt/medical/first_responder
Expand Down
2 changes: 2 additions & 0 deletions code/game/objects/items/weapons/storage/fancy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,11 @@
src.icon_state = "[src.icon_type][src.storage_type][contents.len - itemremoved]"
else
icon_state = "[initial(icon_state)][src.opened]"
..()
else
cut_overlays()
icon_state = "[initial(icon_state)]" // closed
..()

/obj/item/storage/box/fancy/handle_item_insertion()
if(!opened) // makes sure boxes are opened before inserting anything
Expand Down
Loading

0 comments on commit 12ddd59

Please sign in to comment.