From a826af32d168d4da8448df0aba354ab51c8c31a0 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Mon, 17 Aug 2020 15:24:07 -0700 Subject: [PATCH 1/2] Merge pull request #7477 from listerla/servosound Replaces bolt sounds for rigs with servo sounds --- code/modules/clothing/spacesuits/rig/rig.dm | 6 +++--- sound/machines/rig/rigservo.ogg | Bin 0 -> 8542 bytes 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 sound/machines/rig/rigservo.ogg diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index 140bf6ecc9..cd65478a05 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -342,7 +342,7 @@ piece.armor["bio"] = 100 else piece.armor["bio"] = src.armor["bio"] - playsound(src, "[!seal_target ? 'sound/machines/boltsdown.ogg' : 'sound/machines/boltsup.ogg']", 10, FALSE) + playsound(src,'sound/machines/rig/rigservo.ogg', 10, FALSE) else failed_to_seal = 1 @@ -707,7 +707,7 @@ if(istype(holder)) if(use_obj && check_slot == use_obj) to_chat(H, "Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly.") - playsound(src, 'sound/machines/boltsup.ogg', 10, FALSE) + playsound(src, 'sound/machines/rig/rigservo.ogg', 10, FALSE) use_obj.canremove = 1 holder.drop_from_inventory(use_obj) use_obj.forceMove(get_turf(src)) @@ -726,7 +726,7 @@ return else to_chat(H, "Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly.") - playsound(src, 'sound/machines/boltsdown.ogg', 10, FALSE) + playsound(src, 'sound/machines/rig/rigservo.ogg', 10, FALSE) if(piece == "helmet" && helmet) helmet.update_light(H) diff --git a/sound/machines/rig/rigservo.ogg b/sound/machines/rig/rigservo.ogg new file mode 100644 index 0000000000000000000000000000000000000000..3193acaff44470aff9fbbbd757ef17a5b1676bf4 GIT binary patch literal 8542 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 literal 0 HcmV?d00001