Adds button and switch sounds when using machinery (#8195)

code/game/machinery/Sleeper.dm

@@ -5,6 +5,9 @@
 	icon_state = "sleeper"
 	density = 1
 	anchored = 1
+	clicksound = 'sound/machines/buttonbeep.ogg'
+	clickvol = 30
+	
 	var/mob/living/carbon/human/occupant = null
 	var/list/available_chemicals = list("norepinephrine" = "Norepinephrine", "stoxin" = "Soporific", "paracetamol" = "Paracetamol", "dylovene" = "Dylovene", "dexalin" = "Dexalin")
 	var/obj/item/reagent_containers/glass/beaker = null

code/game/machinery/alarm.dm

@@ -42,6 +42,9 @@
 	active_power_usage = 1500 //For heating/cooling rooms. 1000 joules equates to about 1 degree every 2 seconds for a single tile of air.
 	power_channel = ENVIRON
 	req_one_access = list(access_atmospherics, access_engine_equip)
+	clicksound = "button"
+	clickvol = 30
+	
 	var/alarm_id = null
 	var/breach_detection = 1 // Whether to use automatic breach detection or not
 	var/frequency = 1439

code/game/machinery/autolathe.dm

@@ -7,6 +7,8 @@
 	use_power = 1
 	idle_power_usage = 10
 	active_power_usage = 2000
+	clicksound = "keyboard"
+	clickvol = 30
 
 	var/list/machine_recipes
 	var/list/stored_material =  list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0)

code/game/machinery/computer/computer.dm

@@ -7,6 +7,8 @@
 	use_power = 1
 	idle_power_usage = 300
 	active_power_usage = 300
+	clicksound = "keyboard"
+	
 	var/circuit = null //The path to the circuit board type. If circuit==null, the computer can't be disassembled.
 	var/processing = 0
 
@@ -15,7 +17,6 @@
 	var/light_power_on = 1
 	var/overlay_layer
 	var/is_holographic = TRUE
-	clicksound = "keyboard"
 
 /obj/machinery/computer/Initialize()
 	. = ..()

code/game/machinery/cryo.dm

@@ -13,6 +13,8 @@
 	use_power = 1
 	idle_power_usage = 20
 	active_power_usage = 200
+	clicksound = 'sound/machines/buttonbeep.ogg'
+	clickvol = 30
 
 	var/temperature_archived
 	var/mob/living/carbon/occupant = null

code/game/machinery/jukebox.dm

@@ -19,6 +19,7 @@ datum/track/New(var/title_name, var/audio)
 	use_power = 1
 	idle_power_usage = 10
 	active_power_usage = 100
+	clicksound = 'sound/machines/buttonbeep.ogg'
 
 	var/playing = 0
 

code/game/machinery/kitchen/microwave.dm

@@ -10,6 +10,9 @@
 	idle_power_usage = 5
 	active_power_usage = 2000
 	flags = OPENCONTAINER | NOREACT
+	clicksound = "button"
+	clickvol = "30"
+
 	var/operating = FALSE // Is it on?
 	var/dirty = 0 // = {0..100} Does it need cleaning?
 	var/broken = 0 // ={0,1,2} How broken is it???

code/game/machinery/machinery.dm

@@ -231,7 +231,7 @@ Class Procs:
 
 /obj/machinery/CouldUseTopic(var/mob/user)
 	..()
-	if(istype (user, /mob/living/carbon))
+	if(clicksound && iscarbon(user))
 		playsound(src, clicksound, clickvol)
 	user.set_machine(src)
 

code/game/machinery/spaceheater.dm

@@ -11,7 +11,7 @@
 	var/heating_power = 42000
 	emagged = FALSE
 	has_special_power_checks = TRUE
-
+	clicksound = "switch"
 
 /obj/machinery/space_heater/Initialize()
 	. = ..()

code/game/machinery/vending.dm

@@ -37,6 +37,7 @@
 	layer = 2.9
 	anchored = 1
 	density = 1
+	clicksound = "button"
 
 	var/icon_vend //Icon_state when vending
 	var/icon_deny //Icon_state when denying access
@@ -123,7 +124,6 @@
 	src.build_inventory()
 	power_change()
 
-
 /**
  *  Build src.produdct_records from the products lists
  *
@@ -207,12 +207,10 @@
 			var/obj/item/spacecash/ewallet/C = W
 			paid = pay_with_ewallet(C)
 			handled = 1
-			playsound(user.loc, 'sound/machines/id_swipe.ogg', 100, 1)
 		else if (istype(W, /obj/item/spacecash))
 			var/obj/item/spacecash/C = W
 			paid = pay_with_cash(C, user)
 			handled = 1
-			playsound(user.loc, 'sound/machines/id_swipe.ogg', 100, 1)
 
 		if(paid)
 			src.vend(currently_vending, usr)
@@ -347,6 +345,7 @@
  */
 /obj/machinery/vending/proc/pay_with_ewallet(var/obj/item/spacecash/ewallet/wallet)
 	visible_message("<span class='info'>\The [usr] swipes \the [wallet] through \the [src].</span>")
