diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 0bdda99b6dc..c98083da272 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -83,14 +83,14 @@ obj/item/clothing/shoes/sandal/clogs species_restricted = null /obj/item/clothing/shoes/clown_shoes/handle_movement(var/turf/walking, var/running) - if(running) + if(!running) if(footstep >= 2) footstep = 0 - playsound(src, /decl/sound_category/clown_sound, 50, 1) // this will get annoying very fast. + playsound(src, /decl/sound_category/clown_sound, 20, 1) else footstep++ else - playsound(src, /decl/sound_category/clown_sound, 20, 1) + playsound(src, /decl/sound_category/clown_sound, 50, 1) // Running is louder. /obj/item/clothing/shoes/cult name = "ragged boots" diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index f44635430d1..b3a35e0dbcf 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -224,6 +224,7 @@ if(!seal_target && !suit_is_deployed()) wearer.visible_message("[wearer]'s suit flashes an error light.","Your suit flashes an error light. It can't function properly without being fully deployed.") + playsound(src, 'sound/items/rfd_empty.ogg', 20, FALSE) failed_to_seal = 1 var/is_in_cycler = istype(initiator.loc, /obj/machinery/suit_cycler) @@ -234,6 +235,7 @@ wearer.visible_message("[wearer]'s suit emits a quiet hum as it begins to adjust its seals.","With a quiet hum, the suit begins running checks and adjusting components.") if(seal_delay && !do_after(wearer, seal_delay, act_target = src)) if(wearer) to_chat(wearer, "You must remain still while the suit is adjusting the components.") + playsound(src, 'sound/items/rfd_empty.ogg', 20, FALSE) failed_to_seal = 1 if(!wearer) @@ -251,6 +253,7 @@ if(!istype(wearer) || !istype(piece) || !istype(compare_piece) || !msg_type) if(wearer) to_chat(wearer, "You must remain still while the suit is adjusting the components.") + playsound(src, 'sound/items/rfd_empty.ogg', 20, FALSE) failed_to_seal = 1 break @@ -284,6 +287,7 @@ else LAZYINITLIST(piece.armor) piece.armor["bio"] = LAZYACCESS(src.armor, "bio") || 0 + playsound(src, "[!seal_target ? 'sound/machines/rig/rig_deploy.ogg' : 'sound/machines/rig/rig_retract.ogg']", 20, FALSE) else failed_to_seal = 1 @@ -306,9 +310,9 @@ // Success! canremove = seal_target to_chat(wearer, "Your entire suit [canremove ? "loosens as the components relax" : "tightens around you as the components lock into place"].") + playsound(src, 'sound/items/rped.ogg', 20, FALSE) if (has_sealed_state) icon_state = canremove ? initial(icon_state) : "[initial(icon_state)]_sealed" - if(dnaLock && !offline) if(dnaLock != wearer.dna) visible_message("\icon[src.icon] [src] announces, \"DNA mismatch. Unauthorized access detected.\"") @@ -352,6 +356,7 @@ electrified = 0 if(!offline) if(istype(wearer)) + playsound(src, 'sound/machines/rig/rig_shutdown.ogg', 20, FALSE) if(!canremove) if (offline_slowdown < 3) to_chat(wearer, "Your suit beeps stridently, and suddenly goes dead.") @@ -422,6 +427,7 @@ if(fail_msg) to_chat(user, "[fail_msg]") + playsound(src, 'sound/items/rfd_empty.ogg', 20, FALSE) return 0 // This is largely for cancelling stealth and whatever. @@ -667,6 +673,7 @@ if(istype(holder)) if(use_obj && check_slot == use_obj) to_chat(wearer, "Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly.") + playsound(src, 'sound/machines/rig/rig_retract.ogg', 20, FALSE) use_obj.canremove = 1 holder.drop_from_inventory(use_obj,get_turf(src)) //TODO: TEST THIS CODE! use_obj.dropped() @@ -681,9 +688,11 @@ use_obj.forceMove(src) if(check_slot) to_chat(initiator, "You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way.") + playsound(src, 'sound/items/rfd_empty.ogg', 20, FALSE) return else to_chat(wearer, "Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly.") + playsound(src, 'sound/machines/rig/rig_deploy.ogg', 20, FALSE) if(piece == "helmet" && helmet) helmet.update_light(wearer) diff --git a/html/changelogs/wezzy_rigsoundagain.yml b/html/changelogs/wezzy_rigsoundagain.yml new file mode 100644 index 00000000000..c2794ce8bee --- /dev/null +++ b/html/changelogs/wezzy_rigsoundagain.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Readds sounds for sealing and unsealing Rig modules." \ No newline at end of file diff --git a/sound/machines/rig/rig_deploy.ogg b/sound/machines/rig/rig_deploy.ogg new file mode 100644 index 00000000000..fa4d55653aa Binary files /dev/null and b/sound/machines/rig/rig_deploy.ogg differ diff --git a/sound/machines/rig/rig_retract.ogg b/sound/machines/rig/rig_retract.ogg new file mode 100644 index 00000000000..539993e0f68 Binary files /dev/null and b/sound/machines/rig/rig_retract.ogg differ diff --git a/sound/machines/rig/rig_shutdown.ogg b/sound/machines/rig/rig_shutdown.ogg new file mode 100644 index 00000000000..8e9065bc378 Binary files /dev/null and b/sound/machines/rig/rig_shutdown.ogg differ