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

Adds IA as a vendor option (for more points than standard bottles) #6929

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
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/game/machinery/vending/vendor_types/crew/synthetic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
list("Pillbottle (Kelotane)", 5, /obj/item/storage/pill_bottle/kelotane, null, VENDOR_ITEM_RECOMMENDED),
list("Pillbottle (Peridaxon)", 5, /obj/item/storage/pill_bottle/peridaxon, null, VENDOR_ITEM_REGULAR),
list("Pillbottle (Tramadol)", 5, /obj/item/storage/pill_bottle/tramadol, null, VENDOR_ITEM_RECOMMENDED),
list("Pillbottle (ImiAlky)", 6, /obj/item/storage/pill_bottle/imialky, null, VENDOR_ITEM_REGULAR),

list("Injector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR),
list("Injector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list(
list("Pill Bottle (Kelotane)", 5, /obj/item/storage/pill_bottle/kelotane, null, VENDOR_ITEM_RECOMMENDED),
list("Pill Bottle (Peridaxon)", 5, /obj/item/storage/pill_bottle/peridaxon, null, VENDOR_ITEM_REGULAR),
list("Pill Bottle (Tramadol)", 5, /obj/item/storage/pill_bottle/tramadol, null, VENDOR_ITEM_RECOMMENDED),
list("Pillbottle (ImiAlky)", 6, /obj/item/storage/pill_bottle/imialky, null, VENDOR_ITEM_REGULAR),

list("MEDICAL UTILITIES", 0, null, null, null),
list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR),
Expand Down
5 changes: 5 additions & 0 deletions code/game/objects/items/reagent_containers/pill.dm
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,11 @@
pill_initial_reagents = list("alkysine" = 10)
pill_icon_class = "alky"

/obj/item/reagent_container/pill/imialky
pill_desc = "A pill containing Imidazoline and Alkysine. Heals eye and brain damage."
pill_initial_reagents = list("imidazoline" = 10, "alkysine" = 5)
pill_icon_class = "imi"

/obj/item/reagent_container/pill/bicaridine
pill_desc = "A Bicaridine pill. Heals brute damage."
pill_initial_reagents = list("bicaridine" = 15)
Expand Down
10 changes: 10 additions & 0 deletions code/game/objects/items/storage/firstaid.dm
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,16 @@
/obj/item/storage/pill_bottle/imidazoline/skillless
skilllock = SKILL_MEDICAL_DEFAULT

//Imidazoline+Alkysine
/obj/item/storage/pill_bottle/imialky
name = "\improper ImiAlky pill bottle"
icon_state = "pill_canister11"
pill_type_to_fill = /obj/item/reagent_container/pill/imialky
maptext_label = "IA"

/obj/item/storage/pill_bottle/imialky/skillless
skilllock = SKILL_MEDICAL_DEFAULT

//PERIDAXON
/obj/item/storage/pill_bottle/peridaxon
name = "\improper Peridaxon pill bottle"
Expand Down
Loading