cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 06:00:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch-1' of https://github.com/whitefox08/-tg-station into whitefox08-patch-1

Browse Source
This commit is contained in:
Razharas
2015-10-10 02:38:43 +03:00
parent 1a8db6c8cc d8bd22a9a5
commit 32fd0da9f2
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/mind.dm
+2 -4
View File
@@ -1059,16 +1059,14 @@
switch(href_list["shadowling"])
if("clear")
ticker.mode.update_shadow_icons_removed(src)
src.spell_list = null
src.spell_list = list()
if(src in ticker.mode.shadows)
ticker.mode.shadows -= src
special_role = null
current << "<span class='userdanger'>Your powers have been quenched! You are no longer a shadowling!</span>"
src.spell_list = null
src.spell_list = list()
message_admins("[key_name_admin(usr)] has de-shadowling'ed [current].")
log_admin("[key_name(usr)] has de-shadowling'ed [current].")
remove_spell(/obj/effect/proc_holder/spell/targeted/shadowling_hatch)
remove_spell(/obj/effect/proc_holder/spell/targeted/shadowling_ascend)
else if(src in ticker.mode.thralls)
ticker.mode.remove_thrall(src,0)
message_admins("[key_name_admin(usr)] has de-thrall'ed [current].")