Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

bloodsucker coffin qol #18118

Merged
Bibby0110 merged 3 commits into from
Mar 5, 2023
Merged

bloodsucker coffin qol #18118

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d756a5d
Update other_reagents.dm (#18073)
Moltijoe Feb 26, 2023
65cce86
s
tattax Feb 27, 2023
51b1a14
Update code/modules/reagents/chemistry/reagents/other_reagents.dm
tattax Feb 27, 2023
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
9 changes: 7 additions & 2 deletions code/modules/antagonists/bloodsuckers/bloodsuckers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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
Expand Down Expand Up @@ -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)

////////////////////////////////////////////////////////////////////////////////////////////////

Expand Down