From 274ccf5099f0eda74a267f93842dc4b72b0c72fa Mon Sep 17 00:00:00 2001 From: Hazelrat Date: Sun, 30 Mar 2025 17:58:32 +0100 Subject: [PATCH 1/2] Initial --- code/game/objects/items/weapons/traps.dm | 9 ++++ html/changelogs/hazelmouse-punjisounds.yml | 59 ++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 html/changelogs/hazelmouse-punjisounds.yml diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm index edb64677ad92..c3c7525e5eee 100644 --- a/code/game/objects/items/weapons/traps.dm +++ b/code/game/objects/items/weapons/traps.dm @@ -65,6 +65,7 @@ user.visible_message("[SPAN_BOLD("[user]")] starts deploying \the [src]...", SPAN_NOTICE("You begin deploying \the [src]!"), SPAN_WARNING("You hear the slow creaking of a spring.")) if(do_after(user, 5 SECONDS)) + playsound(src, 'sound/items/crank.ogg', 50, TRUE) user.visible_message("[SPAN_BOLD("[user]")] deploys \the [src].", SPAN_WARNING("You deploy \the [src]!"), SPAN_WARNING("You hear a latch click loudly.")) deployed = TRUE update_icon() @@ -198,6 +199,7 @@ /obj/item/trap/tripwire/deploy(mob/user) user.visible_message(SPAN_WARNING("\The [user] starts to deploy \the [src]."), SPAN_WARNING("You begin deploying \the [src]!")) if(do_after(user, 5 SECONDS)) + playsound(src, 'sound/items/crank.ogg', 50, TRUE) user.visible_message(SPAN_WARNING("\The [user] deploys \the [src]."), SPAN_WARNING("You deploy \the [src]!")) deployed = TRUE update_icon() @@ -256,6 +258,8 @@ //Try to apply the damage var/success = L.apply_damage(50, DAMAGE_BRUTE, target_zone, used_weapon = src, armor_pen = activated_armor_penetration) + //Apply weakness, so the victim doesn't walk immediately back out of the trap + L.Weaken(10) //If successfully applied, give the message if(success) @@ -271,6 +275,11 @@ var/mob/living/carbon/human/human = L var/obj/item/organ/organ = human.get_organ(target_zone) + if(isipc(L) || isrobot(L)) + playsound(src, 'sound/weapons/smash.ogg', 100, 1) + else + playsound(src, 'sound/weapons/heavysmash.ogg', 100, 1) + human.visible_message(SPAN_DANGER("\The [human] steps on \the [src]!"), SPAN_WARNING(FONT_LARGE(SPAN_DANGER("You step on \the [src], feel your body fall, and something sharp penetrate your [organ.name]!"))), SPAN_WARNING("You feel your body fall, and something sharp penetrate your [organ.name]!")) diff --git a/html/changelogs/hazelmouse-punjisounds.yml b/html/changelogs/hazelmouse-punjisounds.yml new file mode 100644 index 000000000000..fa9874cba255 --- /dev/null +++ b/html/changelogs/hazelmouse-punjisounds.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: hazelmouse + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - qol: "All traps now produce a noise when set up, and punji traps produce a noise when a mob falls into them." + - balance: "Punji traps now cause victims to collapse after falling into them." From cd0644808cf92cd486aee067c57744fdb75ecfdf Mon Sep 17 00:00:00 2001 From: Hazelrat Date: Sun, 30 Mar 2025 19:55:58 +0100 Subject: [PATCH 2/2] Small improvement to syntax --- code/game/objects/items/weapons/traps.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm index c3c7525e5eee..03d08d8986fc 100644 --- a/code/game/objects/items/weapons/traps.dm +++ b/code/game/objects/items/weapons/traps.dm @@ -276,9 +276,9 @@ var/obj/item/organ/organ = human.get_organ(target_zone) if(isipc(L) || isrobot(L)) - playsound(src, 'sound/weapons/smash.ogg', 100, 1) + playsound(src, 'sound/weapons/smash.ogg', 100, TRUE) else - playsound(src, 'sound/weapons/heavysmash.ogg', 100, 1) + playsound(src, 'sound/weapons/heavysmash.ogg', 100, TRUE) human.visible_message(SPAN_DANGER("\The [human] steps on \the [src]!"), SPAN_WARNING(FONT_LARGE(SPAN_DANGER("You step on \the [src], feel your body fall, and something sharp penetrate your [organ.name]!"))),