From 6ec6a47294a7c2f694d2499a22285f73ac1db061 Mon Sep 17 00:00:00 2001 From: Alexandria404 Date: Sun, 29 Mar 2020 12:39:39 +0200 Subject: [PATCH 1/3] test --- code/modules/mining/lavaland/necropolis_chests.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 4d64c909d89a..9229a726573a 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -1151,6 +1151,9 @@ var/turf/T = get_turf(target) if(!T || timer > world.time) return + if(!SSmapping.level_trait(T.z, ZTRAIT_MINING)) + to_chat(user, "The club fizzles wekaly, it seem his power does not reach to this realm." ) + return calculate_anger_mod(user) timer = world.time + CLICK_CD_MELEE //by default, melee attacks only cause melee blasts, and have an accordingly short cooldown if(proximity_flag) @@ -1203,6 +1206,10 @@ update_icon() /obj/item/hierophant_club/ui_action_click(mob/user, action) + var/turf/user_turf = get_turf(user) + if(!SSmapping.level_trait(user_turf, ZTRAIT_MINING)) + to_chat(user, "The club fizzles wekaly, it seem his power does not reach to this realm.") + return if(istype(action, /datum/action/item_action/toggle_unfriendly_fire)) //toggle friendly fire... friendly_fire_check = !friendly_fire_check to_chat(user, "You toggle friendly fire [friendly_fire_check ? "off":"on"]!") From 1450ac8eab733a92e865c749f474ec205a25f4ce Mon Sep 17 00:00:00 2001 From: Alexandria404 Date: Mon, 30 Mar 2020 12:24:31 +0200 Subject: [PATCH 2/3] Update code/modules/mining/lavaland/necropolis_chests.dm Co-Authored-By: alexkar598 <25136265+alexkar598@users.noreply.github.com> --- code/modules/mining/lavaland/necropolis_chests.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 9229a726573a..8d96d9eeb707 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -1151,8 +1151,8 @@ var/turf/T = get_turf(target) if(!T || timer > world.time) return - if(!SSmapping.level_trait(T.z, ZTRAIT_MINING)) - to_chat(user, "The club fizzles wekaly, it seem his power does not reach to this realm." ) + if(!is_mining_level(T.z)) + to_chat(user, "The club fizzles weakly, it seem its power doesn't reach this area." ) return calculate_anger_mod(user) timer = world.time + CLICK_CD_MELEE //by default, melee attacks only cause melee blasts, and have an accordingly short cooldown From 4333b189e300e9b601f10a23520dbe31feb7300b Mon Sep 17 00:00:00 2001 From: Alexandria404 Date: Mon, 30 Mar 2020 19:50:32 +0200 Subject: [PATCH 3/3] Update necropolis_chests.dm --- code/modules/mining/lavaland/necropolis_chests.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 8d96d9eeb707..02226d93aa24 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -1206,10 +1206,6 @@ update_icon() /obj/item/hierophant_club/ui_action_click(mob/user, action) - var/turf/user_turf = get_turf(user) - if(!SSmapping.level_trait(user_turf, ZTRAIT_MINING)) - to_chat(user, "The club fizzles wekaly, it seem his power does not reach to this realm.") - return if(istype(action, /datum/action/item_action/toggle_unfriendly_fire)) //toggle friendly fire... friendly_fire_check = !friendly_fire_check to_chat(user, "You toggle friendly fire [friendly_fire_check ? "off":"on"]!")