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 pull request #13414 from AnturK/shadowlingfix

Browse Source 
Fixes shadowling hatch
This commit is contained in:
Cheridan
2015-12-03 15:35:46 -06:00
parent 31989e9197 7a34287a7d
commit 3cf6dc50be
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/shadowling/special_shadowling_abilities.dm
+4 -2
View File
@@ -9,8 +9,9 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N
clothes_req = 0
action_icon_state = "hatch"
/obj/effect/proc_holder/spell/self/shadowling_hatch/cast(mob/living/carbon/human/H,mob/user = usr)
/obj/effect/proc_holder/spell/self/shadowling_hatch/cast(list/targets,mob/user = usr)
if(user.stat || !ishuman(user) || !user || !is_shadow(user)) return
var/mob/living/carbon/human/H = user
var/hatch_or_no = alert(H,"Are you sure you want to hatch? You cannot undo this!",,"Yes","No")
switch(hatch_or_no)
if("No")
@@ -109,7 +110,8 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N
clothes_req = 0
action_icon_state = "ascend"
/obj/effect/proc_holder/spell/self/shadowling_ascend/cast(mob/living/carbon/human/H,mob/user = usr)
/obj/effect/proc_holder/spell/self/shadowling_ascend/cast(list/targets,mob/user = usr)
var/mob/living/carbon/human/H = user
if(!shadowling_check(H))
return
var/hatch_or_no = alert(H,"It is time to ascend. Are you sure about this?",,"Yes","No")