From 56e234194d4c47d45aa1e299e990ec2c4dee6dbc Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sun, 11 Aug 2024 09:06:20 -0700 Subject: [PATCH 1/7] Update pill.dm --- code/game/objects/items/reagent_containers/pill.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/game/objects/items/reagent_containers/pill.dm b/code/game/objects/items/reagent_containers/pill.dm index 6c71d8be3c0c..0015c178240a 100644 --- a/code/game/objects/items/reagent_containers/pill.dm +++ b/code/game/objects/items/reagent_containers/pill.dm @@ -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 = "imialky" + /obj/item/reagent_container/pill/bicaridine pill_desc = "A Bicaridine pill. Heals brute damage." pill_initial_reagents = list("bicaridine" = 15) From 639313a97880230badfe6d0e47e96b89957a1783 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sun, 11 Aug 2024 09:09:34 -0700 Subject: [PATCH 2/7] Update pill.dm --- code/game/objects/items/reagent_containers/pill.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/reagent_containers/pill.dm b/code/game/objects/items/reagent_containers/pill.dm index 0015c178240a..5e1abf0b0162 100644 --- a/code/game/objects/items/reagent_containers/pill.dm +++ b/code/game/objects/items/reagent_containers/pill.dm @@ -251,7 +251,7 @@ /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 = "imialky" + pill_icon_class = "imi" /obj/item/reagent_container/pill/bicaridine pill_desc = "A Bicaridine pill. Heals brute damage." From 3af17d0589924a7580101ffc32806b05c3d270ff Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sun, 11 Aug 2024 09:28:22 -0700 Subject: [PATCH 3/7] Update firstaid.dm --- code/game/objects/items/storage/firstaid.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 52fd50e9b022..db0f12b28d48 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -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 = "Im" + +/obj/item/storage/pill_bottle/imialky/skillless + skilllock = SKILL_MEDICAL_DEFAULT + //PERIDAXON /obj/item/storage/pill_bottle/peridaxon name = "\improper Peridaxon pill bottle" From 7e4d1bfcedc08c1b357c25b1e748ede4a99fff49 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sun, 11 Aug 2024 09:31:07 -0700 Subject: [PATCH 4/7] Update synthetic.dm --- code/game/machinery/vending/vendor_types/crew/synthetic.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm index 9ce15535e2da..d502231269e6 100644 --- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm +++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm @@ -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), From c00abb260c4f8db83ee5d426357b7a22839a3678 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sun, 11 Aug 2024 09:33:48 -0700 Subject: [PATCH 5/7] Update squad_medic.dm --- .../machinery/vending/vendor_types/squad_prep/squad_medic.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm index a8cc8be64bda..43dd754a8045 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm @@ -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), From 2c5fd05d70ceaba1a6363bbdd2de4cef82a4d752 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sun, 11 Aug 2024 10:05:30 -0700 Subject: [PATCH 6/7] Update firstaid.dm --- code/game/objects/items/storage/firstaid.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index db0f12b28d48..a8e3979c9b9a 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -643,7 +643,7 @@ name = "\improper Imialky pill bottle" icon_state = "pill_canister11" pill_type_to_fill = /obj/item/reagent_container/pill/imialky - maptext_label = "Im" + maptext_label = "IA" /obj/item/storage/pill_bottle/imialky/skillless skilllock = SKILL_MEDICAL_DEFAULT From 9a2c13fca0ca0375a85f3f76f015084465806c4f Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Mon, 12 Aug 2024 10:15:48 -0700 Subject: [PATCH 7/7] Update firstaid.dm --- code/game/objects/items/storage/firstaid.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index a8e3979c9b9a..6364288cda3c 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -640,7 +640,7 @@ //Imidazoline+Alkysine /obj/item/storage/pill_bottle/imialky - name = "\improper Imialky pill bottle" + name = "\improper ImiAlky pill bottle" icon_state = "pill_canister11" pill_type_to_fill = /obj/item/reagent_container/pill/imialky maptext_label = "IA"