mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
Adds more machine button sounds (#6802)
* Adds more machine button sounds * chang
This commit is contained in:
@@ -11,6 +11,8 @@
|
|||||||
idle_power_usage = 40
|
idle_power_usage = 40
|
||||||
interact_offline = 1
|
interact_offline = 1
|
||||||
circuit = /obj/item/weapon/circuitboard/sleeper_console
|
circuit = /obj/item/weapon/circuitboard/sleeper_console
|
||||||
|
clicksound = 'sound/machines/buttonbeep.ogg'
|
||||||
|
clickvol = 30
|
||||||
|
|
||||||
/obj/machinery/sleep_console/New()
|
/obj/machinery/sleep_console/New()
|
||||||
..()
|
..()
|
||||||
|
|||||||
@@ -45,6 +45,8 @@
|
|||||||
active_power_usage = 1000 //For heating/cooling rooms. 1000 joules equates to about 1 degree every 2 seconds for a single tile of air.
|
active_power_usage = 1000 //For heating/cooling rooms. 1000 joules equates to about 1 degree every 2 seconds for a single tile of air.
|
||||||
power_channel = ENVIRON
|
power_channel = ENVIRON
|
||||||
req_one_access = list(access_atmospherics, access_engine_equip)
|
req_one_access = list(access_atmospherics, access_engine_equip)
|
||||||
|
clicksound = "button"
|
||||||
|
clickvol = 30
|
||||||
var/alarm_id = null
|
var/alarm_id = null
|
||||||
var/breach_detection = 1 // Whether to use automatic breach detection or not
|
var/breach_detection = 1 // Whether to use automatic breach detection or not
|
||||||
var/frequency = 1439
|
var/frequency = 1439
|
||||||
|
|||||||
@@ -8,6 +8,9 @@
|
|||||||
use_power = 1
|
use_power = 1
|
||||||
idle_power_usage = 10
|
idle_power_usage = 10
|
||||||
active_power_usage = 2000
|
active_power_usage = 2000
|
||||||
|
clicksound = "keyboard"
|
||||||
|
clickvol = 30
|
||||||
|
|
||||||
circuit = /obj/item/weapon/circuitboard/autolathe
|
circuit = /obj/item/weapon/circuitboard/autolathe
|
||||||
var/datum/category_collection/autolathe/machine_recipes
|
var/datum/category_collection/autolathe/machine_recipes
|
||||||
var/list/stored_material = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0)
|
var/list/stored_material = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0)
|
||||||
|
|||||||
@@ -16,6 +16,8 @@
|
|||||||
active_power_usage = 200
|
active_power_usage = 200
|
||||||
buckle_lying = FALSE
|
buckle_lying = FALSE
|
||||||
buckle_dir = SOUTH
|
buckle_dir = SOUTH
|
||||||
|
clicksound = 'sound/machines/buttonbeep.ogg'
|
||||||
|
clickvol = 30
|
||||||
|
|
||||||
var/temperature_archived
|
var/temperature_archived
|
||||||
var/mob/living/carbon/occupant = null
|
var/mob/living/carbon/occupant = null
|
||||||
|
|||||||
@@ -21,6 +21,7 @@
|
|||||||
idle_power_usage = 10
|
idle_power_usage = 10
|
||||||
active_power_usage = 100
|
active_power_usage = 100
|
||||||
circuit = /obj/item/weapon/circuitboard/jukebox
|
circuit = /obj/item/weapon/circuitboard/jukebox
|
||||||
|
clicksound = 'sound/machines/buttonbeep.ogg'
|
||||||
|
|
||||||
// Vars for hacking
|
// Vars for hacking
|
||||||
var/datum/wires/jukebox/wires = null
|
var/datum/wires/jukebox/wires = null
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
var/on = 0
|
var/on = 0
|
||||||
var/set_temperature = T0C + 20 //K
|
var/set_temperature = T0C + 20 //K
|
||||||
var/heating_power = 40000
|
var/heating_power = 40000
|
||||||
|
clicksound = "switch"
|
||||||
|
|
||||||
/obj/machinery/space_heater/New()
|
/obj/machinery/space_heater/New()
|
||||||
..()
|
..()
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
icon_state = "generic"
|
icon_state = "generic"
|
||||||
anchored = 1
|
anchored = 1
|
||||||
density = 1
|
density = 1
|
||||||
|
clicksound = "button"
|
||||||
|
|
||||||
var/icon_vend //Icon_state when vending
|
var/icon_vend //Icon_state when vending
|
||||||
var/icon_deny //Icon_state when denying access
|
var/icon_deny //Icon_state when denying access
|
||||||
@@ -253,6 +254,7 @@
|
|||||||
*/
|
*/
|
||||||
/obj/machinery/vending/proc/pay_with_ewallet(var/obj/item/weapon/spacecash/ewallet/wallet)
|
/obj/machinery/vending/proc/pay_with_ewallet(var/obj/item/weapon/spacecash/ewallet/wallet)
|
||||||
visible_message("<span class='info'>\The [usr] swipes \the [wallet] through \the [src].</span>")
|
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)
|
if(currently_vending.price > wallet.worth)
|
||||||
status_message = "Insufficient funds on chargecard."
|
status_message = "Insufficient funds on chargecard."
|
||||||
status_error = 1
|
status_error = 1
|
||||||
@@ -273,6 +275,7 @@
|
|||||||
visible_message("<span class='info'>\The [usr] swipes \the [I] through \the [src].</span>")
|
visible_message("<span class='info'>\The [usr] swipes \the [I] through \the [src].</span>")
|
||||||
else
|
else
|
||||||
visible_message("<span class='info'>\The [usr] swipes \the [ID_container] through \the [src].</span>")
|
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/customer_account = get_account(I.associated_account_number)
|
var/datum/money_account/customer_account = get_account(I.associated_account_number)
|
||||||
if(!customer_account)
|
if(!customer_account)
|
||||||
status_message = "Error: Unable to access account. Please contact technical support if problem persists."
|
status_message = "Error: Unable to access account. Please contact technical support if problem persists."
|
||||||
|
|||||||
@@ -5,6 +5,9 @@
|
|||||||
icon_state = "wm_10"
|
icon_state = "wm_10"
|
||||||
density = 1
|
density = 1
|
||||||
anchored = 1.0
|
anchored = 1.0
|
||||||
|
clicksound = "button"
|
||||||
|
clickvol = 40
|
||||||
|
|
||||||
circuit = /obj/item/weapon/circuitboard/washing
|
circuit = /obj/item/weapon/circuitboard/washing
|
||||||
var/state = 1
|
var/state = 1
|
||||||
//1 = empty, open door
|
//1 = empty, open door
|
||||||
|
|||||||
@@ -128,6 +128,11 @@ var/global/list/default_medbay_channels = list(
|
|||||||
ui.set_initial_data(data)
|
ui.set_initial_data(data)
|
||||||
ui.open()
|
ui.open()
|
||||||
|
|
||||||
|
/obj/item/device/radio/CouldUseTopic(var/mob/user)
|
||||||
|
..()
|
||||||
|
if(iscarbon(user))
|
||||||
|
playsound(src, "button", 10)
|
||||||
|
|
||||||
/obj/item/device/radio/proc/list_channels(var/mob/user)
|
/obj/item/device/radio/proc/list_channels(var/mob/user)
|
||||||
return list_internal_channels(user)
|
return list_internal_channels(user)
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,8 @@
|
|||||||
use_power = 1
|
use_power = 1
|
||||||
idle_power_usage = 5
|
idle_power_usage = 5
|
||||||
active_power_usage = 100
|
active_power_usage = 100
|
||||||
|
clicksound = "button"
|
||||||
|
clickvol = "30"
|
||||||
flags = OPENCONTAINER | NOREACT
|
flags = OPENCONTAINER | NOREACT
|
||||||
circuit = /obj/item/weapon/circuitboard/microwave
|
circuit = /obj/item/weapon/circuitboard/microwave
|
||||||
var/operating = 0 // Is it on?
|
var/operating = 0 // Is it on?
|
||||||
|
|||||||
@@ -68,6 +68,7 @@
|
|||||||
layer = ABOVE_TURF_LAYER
|
layer = ABOVE_TURF_LAYER
|
||||||
anchored = 1
|
anchored = 1
|
||||||
use_power = 0
|
use_power = 0
|
||||||
|
clicksound = "switch"
|
||||||
req_access = list(access_engine_equip)
|
req_access = list(access_engine_equip)
|
||||||
var/area/area
|
var/area/area
|
||||||
var/areastring = null
|
var/areastring = null
|
||||||
@@ -535,7 +536,7 @@
|
|||||||
|
|
||||||
else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) // trying to unlock the interface with an ID card
|
else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) // trying to unlock the interface with an ID card
|
||||||
togglelock()
|
togglelock()
|
||||||
|
|
||||||
else if (istype(W, /obj/item/stack/cable_coil) && !terminal && opened && has_electronics!=2)
|
else if (istype(W, /obj/item/stack/cable_coil) && !terminal && opened && has_electronics!=2)
|
||||||
var/turf/T = loc
|
var/turf/T = loc
|
||||||
if(istype(T) && !T.is_plating())
|
if(istype(T) && !T.is_plating())
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
anchored = 1
|
anchored = 1
|
||||||
use_power = 0
|
use_power = 0
|
||||||
circuit = /obj/item/weapon/circuitboard/smes
|
circuit = /obj/item/weapon/circuitboard/smes
|
||||||
|
clicksound = "switch"
|
||||||
|
|
||||||
var/capacity = 5e6 // maximum charge
|
var/capacity = 5e6 // maximum charge
|
||||||
var/charge = 1e6 // actual charge
|
var/charge = 1e6 // actual charge
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
desc = "Automagically fabricates chemicals from electricity."
|
desc = "Automagically fabricates chemicals from electricity."
|
||||||
icon = 'icons/obj/chemical.dmi'
|
icon = 'icons/obj/chemical.dmi'
|
||||||
icon_state = "dispenser"
|
icon_state = "dispenser"
|
||||||
|
clicksound = "switch"
|
||||||
|
|
||||||
var/list/spawn_cartridges = null // Set to a list of types to spawn one of each on New()
|
var/list/spawn_cartridges = null // Set to a list of types to spawn one of each on New()
|
||||||
|
|
||||||
|
|||||||
36
html/changelogs/Cerebulon - machinesounds.yml
Normal file
36
html/changelogs/Cerebulon - machinesounds.yml
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
################################
|
||||||
|
# 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
|
||||||
|
#################################
|
||||||
|
|
||||||
|
# Your name.
|
||||||
|
author: Cerebulon
|
||||||
|
|
||||||
|
# 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: "Added button sounds to various machines."
|
||||||
BIN
sound/machines/buttonbeep.ogg
Normal file
BIN
sound/machines/buttonbeep.ogg
Normal file
Binary file not shown.
BIN
sound/machines/id_swipe.ogg
Normal file
BIN
sound/machines/id_swipe.ogg
Normal file
Binary file not shown.
Reference in New Issue
Block a user