+	playsound(src.loc, 'sound/machines/id_swipe.ogg', 50, 1)
 	if(currently_vending.price > wallet.worth)
 		src.status_message = "Insufficient funds on chargecard."
 		src.status_error = 1
@@ -367,6 +366,7 @@
 		visible_message("<span class='info'>\The [usr] swipes \the [I] through \the [src].</span>")
 	else
 		visible_message("<span class='info'>\The [usr] swipes \the [ID_container] through \the [src].</span>")
+	playsound(src.loc, 'sound/machines/id_swipe.ogg', 50, 1)
 	var/datum/money_account/vendor_account = SSeconomy.get_department_account("Vendor")
 	var/datum/money_account/customer_account = SSeconomy.get_account(I.associated_account_number)
 	if (!customer_account)
@@ -509,7 +509,7 @@
 	var/datum/money_account/vendor_account = SSeconomy.get_department_account("Vendor")
 	if(stat & (BROKEN|NOPOWER))
 		return
-	if(usr.stat || usr.restrained())
+	if(..())
 		return
 
 	if(href_list["remove_coin"] && !istype(usr,/mob/living/silicon))

code/game/machinery/washing_machine.dm

@@ -4,6 +4,9 @@
 	icon_state = "wm_10"
 	density = 1
 	anchored = 1.0
+	clicksound = "button"
+	clickvol = 40
+
 	var/state = 1
 	//1 = empty, open door
 	//2 = empty, closed door

code/game/objects/items/devices/radio/radio.dm

@@ -756,3 +756,8 @@ var/global/list/default_medbay_channels = list(
 /obj/item/device/radio/phone/medbay/Initialize()
 	. = ..()
 	internal_channels = default_medbay_channels.Copy()
+
+/obj/item/device/radio/CouldUseTopic(var/mob/user)
+	..()
+	if(iscarbon(user))
+		playsound(src, "button", 10)

code/game/sound.dm

@@ -134,6 +134,12 @@ var/list/gravelfootsteps = list(
 	'sound/effects/footsteps/gravel3.wav',
 	'sound/effects/footsteps/gravel4.wav'
 )
+var/list/button_sound = list(
+	'sound/machines/button1.ogg',
+	'sound/machines/button2.ogg',
+	'sound/machines/button3.ogg',
+	'sound/machines/button4.ogg'
+)
 var/list/computerbeeps = list(
 	'sound/machines/compbeep1.ogg',
 	'sound/machines/compbeep2.ogg',
@@ -376,6 +382,7 @@ var/list/footstepfx = list("defaultstep","concretestep","grassstep","dirtstep","
 			if ("sandstep") soundin = pick(sandfootsteps)
 			if ("gravelstep") soundin = pick(gravelfootsteps)
 			if ("computerbeep") soundin = pick(computerbeeps)
+			if ("button") soundin = pick(button_sound)
 			if ("switch") soundin = pick(switchsounds)
 			if ("keyboard") soundin = pick(keyboardsounds)
 			if ("pickaxe") soundin = pick(pickaxesounds)

code/modules/power/apc.dm

@@ -78,6 +78,7 @@
 	use_power = 0
 	req_access = list(access_engine_equip)
 	gfi_layer_rotation = GFI_ROTATION_DEFDIR
+	clicksound = "switch"
 	var/area/area
 	var/areastring = null
 	var/obj/item/cell/cell

code/modules/power/smes.dm

@@ -25,6 +25,7 @@
 	density = 1
 	anchored = 1
 	use_power = 0
+	clicksound = "switch"
 
 	var/capacity = 5e6 // maximum charge
 	var/charge = 1e6 // actual charge

code/modules/reagents/Chemistry-Machinery.dm

@@ -14,6 +14,8 @@
 	use_power = 1
 	idle_power_usage = 20
 	layer = 2.9
+	clicksound = "button"
+	
 	var/beaker = null
 	var/obj/item/storage/pill_bottle/loaded_pill_bottle = null
 	var/mode = TRUE

code/modules/reagents/dispenser/dispenser2.dm

@@ -2,6 +2,7 @@
 	name = "chemical dispenser"
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "dispenser"
+	clicksound = "button"
 
 	var/list/spawn_cartridges = null // Set to a list of types to spawn one of each on New()
 

html/changelogs/wezzy_button_noises.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: 
+  - soundadd: "Adds more clicking button sounds to machines. Try it out on your nearest vending machine! Discover ALL the noises!"