Revert "Adds new sounds for RIGs. (#9617)" (#9759)

This commit is contained in:
Erki
2020-08-26 15:26:57 +03:00
committed by GitHub
parent 72391d862f
commit 1d707cc0fa
10 changed files with 4 additions and 29 deletions
+3 -3
View File
@@ -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"
+1 -11
View File
@@ -224,7 +224,6 @@
if(!seal_target && !suit_is_deployed())
wearer.visible_message("<span class='danger'>[wearer]'s suit flashes an error light.</span>","<span class='danger'>Your suit flashes an error light. It can't function properly without being fully deployed.</span>")
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("<font color='blue'>[wearer]'s suit emits a quiet hum as it begins to adjust its seals.</font>","<font color='blue'>With a quiet hum, the suit begins running checks and adjusting components.</font>")
if(seal_delay && !do_after(wearer, seal_delay, act_target = src))
if(wearer) to_chat(wearer, "<span class='warning'>You must remain still while the suit is adjusting the components.</span>")
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, "<font color='blue'><b>Your entire suit [canremove ? "loosens as the components relax" : "tightens around you as the components lock into place"].</b></font>")
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, "<span class='danger'>Your suit beeps stridently, and suddenly goes dead.</span>")
else
to_chat(wearer, "<span class='danger'>Your suit beeps stridently, and suddenly you're wearing a leaden mass of metal and plastic composites instead of a powered suit.</span>")
playsound(src, 'sound/machines/rig/rigdown.ogg', 60, FALSE)
if(offline_vision_restriction == 1)
to_chat(wearer, "<span class='danger'>The suit optics flicker and die, leaving you with restricted vision.</span>")
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, "<font color='blue'><b>Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly.</b></font>")
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, "<span class='notice'>Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly.</span>")
playsound(src, 'sound/machines/BoltsDown.ogg', 10, FALSE)
if(piece == "helmet" && helmet)
helmet.update_light(wearer)
@@ -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"
@@ -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")