Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Makes the brass skewer trap slightly less annoying #19721

Merged
Bibby0110 merged 2 commits into from
Jul 19, 2023
Merged

Makes the brass skewer trap slightly less annoying #19721

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc34d03
Update brass_skewer.dm
Moltijoe Jul 18, 2023
189f68b
Update brass_skewer.dm
Moltijoe Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(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]!"), \
Expand All @@ -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(4 SECONDS)
buckle_mob(squirrel, TRUE)
else
visible_message(span_danger("A massive brass spike erupts from the ground!"))
Expand Down Expand Up @@ -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, 6 SECONDS, user))
user.visible_message(span_warning("[user] slides back down [src]!"))
user.emote("scream")
user.apply_damage(10, BRUTE, BODY_ZONE_CHEST)
Expand All @@ -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)