cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 18:44:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Shadowling dethrall fix

Browse Source 
Should fix thralls not getting their spells removed upon dethralling.
This commit is contained in:
DZD
2015-08-20 11:42:09 -04:00
parent f89af99858
commit 5205f55085
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/shadowling/shadowling.dm
+3 -3
View File
@@ -152,9 +152,9 @@ Made by Xhuis
update_shadow_icons_added(new_thrall_mind)
new_thrall_mind.current.attack_log += "\[[time_stamp()]\] <span class='danger'>Became a thrall</span>"
new_thrall_mind.current.add_language("Shadowling Hivemind")
new_thrall_mind.current.AddSpell(new /obj/effect/proc_holder/spell/targeted/lesser_glare)
new_thrall_mind.current.AddSpell(new /obj/effect/proc_holder/spell/targeted/lesser_shadow_walk)
//new_thrall_mind.current.AddSpell(new /obj/effect/proc_holder/spell/targeted/thrall_vision) //Uncomment when vision code is unfucked.
new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/lesser_glare)
new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/lesser_shadow_walk)
//new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/thrall_vision) //Uncomment when vision code is unfucked.
new_thrall_mind.current << "<span class='shadowling'><b>You see the truth. Reality has been torn away and you realize what a fool you've been.</b></span>"
new_thrall_mind.current << "<span class='shadowling'><b>The shadowlings are your masters.</b> Serve them above all else and ensure they complete their goals.</span>"
new_thrall_mind.current << "<span class='shadowling'>You may not harm other thralls or the shadowlings. However, you do not need to obey other thralls.</span>"
code/game/gamemodes/shadowling/special_shadowling_abilities.dm
+10 -10
View File
@@ -91,11 +91,11 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N
sleep(10)
H << "<span class='shadowling'><b><i>Your powers are awoken. You may now live to your fullest extent. Remember your goal. Cooperate with your thralls and allies.</b></i></span>"
H.mind.remove_spell(/obj/effect/proc_holder/spell/targeted/shadowling_hatch)
H.AddSpell(new /obj/effect/proc_holder/spell/targeted/glare)
H.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/veil)
H.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadow_walk)
H.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/flashfreeze)
H.AddSpell(new /obj/effect/proc_holder/spell/targeted/collective_mind)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/glare)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/veil)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadow_walk)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/flashfreeze)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/collective_mind)
/obj/effect/proc_holder/spell/targeted/shadowling_ascend
name = "Ascend"
@@ -156,11 +156,11 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N
H.mind.transfer_to(A)
A.name = H.real_name
A.languages = H.languages
A.AddSpell(new /obj/effect/proc_holder/spell/targeted/annihilate)
A.AddSpell(new /obj/effect/proc_holder/spell/targeted/hypnosis)
A.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadowling_phase_shift)
A.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/ascendant_storm)
A.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadowlingAscendantTransmit)
A.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/annihilate)
A.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/hypnosis)
A.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadowling_phase_shift)
A.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/ascendant_storm)
A.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadowlingAscendantTransmit)
if(A.real_name)
A.real_name = H.real_name
H.invisibility = 60 //This is pretty bad, but is also necessary for the shuttle call to function properly