diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index d2cca5cd1a5..00ad8f9c167 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -99,11 +99,11 @@ Made by Xhuis shadowlings-- var/num_players = num_players() - required_thralls = round(num_players / 2.5) + required_thralls = round(num_players / 3) if(required_thralls < 15) required_thralls = 15 - if(required_thralls > 40) - required_thralls = 40 + if(required_thralls > 30) + required_thralls = 30 ..() return 1 @@ -158,7 +158,6 @@ Made by Xhuis update_shadow_icons_added(new_thrall_mind) new_thrall_mind.current.create_attack_log("Became a thrall") new_thrall_mind.current.add_language("Shadowling Hivemind") - new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/lesser_glare(null)) new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/lesser_shadow_walk(null)) new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadow_vision/thrall(null)) to_chat(new_thrall_mind.current, "You see the truth. Reality has been torn away and you realize what a fool you've been.") diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index 8c67e8a807d..40253048d57 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -1,4 +1,4 @@ -#define EMPOWERED_THRALL_LIMIT 5 +#define EMPOWERED_THRALL_LIMIT 10 /obj/effect/proc_holder/spell/proc/shadowling_check(var/mob/living/carbon/human/H) if(!H || !istype(H)) return @@ -49,39 +49,6 @@ M.AdjustSilence(10) -/obj/effect/proc_holder/spell/targeted/lesser_glare - name = "Lesser Glare" - desc = "Stuns and mutes a target for a short duration." - panel = "Thrall Abilities" - charge_max = 450 - clothes_req = 0 - action_icon_state = "glare" - -/obj/effect/proc_holder/spell/targeted/lesser_glare/cast(list/targets) - for(var/mob/living/carbon/human/target in targets) - if(!ishuman(target) || !target) - to_chat(usr, "You nay only glare at humans!") - charge_counter = charge_max - return - if(target.stat) - to_chat(usr, "[target] must be conscious!") - charge_counter = charge_max - return - if(is_shadow_or_thrall(target)) - to_chat(usr, "You cannot glare at allies!") - charge_counter = charge_max - return - var/mob/living/carbon/human/M = target - usr.visible_message("[usr]'s eyes flash a blinding red!") - target.visible_message("[target] freezes in place, their eyes glazing over...") - if(in_range(target, usr)) - to_chat(target, "Your gaze is forcibly drawn into [usr]'s eyes, and you are mesmerized by the heavenly lights...") - else - to_chat(target, "Red lights suddenly dance in your vision, and you are mesmerized by their heavenly beauty...") - target.Stun(3) //Roughly 30% as long as the normal one - M.AdjustSilence(3) - - /obj/effect/proc_holder/spell/aoe_turf/veil name = "Veil" desc = "Extinguishes most nearby light sources." @@ -672,12 +639,12 @@ sleep(20) thrallToRevive.visible_message("[thrallToRevive] slowly rises, no longer recognizable as human.", \ "You feel new power flow into you. You have been gifted by your masters. You now closely resemble them. You are empowered in \ - darkness but wither slowly in light. In addition, Lesser Glare and Guise have been upgraded into their true forms.") + darkness but wither slowly in light. In addition, you now have glare, veil, and true shadow walk.") thrallToRevive.set_species("Lesser Shadowling") - thrallToRevive.mind.RemoveSpell(/obj/effect/proc_holder/spell/targeted/lesser_glare) thrallToRevive.mind.RemoveSpell(/obj/effect/proc_holder/spell/targeted/lesser_shadow_walk) thrallToRevive.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/glare(null)) thrallToRevive.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadow_walk(null)) + thrallToRevive.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/veil(null)) if("Revive") if(!is_thrall(thrallToRevive)) to_chat(usr, "[thrallToRevive] is not a thrall.")