diff --git a/code/__defines/items_clothing.dm b/code/__defines/items_clothing.dm index d2c84b813e7..8e58e572613 100644 --- a/code/__defines/items_clothing.dm +++ b/code/__defines/items_clothing.dm @@ -37,7 +37,6 @@ #define NOSLIP 0x8 // Prevents from slipping on wet floors, in space, etc. #define BLOCK_GAS_SMOKE_EFFECT 0x10 // Blocks the effect that chemical clouds would have on a mob -- glasses, mask and helmets ONLY! (NOTE: flag shared with ONESIZEFITSALL) #define FLEXIBLEMATERIAL 0x20 // At the moment, masks with this flag will not prevent eating even if they are covering your face. -#define SILENT 0x40 // sneaky shoes // Flags for pass_flags. #define PASSTABLE 0x1 diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index ff06afc0da3..7ff9865ae6f 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, "clownstep", 20, 1) // this will get annoying very fast. + playsound(src, "clownstep", 50, 1) // this will get annoying very fast. else footstep++ else - playsound(src, "clownstep", 50, 1) + playsound(src, "clownstep", 20, 1) /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 8f3f0981fd3..f44635430d1 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -224,7 +224,6 @@ 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/machines/rig/rigerror.ogg', 20, FALSE) failed_to_seal = 1 var/is_in_cycler = istype(initiator.loc, /obj/machinery/suit_cycler) @@ -235,7 +234,6 @@ 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/machines/rig/rigerror.ogg', 20, FALSE) failed_to_seal = 1 if(!wearer) @@ -286,7 +284,6 @@ else LAZYINITLIST(piece.armor) piece.armor["bio"] = LAZYACCESS(src.armor, "bio") || 0 - playsound(src, "[!seal_target ? 'sound/machines/BoltsDown.ogg' : 'sound/machines/BoltsUp.ogg']", 10, FALSE) else failed_to_seal = 1 @@ -309,11 +306,8 @@ // 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/machines/rig/rigstarted.ogg', 10, FALSE) - if(has_sealed_state) + if (has_sealed_state) icon_state = canremove ? initial(icon_state) : "[initial(icon_state)]_sealed" - if(!canremove) - playsound(src, 'sound/machines/rig/rigonline.ogg', 10, FALSE) if(dnaLock && !offline) if(dnaLock != wearer.dna) @@ -363,7 +357,6 @@ to_chat(wearer, "Your suit beeps stridently, and suddenly goes dead.") else to_chat(wearer, "Your suit beeps stridently, and suddenly you're wearing a leaden mass of metal and plastic composites instead of a powered suit.") - playsound(src, 'sound/machines/rig/rigdown.ogg', 60, FALSE) if(offline_vision_restriction == 1) to_chat(wearer, "The suit optics flicker and die, leaving you with restricted vision.") else if(offline_vision_restriction == 2) @@ -429,7 +422,6 @@ if(fail_msg) to_chat(user, "[fail_msg]") - playsound(src, 'sound/machines/rig/rigerror.ogg', 20, FALSE) return 0 // This is largely for cancelling stealth and whatever. @@ -675,7 +667,6 @@ 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/BoltsUp.ogg', 10, FALSE) use_obj.canremove = 1 holder.drop_from_inventory(use_obj,get_turf(src)) //TODO: TEST THIS CODE! use_obj.dropped() @@ -693,7 +684,6 @@ return else to_chat(wearer, "Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly.") - playsound(src, 'sound/machines/BoltsDown.ogg', 10, FALSE) if(piece == "helmet" && helmet) helmet.update_light(wearer) diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm index ba8273783d4..d6957774268 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm @@ -39,7 +39,6 @@ /obj/item/clothing/shoes/magboots/rig name = "boots" - item_flags = SILENT body_parts_covered = FEET cold_protection = FEET heat_protection = FEET @@ -53,17 +52,6 @@ BODYTYPE_IPC = 'icons/mob/species/machine/shoes.dmi', BODYTYPE_VOX = 'icons/mob/species/vox/shoes.dmi' ) - var/footstep = 1 //used for footsteps. - -/obj/item/clothing/shoes/magboots/rig/handle_movement(var/turf/walking, var/running) - if(!running) - if(footstep >= 2) - footstep = 0 - playsound(src, 'sound/machines/rig/rigstep.ogg', 20, TRUE) - else - footstep++ - else - playsound(src, 'sound/machines/rig/rigstep.ogg', 50, TRUE) /obj/item/clothing/suit/space/rig name = "chestpiece" diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 343da5b4c2e..3572f1ae51f 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -156,8 +156,6 @@ if (is_noisy && !stat && !lying) if ((x == last_x && y == last_y) || !footsound) return - if(shoes && (shoes.item_flags & SILENT)) - return // quiet shoes last_x = x last_y = y if (m_intent == "run") diff --git a/sound/machines/rig/rigdown.ogg b/sound/machines/rig/rigdown.ogg deleted file mode 100644 index 21207573322..00000000000 Binary files a/sound/machines/rig/rigdown.ogg and /dev/null differ diff --git a/sound/machines/rig/rigerror.ogg b/sound/machines/rig/rigerror.ogg deleted file mode 100644 index 909d6a19e2f..00000000000 Binary files a/sound/machines/rig/rigerror.ogg and /dev/null differ diff --git a/sound/machines/rig/rigonline.ogg b/sound/machines/rig/rigonline.ogg deleted file mode 100644 index dae104f9656..00000000000 Binary files a/sound/machines/rig/rigonline.ogg and /dev/null differ diff --git a/sound/machines/rig/rigstarted.ogg b/sound/machines/rig/rigstarted.ogg deleted file mode 100644 index d7bb9716f42..00000000000 Binary files a/sound/machines/rig/rigstarted.ogg and /dev/null differ diff --git a/sound/machines/rig/rigstep.ogg b/sound/machines/rig/rigstep.ogg deleted file mode 100644 index 02d3eff5125..00000000000 Binary files a/sound/machines/rig/rigstep.ogg and /dev/null differ