shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14237 from Citadel-Station-13/silicons-patch-11

Browse Source 
adds sanity checks to heretic blade shatters
This commit is contained in:
Lin
2021-02-18 23:51:23 -06:00
committed by GitHub
parent 071cc29ab0 14c9fe655c
commit d2f9237ecd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/eldritch_cult/eldritch_items.dm
+4 -2
View File
@@ -50,7 +50,8 @@
background_icon_state = "bg_ecult" background_icon_state = "bg_ecult"
button_icon_state = "shatter" button_icon_state = "shatter"
icon_icon = 'icons/mob/actions/actions_ecult.dmi' icon_icon = 'icons/mob/actions/actions_ecult.dmi'
check_flags = MOBILITY_HOLD|MOBILITY_MOVE|MOBILITY_USE check_flags = NONE // required_mobility_flags handles this
required_mobility_flags = MOBILITY_HOLD|MOBILITY_MOVE|MOBILITY_USE
var/mob/living/carbon/human/holder var/mob/living/carbon/human/holder
var/obj/item/melee/sickly_blade/sword var/obj/item/melee/sickly_blade/sword
@@ -62,11 +63,12 @@
/datum/action/innate/heretic_shatter/IsAvailable() /datum/action/innate/heretic_shatter/IsAvailable()
if(IS_HERETIC(holder) || IS_HERETIC_MONSTER(holder)) if(IS_HERETIC(holder) || IS_HERETIC_MONSTER(holder))
return TRUE return ..()
else else
return FALSE return FALSE
/datum/action/innate/heretic_shatter/Activate() /datum/action/innate/heretic_shatter/Activate()
. = ..()
var/turf/safe_turf = find_safe_turf(zlevels = sword.z, extended_safety_checks = TRUE) var/turf/safe_turf = find_safe_turf(zlevels = sword.z, extended_safety_checks = TRUE)
do_teleport(holder,safe_turf,forceMove = TRUE) do_teleport(holder,safe_turf,forceMove = TRUE)
to_chat(holder,"<span class='warning'>You feel a gust of energy flow through your body... the Rusted Hills heard your call...</span>") to_chat(holder,"<span class='warning'>You feel a gust of energy flow through your body... the Rusted Hills heard your call...</span>")