From 30f65d5b73820425ac4ace23c053dd1c82cb016a Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Fri, 15 Mar 2019 23:24:25 +0100 Subject: [PATCH 1/3] Shadowlings now cannot use their abilities affecting others while shadow walking --- code/game/gamemodes/shadowling/shadowling_abilities.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index 51360c7b398..197be529ecf 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -2,6 +2,9 @@ /obj/effect/proc_holder/spell/proc/shadowling_check(var/mob/living/carbon/human/H) if(!H || !istype(H)) return + if(H.incorporeal_move == 1) + to_chat(usr, "You can't use your abilities while you are traversing between worlds!") + return 0 if(isshadowling(H) && is_shadow(H)) return 1 if(isshadowlinglesser(H) && is_thrall(H)) From 51cc11a51446ad0dfaf422b2333bd0778bb12b24 Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Fri, 15 Mar 2019 23:27:40 +0100 Subject: [PATCH 2/3] Warning message clarified a bit --- code/game/gamemodes/shadowling/shadowling_abilities.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index 197be529ecf..d2377a02b82 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -3,7 +3,7 @@ /obj/effect/proc_holder/spell/proc/shadowling_check(var/mob/living/carbon/human/H) if(!H || !istype(H)) return if(H.incorporeal_move == 1) - to_chat(usr, "You can't use your abilities while you are traversing between worlds!") + to_chat(usr, "You can't use abilities affecting others while you are traversing between worlds!") return 0 if(isshadowling(H) && is_shadow(H)) return 1 From e000bc2794d5f3f2a97115af1b44bd19a7a91475 Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Sat, 16 Mar 2019 00:57:51 +0100 Subject: [PATCH 3/3] Code improvement --- code/game/gamemodes/shadowling/shadowling_abilities.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index d2377a02b82..a0cd563674a 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -4,7 +4,7 @@ if(!H || !istype(H)) return if(H.incorporeal_move == 1) to_chat(usr, "You can't use abilities affecting others while you are traversing between worlds!") - return 0 + return FALSE if(isshadowling(H) && is_shadow(H)) return 1 if(isshadowlinglesser(H) && is_thrall(H))