From 92de82eb86d9b3ef50ab96dd34b704291f12d1ea Mon Sep 17 00:00:00 2001
From: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>
Date: Sun, 28 Jan 2024 14:28:13 +0100
Subject: [PATCH] Recharge cult suit again (#23917)
* wtf
* shielded component
---
code/game/gamemodes/cult/blood_magic.dm | 33 ++++++++++++++++---------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/code/game/gamemodes/cult/blood_magic.dm b/code/game/gamemodes/cult/blood_magic.dm
index 775186f825e..932ea124f3e 100644
--- a/code/game/gamemodes/cult/blood_magic.dm
+++ b/code/game/gamemodes/cult/blood_magic.dm
@@ -700,23 +700,34 @@
if(user.holy_check())
return
if(proximity_flag)
+ // Shielded suit
+ if(istype(target, /obj/item/clothing/suit/hooded/cultrobes/cult_shield))
+ var/datum/component/shielded/shield = target.GetComponent(/datum/component/shielded)
+ if(shield.current_charges >= 3)
+ to_chat(user, "[target] is already at full charge!")
+ return
+ uses--
+ to_chat(user, "You empower [target] with blood, recharging its shields!")
+ playsound(user, 'sound/magic/cult_spell.ogg', 25, TRUE, SOUND_RANGE_SET(7))
+ shield.current_charges = 3
+ user.update_appearance(UPDATE_ICON)
+ return ..()
// Veil Shifter
if(istype(target, /obj/item/cult_shift))
var/obj/item/cult_shift/S = target
- if(S.uses < 4)
- uses--
- to_chat(user, "You empower [target] with blood, recharging its ability to shift!")
- playsound(user, 'sound/magic/cult_spell.ogg', 25, TRUE, SOUND_RANGE_SET(7))
- S.uses = 4
- S.icon_state = "shifter"
- else
+ if(S.uses >= 4)
to_chat(user, "[target] is already at full charge!")
return
- else
- to_chat(user, "The spell will not work on [target]!")
- return
- ..()
+ uses--
+ to_chat(user, "You empower [target] with blood, recharging its ability to shift!")
+ playsound(user, 'sound/magic/cult_spell.ogg', 25, TRUE, SOUND_RANGE_SET(7))
+ S.uses = 4
+ S.icon_state = "shifter"
+ return ..()
+
+ to_chat(user, "The spell will not work on [target]!")
+ return ..()
//Blood Rite: Absorb blood to heal cult members or summon weapons
/obj/item/melee/blood_magic/manipulator