mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-08-24 13:46:53 +01:00
Sounds for fabricators, mining machines, levers
This commit is contained in:
@@ -144,7 +144,7 @@
|
||||
user.visible_message("[user] turns [src] off.", "You turn off [src].")
|
||||
cooking = FALSE // Stop cooking here, too, just in case.
|
||||
|
||||
playsound(src, 'sound/machines/click.ogg', 40, 1)
|
||||
playsound(src, "button", 40, 1)
|
||||
update_icon()
|
||||
|
||||
/obj/machinery/appliance/AICtrlClick(mob/user)
|
||||
|
||||
@@ -25,12 +25,12 @@ fundamental differences
|
||||
cooking_objs += new /datum/cooking_item(new /obj/item/reagent_containers/cooking_container(src))
|
||||
cooking = FALSE
|
||||
selected_option = pick(output_options)
|
||||
|
||||
|
||||
mixer_loop = new(list(src), FALSE)
|
||||
|
||||
|
||||
/obj/machinery/appliance/mixer/Destroy()
|
||||
. = ..()
|
||||
|
||||
|
||||
QDEL_NULL(mixer_loop)
|
||||
|
||||
//Mixers cannot-not do combining mode. So the default option is removed from this. A combine target must be chosen
|
||||
@@ -119,7 +119,7 @@ fundamental differences
|
||||
use_power = 0
|
||||
if(usr)
|
||||
usr.visible_message("[usr] turns the [src] off", "You turn off \the [src].")
|
||||
playsound(src, 'sound/machines/click.ogg', 40, 1)
|
||||
playsound(src, "button", 40, 1)
|
||||
update_icon()
|
||||
|
||||
/obj/machinery/appliance/mixer/can_insert(var/obj/item/I, var/mob/user)
|
||||
@@ -132,7 +132,7 @@ fundamental differences
|
||||
/obj/machinery/appliance/mixer/finish_cooking(var/datum/cooking_item/CI)
|
||||
..()
|
||||
stat |= POWEROFF
|
||||
playsound(src, 'sound/machines/click.ogg', 40, 1)
|
||||
playsound(src, "button", 40, 1)
|
||||
use_power = 0
|
||||
CI.reset()
|
||||
update_icon()
|
||||
@@ -151,4 +151,4 @@ fundamental differences
|
||||
/obj/machinery/appliance/mixer/process()
|
||||
if (!stat)
|
||||
for (var/i in cooking_objs)
|
||||
do_cooking_tick(i)
|
||||
do_cooking_tick(i)
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
var/active = 0
|
||||
var/list/resource_field = list()
|
||||
var/obj/item/radio/intercom/faultreporter = new /obj/item/radio/intercom{channels=list("Supply")}(null)
|
||||
var/datum/looping_sound/mining_drill/mining_drill_loop
|
||||
|
||||
var/list/ore_types = list(
|
||||
"hematite" = /obj/item/ore/iron,
|
||||
@@ -63,6 +64,11 @@
|
||||
. = ..()
|
||||
default_apply_parts()
|
||||
cell = default_use_hicell()
|
||||
mining_drill_loop = new(list(src), FALSE)
|
||||
|
||||
/obj/machinery/mining/drill/Destroy()
|
||||
QDEL_NULL(mining_drill_loop)
|
||||
return ..()
|
||||
|
||||
/obj/machinery/mining/drill/get_cell()
|
||||
return cell
|
||||
@@ -207,9 +213,13 @@
|
||||
if(use_cell_power())
|
||||
active = !active
|
||||
if(active)
|
||||
if(mining_drill_loop)
|
||||
mining_drill_loop.start(src)
|
||||
visible_message("<span class='notice'>\The [src] lurches downwards, grinding noisily.</span>")
|
||||
need_update_field = 1
|
||||
else
|
||||
if(mining_drill_loop)
|
||||
mining_drill_loop.stop(src)
|
||||
visible_message("<span class='notice'>\The [src] shudders to a grinding halt.</span>")
|
||||
else
|
||||
to_chat(user, "<span class='notice'>The drill is unpowered.</span>")
|
||||
@@ -275,6 +285,8 @@
|
||||
faultreporter.autosay(error, src.name, "Supply")
|
||||
need_player_check = 1
|
||||
active = 0
|
||||
if(mining_drill_loop)
|
||||
mining_drill_loop.stop(src)
|
||||
update_icon()
|
||||
|
||||
/obj/machinery/mining/drill/proc/get_resource_field()
|
||||
@@ -317,6 +329,7 @@
|
||||
for(var/obj/item/ore/O in contents)
|
||||
O.loc = B
|
||||
to_chat(usr, "<span class='notice'>You unload the drill's storage cache into the ore box.</span>")
|
||||
playsound(src, 'sound/machines/clunk.ogg', 30, 1)
|
||||
else
|
||||
to_chat(usr, "<span class='notice'>You must move an ore box up to the drill before you can unload it.</span>")
|
||||
|
||||
@@ -402,4 +415,4 @@
|
||||
return 0
|
||||
|
||||
src.set_dir(turn(src.dir, 270))
|
||||
return 1
|
||||
return 1
|
||||
|
||||
@@ -293,6 +293,7 @@
|
||||
|
||||
for(var/i=0,i<total,i++)
|
||||
new A.product(output.loc)
|
||||
playsound(src, 'sound/machines/clunk.ogg', 50, 1)
|
||||
|
||||
else if(ores_processing[metal] == PROCESS_COMPRESS && O.compresses_to) //Compressing.
|
||||
|
||||
@@ -308,6 +309,7 @@
|
||||
ores_stored[metal]-=2
|
||||
sheets+=2
|
||||
new M.stack_type(output.loc)
|
||||
playsound(src, 'sound/machines/clunk.ogg', 50, 1)
|
||||
|
||||
else if(ores_processing[metal] == PROCESS_SMELT && O.smelts_to) //Smelting.
|
||||
|
||||
@@ -321,10 +323,12 @@
|
||||
ores_stored[metal]--
|
||||
sheets++
|
||||
new M.stack_type(output.loc)
|
||||
playsound(src, 'sound/machines/clunk.ogg', 50, 1)
|
||||
else
|
||||
ores_stored[metal]--
|
||||
sheets++
|
||||
new /obj/item/ore/slag(output.loc)
|
||||
playsound(src, 'sound/machines/clunk.ogg', 50, 1)
|
||||
else
|
||||
continue
|
||||
|
||||
@@ -338,4 +342,3 @@
|
||||
#undef PROCESS_SMELT
|
||||
#undef PROCESS_COMPRESS
|
||||
#undef PROCESS_ALLOY
|
||||
|
||||
|
||||
@@ -61,6 +61,7 @@
|
||||
S.amount = machine.stack_storage[href_list["release_stack"]]
|
||||
machine.stack_storage[href_list["release_stack"]] = 0
|
||||
S.update_icon()
|
||||
playsound(src, 'sound/machines/clunk.ogg', 50, 1)
|
||||
|
||||
src.add_fingerprint(usr)
|
||||
src.updateUsrDialog()
|
||||
@@ -138,8 +139,8 @@
|
||||
S.amount = stack_amt
|
||||
stack_storage[sheet] -= stack_amt
|
||||
S.update_icon()
|
||||
|
||||
playsound(src, 'sound/machines/clunk.ogg', 50, 1)
|
||||
|
||||
if(console)
|
||||
console.updateUsrDialog()
|
||||
return
|
||||
|
||||
|
||||
@@ -226,6 +226,7 @@
|
||||
// update the icon depending on the position
|
||||
|
||||
/obj/machinery/conveyor_switch/proc/update()
|
||||
playsound(src, 'sound/machines/lever.ogg', 20, 1)
|
||||
if(position<0)
|
||||
icon_state = "switch-rev"
|
||||
else if(position>0)
|
||||
|
||||
Reference in New Issue
Block a user