cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Last Push - Everything is working, just needs testing!

Browse Source
This commit is contained in:
Rykka
2020-07-16 19:52:20 -04:00
parent 9f935ff59d
commit 3974d7e87f
32 changed files with 221 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
code/modules/food/kitchen/microwave.dm
View File

@@ -260,7 +260,7 @@
return
start()
if(reagents.total_volume==0 && !(locate(/obj) in ((contents - component_parts) - circuit))) //dry run
if(!wzhzhzh(5)) //VOREStation Edit - Quicker Microwaves
if(!wzhzhzh(16)) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was 5)
abort()
return
abort()
@@ -271,17 +271,17 @@
if(!recipe)
dirty += 1
if(prob(max(10,dirty*5)))
if(!wzhzhzh(2)) //VOREStation Edit - Quicker Microwaves
if(!wzhzhzh(16)) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was 2)
abort()
return
muck_start()
wzhzhzh(2) //VOREStation Edit - Quicker Microwaves
wzhzhzh(2) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was 2)
muck_finish()
cooked = fail()
cooked.forceMove(src.loc)
return
else if(has_extra_item())
if(!wzhzhzh(2)) //VOREStation Edit - Quicker Microwaves
if(!wzhzhzh(16)) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was 2)
abort()
return
broke()
@@ -289,15 +289,15 @@
cooked.forceMove(src.loc)
return
else
if(!wzhzhzh(5)) //VOREStation Edit - Quicker Microwaves
if(!wzhzhzh(40)) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was 5)
abort()
return
abort()
stop()
cooked = fail()
cooked.forceMove(src.loc)
return
else
var/halftime = round(recipe.time/20/2) //VOREStation Edit - Quicker Microwaves
var/halftime = round(recipe.time*4/10/2) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was round(recipe.time/20/2))
if(!wzhzhzh(halftime))
abort()
return
@@ -391,6 +391,13 @@
icon_state = "mw"
updateUsrDialog()
soundloop.stop()
/obj/machinery/microwave/proc/stop()
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
operating = FALSE // Turn it off again aferwards
icon_state = "mw"
updateUsrDialog()
soundloop.stop()
/obj/machinery/microwave/proc/dispose(var/message = 1)
for (var/atom/movable/A in ((contents-component_parts)-circuit))