From d32686e8a198cdf761f0da1ef9abe6a4c6b9dac1 Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Tue, 17 Dec 2024 19:53:17 +0300 Subject: [PATCH] [MIRROR] Allows golem arms to dredge boulders from ore vents (#5236) * Allows golem arms to dredge boulders from ore vents (#4511) * initial commit * Apply suggestions from code review Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Update code/game/objects/structures/lavaland/ore_vent.dm --------- Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * [MIRROR] Allows golem arms to dredge boulders from ore vents --------- Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com> Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> Co-authored-by: StealsThePRs --- code/game/objects/structures/lavaland/ore_vent.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/game/objects/structures/lavaland/ore_vent.dm b/code/game/objects/structures/lavaland/ore_vent.dm index a6933d53468..4c247e949c7 100644 --- a/code/game/objects/structures/lavaland/ore_vent.dm +++ b/code/game/objects/structures/lavaland/ore_vent.dm @@ -120,9 +120,18 @@ return to_chat(user, span_notice("You start striking [src] with your golem's fist, attempting to dredge up a boulder...")) for(var/i in 1 to 3) + /* NOVA EDIT CHANGE START - ORIGINAL: if(do_after(user, boulder_size * 1 SECONDS, src)) user.apply_damage(20, STAMINA) playsound(src, 'sound/items/weapons/genhit.ogg', 50, TRUE) + */ + if(!do_after(user, boulder_size * 1 SECONDS, src)) + user.balloon_alert(user, "stay still!") + return + user.balloon_alert(user, i > 2 ? "got one!" : "digging around...") + user.apply_damage(20, STAMINA) + playsound(src, 'sound/items/weapons/genhit.ogg', 50, TRUE) + // NOVA EDIT CHANGE END produce_boulder(TRUE) visible_message(span_notice("You've successfully produced a boulder! Boy are your arms tired."))