cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14606 from Kyep/sling_runtime_fix

Browse Source 
Stops shadowlings dividing by zero
This commit is contained in:
AffectedArc07
2020-10-14 12:28:23 +01:00
committed by GitHub
parent fc1098688b c386347793
commit 61c96d3e2b
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/spell.dm
+2
View File
@@ -322,6 +322,8 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell))
if("recharge")
if(charge_counter == 0)
return 0
if(charge_max == 0)
return 1
return charge_counter / charge_max
if("charges")
if(charge_counter)
code/game/gamemodes/shadowling/shadowling_abilities.dm
+9 -8
View File
@@ -1,20 +1,21 @@
#define EMPOWERED_THRALL_LIMIT 5
/obj/effect/proc_holder/spell/proc/shadowling_check(var/mob/living/carbon/human/H)
if(!H || !istype(H)) return
if(!H || !istype(H))
return
if(H.incorporeal_move == 1)
to_chat(usr, "<span class='warning'>You can't use abilities affecting others while you are traversing between worlds!</span>")
to_chat(H, "<span class='warning'>You can't use abilities affecting others while you are traversing between worlds!</span>")
return FALSE
if(isshadowling(H) && is_shadow(H))
return 1
if(isshadowlinglesser(H) && is_thrall(H))
return 1
if(!is_shadow_or_thrall(usr))
to_chat(usr, "<span class='warning'>You can't wrap your head around how to do this.</span>")
else if(is_thrall(usr))
to_chat(usr, "<span class='warning'>You aren't powerful enough to do this.</span>")
else if(is_shadow(usr))
to_chat(usr, "<span class='warning'>Your telepathic ability is suppressed. Hatch or use Rapid Re-Hatch first.</span>")
if(!is_shadow_or_thrall(H))
to_chat(H, "<span class='warning'>You can't wrap your head around how to do this.</span>")
else if(is_thrall(H))
to_chat(H, "<span class='warning'>You aren't powerful enough to do this.</span>")
else if(is_shadow(H))
to_chat(H, "<span class='warning'>Your telepathic ability is suppressed. Hatch or use Rapid Re-Hatch first.</span>")
return 0