From bc34d0328f9035f66d282b9085bd83bb59fab609 Mon Sep 17 00:00:00 2001 From: Molti Date: Mon, 17 Jul 2023 23:44:49 -0500 Subject: [PATCH 1/2] Update brass_skewer.dm --- .../clockcult/clock_structures/traps/brass_skewer.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm b/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm index 2e0de722ef84..d7c32a6af72f 100644 --- a/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm +++ b/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm @@ -56,7 +56,7 @@ squirrel.visible_message(span_boldwarning("A massive brass spike erupts from the ground, rending [squirrel]'s chassis but shattering into pieces!"), \ span_userdanger("A massive brass spike rips through your chassis and bursts into shrapnel in your casing!")) squirrel.adjustBruteLoss(50) - squirrel.Stun(20) + squirrel.Stun(2 SECONDS) addtimer(CALLBACK(src, PROC_REF(take_damage), max_integrity), 1) else squirrel.visible_message(span_boldwarning("A massive brass spike erupts from the ground, impaling [squirrel]!"), \ @@ -65,7 +65,7 @@ playsound(squirrel, 'sound/effects/splat.ogg', 50, TRUE) playsound(squirrel, 'sound/misc/desceration-03.ogg', 50, TRUE) squirrel.apply_damage(20, BRUTE, BODY_ZONE_CHEST) - squirrel.Stun(20) + squirrel.Stun(2 SECONDS) buckle_mob(squirrel, TRUE) else visible_message(span_danger("A massive brass spike erupts from the ground!")) @@ -93,7 +93,7 @@ user.visible_message(span_warning("[user] starts wriggling off of [src]!"), \ span_danger("You start agonizingly working your way off of [src]...")) wiggle_wiggle = TRUE - if(!do_after(user, 30 SECONDS, user)) + if(!do_after(user, 10 SECONDS, user)) user.visible_message(span_warning("[user] slides back down [src]!")) user.emote("scream") user.apply_damage(10, BRUTE, BODY_ZONE_CHEST) @@ -104,12 +104,11 @@ else user.visible_message(span_danger("[user] starts tenderly lifting [skewee] off of [src]..."), \ span_danger("You start tenderly lifting [skewee] off of [src]...")) - if(!do_after(user, 6 SECONDS, skewee)) + if(!do_after(user, 2 SECONDS, skewee))//make it really fast to help someone else to incentivise actually helping others skewee.visible_message(span_warning("[skewee] painfully slides back down [src].")) skewee.emote("moan") return skewee.visible_message(span_danger("[skewee] comes free of [src] with a squelching pop!"), \ span_boldannounce("You come free of [src]!")) - skewee.Paralyze(30) playsound(skewee, 'sound/misc/desceration-03.ogg', 50, TRUE) unbuckle_mob(skewee) From 189f68b77da6fd24d7fe531d60545dccdd468550 Mon Sep 17 00:00:00 2001 From: Molti Date: Mon, 17 Jul 2023 23:52:34 -0500 Subject: [PATCH 2/2] Update brass_skewer.dm --- .../clockcult/clock_structures/traps/brass_skewer.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm b/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm index d7c32a6af72f..95ebe9278099 100644 --- a/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm +++ b/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm @@ -56,7 +56,7 @@ squirrel.visible_message(span_boldwarning("A massive brass spike erupts from the ground, rending [squirrel]'s chassis but shattering into pieces!"), \ span_userdanger("A massive brass spike rips through your chassis and bursts into shrapnel in your casing!")) squirrel.adjustBruteLoss(50) - squirrel.Stun(2 SECONDS) + squirrel.Stun(4 SECONDS) addtimer(CALLBACK(src, PROC_REF(take_damage), max_integrity), 1) else squirrel.visible_message(span_boldwarning("A massive brass spike erupts from the ground, impaling [squirrel]!"), \ @@ -65,7 +65,7 @@ playsound(squirrel, 'sound/effects/splat.ogg', 50, TRUE) playsound(squirrel, 'sound/misc/desceration-03.ogg', 50, TRUE) squirrel.apply_damage(20, BRUTE, BODY_ZONE_CHEST) - squirrel.Stun(2 SECONDS) + squirrel.Stun(4 SECONDS) buckle_mob(squirrel, TRUE) else visible_message(span_danger("A massive brass spike erupts from the ground!")) @@ -93,7 +93,7 @@ user.visible_message(span_warning("[user] starts wriggling off of [src]!"), \ span_danger("You start agonizingly working your way off of [src]...")) wiggle_wiggle = TRUE - if(!do_after(user, 10 SECONDS, user)) + if(!do_after(user, 6 SECONDS, user)) user.visible_message(span_warning("[user] slides back down [src]!")) user.emote("scream") user.apply_damage(10, BRUTE, BODY_ZONE_CHEST)