mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-10 09:54:52 +00:00
combines the missed microwave PR
This commit is contained in:
@@ -15,6 +15,7 @@
|
|||||||
var/broken = 0 // ={0,1,2} How broken is it???
|
var/broken = 0 // ={0,1,2} How broken is it???
|
||||||
var/max_n_of_items = 10 // whatever fat fuck made this a global var needs to look at themselves in the mirror sometime
|
var/max_n_of_items = 10 // whatever fat fuck made this a global var needs to look at themselves in the mirror sometime
|
||||||
var/efficiency = 0
|
var/efficiency = 0
|
||||||
|
var/datum/looping_sound/microwave/soundloop
|
||||||
|
|
||||||
//Microwaving doesn't use recipes, instead it calls the microwave_act of the objects. For food, this creates something based on the food's cooked_type
|
//Microwaving doesn't use recipes, instead it calls the microwave_act of the objects. For food, this creates something based on the food's cooked_type
|
||||||
|
|
||||||
@@ -25,6 +26,7 @@
|
|||||||
/obj/machinery/microwave/Initialize()
|
/obj/machinery/microwave/Initialize()
|
||||||
. = ..()
|
. = ..()
|
||||||
create_reagents(100)
|
create_reagents(100)
|
||||||
|
soundloop = new(list(src), FALSE)
|
||||||
|
|
||||||
/obj/machinery/microwave/RefreshParts()
|
/obj/machinery/microwave/RefreshParts()
|
||||||
var/E
|
var/E
|
||||||
@@ -266,6 +268,7 @@
|
|||||||
|
|
||||||
/obj/machinery/microwave/proc/start()
|
/obj/machinery/microwave/proc/start()
|
||||||
visible_message("The microwave turns on.", "<span class='italics'>You hear a microwave humming.</span>")
|
visible_message("The microwave turns on.", "<span class='italics'>You hear a microwave humming.</span>")
|
||||||
|
soundloop.start()
|
||||||
operating = TRUE
|
operating = TRUE
|
||||||
icon_state = "mw1"
|
icon_state = "mw1"
|
||||||
updateUsrDialog()
|
updateUsrDialog()
|
||||||
@@ -276,7 +279,7 @@
|
|||||||
updateUsrDialog()
|
updateUsrDialog()
|
||||||
|
|
||||||
/obj/machinery/microwave/proc/stop()
|
/obj/machinery/microwave/proc/stop()
|
||||||
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
|
soundloop.stop()
|
||||||
abort()
|
abort()
|
||||||
|
|
||||||
/obj/machinery/microwave/proc/dispose()
|
/obj/machinery/microwave/proc/dispose()
|
||||||
|
|||||||
BIN
sound/machines/microwave/microwave-end.ogg
Normal file
BIN
sound/machines/microwave/microwave-end.ogg
Normal file
Binary file not shown.
BIN
sound/machines/microwave/microwave-mid1.ogg
Normal file
BIN
sound/machines/microwave/microwave-mid1.ogg
Normal file
Binary file not shown.
BIN
sound/machines/microwave/microwave-mid2.ogg
Normal file
BIN
sound/machines/microwave/microwave-mid2.ogg
Normal file
Binary file not shown.
BIN
sound/machines/microwave/microwave-start.ogg
Normal file
BIN
sound/machines/microwave/microwave-start.ogg
Normal file
Binary file not shown.
Reference in New Issue
Block a user