From 9b4fb094dbf0ad7b2fb624aaf433a0bdce880209 Mon Sep 17 00:00:00 2001 From: Goat <126099705+Goat-Real@users.noreply.github.com> Date: Fri, 25 Apr 2025 09:18:44 -0600 Subject: [PATCH] Adds missing checks to cain & abel (#90777) ## About The Pull Request cain and abel could be used while they were in your pocket and that was a bit funny ## Why It's Good For The Game i shouldn't be able to swing my daggers while they're shoved inside my pocket ## Changelog :cl: Goat fix: Cain and Abel (the colossus drop) now require you to hold them to be able to swing them around /:cl: --- .../mining/lavaland/cain_and_abel/dagger_abilities.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/mining/lavaland/cain_and_abel/dagger_abilities.dm b/code/modules/mining/lavaland/cain_and_abel/dagger_abilities.dm index 55f3d564901..6a7cbc0d441 100644 --- a/code/modules/mining/lavaland/cain_and_abel/dagger_abilities.dm +++ b/code/modules/mining/lavaland/cain_and_abel/dagger_abilities.dm @@ -6,10 +6,16 @@ background_icon_state = "bg_default" overlay_icon_state = "bg_default_border" cooldown_time = 20 SECONDS + check_flags = AB_CHECK_INCAPACITATED | AB_CHECK_HANDS_BLOCKED | AB_CHECK_CONSCIOUS /datum/action/cooldown/dagger_swing/Activate(atom/target_atom) - . = ..() var/mob/living/living_owner = owner + var/obj/item/cain_and_abel = target + + if(!living_owner.is_holding(cain_and_abel)) + owner.balloon_alert(owner, "must be held") + return FALSE + living_owner.apply_status_effect(/datum/status_effect/dagger_swinging) var/static/list/possible_sounds = list( @@ -24,3 +30,4 @@ var/list/sounds_to_pick_from = possible_sounds.Copy() for(var/index in 0 to 5) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), owner, pick_n_take(sounds_to_pick_from), 65, TRUE), 0.15 SECONDS * index) + StartCooldown()