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

Commit 4266f80

Browse files
authored
Updates the description on some darkspawn things to improve clarity (#22631)
* Update core_abilities.dm * more * Update thrall_spells.dm
1 parent a066482 commit 4266f80

File tree

5 files changed

+26
-6
lines changed

5 files changed

+26
-6
lines changed

yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/core_abilities.dm

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
//////////////////////////////////////////////////////////////////////////
1919
/datum/action/cooldown/spell/touch/devour_will
2020
name = "Devour Will"
21-
desc = "Creates a dark bead that can be used on a human to fully recharge Psi, gain one lucidity, and knock them unconscious. The victim will be stunned for the duration of the channel, being interrupted \
22-
will knock both you and the victim down. Costs 5 Psi."
21+
desc = "Creates a dark bead that can be used on a human to begin draining the lucidity and willpower from a living target, knocking them unconscious for a time. Being interrupted will knock you down for a time."
2322
panel = "Darkspawn"
2423
button_icon = 'yogstation/icons/mob/actions/actions_darkspawn.dmi'
2524
sound = null

yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/thrall_spells.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@
374374
//////////////////////////////////////////////////////////////////////////
375375
/datum/action/cooldown/spell/pointed/elucidate
376376
name = "Elucidate"
377-
desc = "Channel significant power through an ally, greatly healing them, cleansing all CC and providing a speed boost."
377+
desc = "Channel significant power through an ally, greatly healing them, cleansing all CC and providing a speed boost. Able to revive any ally in close range."
378378
panel = "Darkspawn"
379379
button_icon = 'yogstation/icons/mob/actions/actions_darkspawn.dmi'
380380
ranged_mousepointer = 'icons/effects/mouse_pointers/visor_reticule.dmi'

yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/warlock_abilities.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
/datum/action/cooldown/spell/toggle/dark_staff/Enable()
5252
owner.balloon_alert(owner, "Shhouna")
53-
owner.visible_message(span_warning("[owner] knits shadows together into a staff!"), span_velvet("You summon your staff."))
53+
owner.visible_message(span_warning("[owner] knits shadows together into a staff!"), span_velvet("You summon your staff. Examine it to see what it does."))
5454
playsound(owner, 'yogstation/sound/magic/pass_create.ogg', 50, 1)
5555
if(!staff)
5656
staff = new (owner)

yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/warlock_staff.dm

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//////////////////////////////////////////////////////////////////////////
44
/obj/item/gun/magic/darkspawn
55
name = "channeling staff"
6-
desc = "This staff is boring to watch because even though it came first you've seen everything it can do in other staves for years."
6+
desc = "A staff made from pure darkness."
77
icon = 'yogstation/icons/obj/darkspawn_items.dmi'
88
icon_state = "shadow_staff"
99
item_state = "shadow_staff0"
@@ -22,6 +22,27 @@
2222
/// Flags used for different effects that apply when a projectile hits something
2323
var/effect_flags
2424

25+
/obj/item/gun/magic/darkspawn/examine(mob/user)
26+
. = ..()
27+
if(isobserver(user) || isdarkspawn(user))
28+
. += span_velvet("<b>Functions:</b>")
29+
if(effect_flags & STAFF_UPGRADE_LIGHTEATER)
30+
. += span_velvet("The staff will devour any lights hit.")
31+
. += span_velvet("Consumes [psi_cost] psi to fire a projectile.")
32+
. += span_velvet("Projectiles do 35 stamina damage.")
33+
34+
. += span_velvet("Also functions to pry open depowered airlocks using right click.")
35+
if(effect_flags)
36+
. += span_velvet("The projectile will also:")
37+
if(effect_flags & STAFF_UPGRADE_HEAL)
38+
. += span_velvet("Heal any ally hit for 30 health.")
39+
if(effect_flags & STAFF_UPGRADE_EXTINGUISH)
40+
. += span_velvet("Extinguish the fire on any ally.")
41+
if(effect_flags & STAFF_UPGRADE_EXTINGUISH)
42+
. += span_velvet("Confuse any enemy struck for 4 seconds.")
43+
if(effect_flags & STAFF_UPGRADE_LIGHTEATER)
44+
. += span_velvet("Consume the light of anything struck.")
45+
2546
/obj/item/gun/magic/darkspawn/Initialize(mapload)
2647
. = ..()
2748
ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)

yogstation/code/modules/antagonists/darkspawn/darkspawn_upgrades/utility_upgrades.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139

140140
/datum/psi_web/elucidate
141141
name = "Elucidate"
142-
desc = "Channel significant power through an ally, greatly healing them, cleansing all CC and providing a speed boost."
142+
desc = "Channel significant power through an ally, greatly healing them, cleansing all CC and providing a speed boost. Able to revive any ally in close range."
143143
lore_description = ""
144144
icon_state = "elucidate"
145145
willpower_cost = 2

0 commit comments

Comments
 (0)