From d756a5de00ea5355f5d972823426588a3ed0b40f Mon Sep 17 00:00:00 2001 From: Molti <108117184+Moltijoe@users.noreply.github.com> Date: Sun, 26 Feb 2023 03:18:18 -0600 Subject: [PATCH 1/3] Update other_reagents.dm (#18073) --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 804ab97cc7a5..7653cca307d8 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -102,7 +102,7 @@ taste_description = "slime" /datum/reagent/vaccine/reaction_mob(mob/living/L, method=TOUCH, reac_volume) - if(islist(data) && (method == INGEST || method == INJECT)) + if(islist(data) && method == INJECT) for(var/thing in L.diseases) var/datum/disease/D = thing if(D.GetDiseaseID() in data) From 65cce8615f3c4cbcffdf5598a4f8766ece13b8aa Mon Sep 17 00:00:00 2001 From: tattax <71668564+tattax@users.noreply.github.com> Date: Mon, 27 Feb 2023 02:28:33 -0300 Subject: [PATCH 2/3] s --- code/modules/antagonists/bloodsuckers/bloodsuckers.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/antagonists/bloodsuckers/bloodsuckers.dm b/code/modules/antagonists/bloodsuckers/bloodsuckers.dm index 10ff70e2d0de..29c8a50c466d 100644 --- a/code/modules/antagonists/bloodsuckers/bloodsuckers.dm +++ b/code/modules/antagonists/bloodsuckers/bloodsuckers.dm @@ -522,7 +522,7 @@ if(power.active) power.DeactivatePower() -/datum/antagonist/bloodsucker/proc/SpendRank(spend_rank = TRUE) +/datum/antagonist/bloodsucker/proc/SpendRank(spend_rank = TRUE, ask = TRUE) set waitfor = FALSE if(!owner || !owner.current || !owner.current.client || (spend_rank && bloodsucker_level_unspent <= 0.5)) @@ -537,7 +537,7 @@ to_chat(owner.current, span_notice("You grow more ancient by the night!")) else // Give them the UI to purchase a power. - var/choice = input("You have the opportunity to grow more ancient, increasing the level of all your powers by 1. Select a power to advance your Rank.", "Your Blood Thickens...") in options + var/choice = tgui_input_list(owner.current, "You have the opportunity to grow more ancient, increasing the level of all your powers by 1. Select a power to advance your Rank.", "Your Blood Thickens...", options) // Prevent Bloodsuckers from closing/reopning their coffin to spam Levels. if(spend_rank && bloodsucker_level_unspent <= 0) return @@ -589,6 +589,11 @@ * Your existing powers have all ranked up as well!")) update_hud(owner.current) owner.current.playsound_local(null, 'sound/effects/pope_entry.ogg', 25, TRUE, pressure_affected = FALSE) + if(bloodsucker_level_unspent && spend_rank) + if(ask) + if(tgui_alert(owner.current, "You have leftover ranks, do you want to spend them all?", "Time Management Team", list("Yes", "No")) == "No") + return + SpendRank(ask = FALSE) //////////////////////////////////////////////////////////////////////////////////////////////// From 51b1a14d954f7773c952177345a176e43245dc4f Mon Sep 17 00:00:00 2001 From: tattax <71668564+tattax@users.noreply.github.com> Date: Mon, 27 Feb 2023 02:31:26 -0300 Subject: [PATCH 3/3] Update code/modules/reagents/chemistry/reagents/other_reagents.dm --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 7653cca307d8..804ab97cc7a5 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -102,7 +102,7 @@ taste_description = "slime" /datum/reagent/vaccine/reaction_mob(mob/living/L, method=TOUCH, reac_volume) - if(islist(data) && method == INJECT) + if(islist(data) && (method == INGEST || method == INJECT)) for(var/thing in L.diseases) var/datum/disease/D = thing if(D.GetDiseaseID() in data)