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.

Sign up for GitHub

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

Some minor bloodsucker fixes #4886

Merged
merged 3 commits into from
Jan 19, 2025
Merged

Some minor bloodsucker fixes #4886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
654fe05
Some minor bloodsucker fixes
Absolucy Jan 15, 2025
ed77666
Spellcheck my spellcheck
Absolucy Jan 15, 2025
d44d4d6
fix moodlets
Absolucy Jan 16, 2025
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
16 changes: 8 additions & 8 deletions monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_moodlets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
/datum/mood_event/drankblood
description = "<span class='nicegreen'>I have fed greedly from that which nourishes me.</span>\n"
description = span_nicegreen("I have fed greedly from that which nourishes me.")
mood_change = 10
timeout = 8 MINUTES

/datum/mood_event/drankblood_bad
description = "<span class='boldwarning'>I drank the blood of a lesser creature. Disgusting.</span>\n"
description = span_boldwarning("I drank the blood of a lesser creature. Disgusting.")
mood_change = -4
timeout = 3 MINUTES

/datum/mood_event/drankblood_dead
description = "<span class='boldwarning'>I drank dead blood. I am better than this.</span>\n"
description = span_boldwarning("I drank dead blood. I am better than this.")
mood_change = -7
timeout = 8 MINUTES

/datum/mood_event/drankblood_synth
description = "<span class='boldwarning'>I drank synthetic blood. What is wrong with me?</span>\n"
description = span_boldwarning("I drank synthetic blood. What is wrong with me?")
mood_change = -7
timeout = 8 MINUTES

/datum/mood_event/drankkilled
description = "<span class='boldwarning'>I fed off of a dead person. I feel... less human.</span>\n"
description = span_boldwarning("I fed off of a dead person. I feel... less human.")
mood_change = -15
timeout = 10 MINUTES

/datum/mood_event/madevamp
description = "<span class='boldwarning'>A mortal has reached an apotheosis- undeath- by my own hand.</span>\n"
description = span_boldwarning("A mortal has reached an apotheosis- undeath- by my own hand.")
mood_change = 15
timeout = 20 MINUTES

/datum/mood_event/coffinsleep
description = "<span class='nicegreen'>I slept in a coffin during the day. I feel whole again.</span>\n"
description = span_nicegreen("I slept in a coffin during the day. I feel whole again.")
mood_change = 10
timeout = 6 MINUTES

///Candelabrum's mood event to non Bloodsucker/Vassals
/datum/mood_event/vampcandle
description = "<span class='boldwarning'>Something is making your mind feel... loose.</span>\n"
description = span_boldwarning("Something is making your mind feel... loose.")
mood_change = -15
timeout = 5 MINUTES
2 changes: 1 addition & 1 deletion monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_objectives.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
// EXPLANATION
/datum/objective/bloodsucker/embrace/update_explanation_text()
. = ..()
explanation_text = "Use the Candelabrum to Rank your Favorite Vassal up enough to become a Bloodsucker."
explanation_text = "Use the persuasion rack to Rank your Favorite Vassal up enough to become a Bloodsucker."

// WIN CONDITIONS?
/datum/objective/bloodsucker/embrace/check_completion()
Expand Down
2 changes: 1 addition & 1 deletion monkestation/code/modules/bloodsuckers/clans/_clan_base.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
return

to_chat(bloodsuckerdatum.owner.current, span_notice("You can change who this Vassal is, who are they to you?"))
var/vassal_response = show_radial_menu(bloodsuckerdatum.owner.current, vassaldatum.owner.current, radial_display)
var/vassal_response = show_radial_menu(bloodsuckerdatum.owner.current, vassaldatum.owner.current, radial_display, autopick_single_option = FALSE)
if(!vassal_response)
return
vassal_response = options[vassal_response]
Expand Down
2 changes: 1 addition & 1 deletion monkestation/code/modules/bloodsuckers/clans/venture.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
return TRUE

/datum/bloodsucker_clan/ventrue/on_favorite_vassal(datum/source, datum/antagonist/vassal/vassaldatum, mob/living/bloodsucker)
to_chat(bloodsucker, span_announce("* Bloodsucker Tip: You can now upgrade your Favorite Vassal by buckling them onto a Candelabrum!"))
to_chat(bloodsucker, span_announce("* Bloodsucker Tip: You can now upgrade your Favorite Vassal by buckling them onto a persuasion rack!"))
vassaldatum.BuyPower(new /datum/action/cooldown/bloodsucker/distress)

#undef BLOODSUCKER_BLOOD_RANKUP_COST
Expand Down
3 changes: 3 additions & 0 deletions monkestation/code/modules/bloodsuckers/structures/bloodsucker_crypt.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,9 @@
if(!ishuman(target))
balloon_alert(user, "you can't torture an animal or basic mob!")
return FALSE
if(disloyalty_offered)
balloon_alert(user, "wait a moment!")
return FALSE
var/disloyalty_requires = RequireDisloyalty(user, target)

if(disloyalty_requires == VASSALIZATION_BANNED)
Expand Down
Loading