shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

push

Browse Source
This commit is contained in:
SandPoot
2024-08-24 21:28:55 -03:00
parent 9604090014
commit c07e94be66
218 changed files with 1001 additions and 979 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/chem_heater.dm
+1 -1
View File
@@ -58,7 +58,7 @@
/obj/machinery/chem_heater/process()
..()
if(stat & NOPOWER)
if(machine_stat & NOPOWER)
return
if(on)
if(beaker && beaker.reagents.total_volume)
code/modules/reagents/chemistry/machinery/chem_master.dm
+1 -1
View File
@@ -74,7 +74,7 @@
/obj/machinery/chem_master/update_overlays()
. = ..()
if (stat & BROKEN)
if (machine_stat & BROKEN)
. += "waitlight"
/obj/machinery/chem_master/blob_act(obj/structure/blob/B)
code/modules/reagents/chemistry/machinery/pandemic.dm
+2 -2
View File
@@ -128,7 +128,7 @@
playsound(src, 'sound/machines/ping.ogg', 30, TRUE)
/obj/machinery/computer/pandemic/update_icon_state()
if(stat & BROKEN)
if(machine_stat & BROKEN)
icon_state = (beaker ? "mixer1_b" : "mixer0_b")
else
icon_state = "mixer[(beaker) ? "1" : "0"][powered() ? "" : "_nopower"]"
@@ -239,7 +239,7 @@
/obj/machinery/computer/pandemic/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/reagent_containers) && !(I.item_flags & ABSTRACT) && I.is_open_container())
. = TRUE //no afterattack
if(stat & (NOPOWER|BROKEN))
if(machine_stat & (NOPOWER|BROKEN))
return
var/obj/item/reagent_containers/B
if(beaker)
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+6 -6
View File
@@ -151,7 +151,7 @@
options["eject"] = radial_eject
if(isAI(user))
if(stat & NOPOWER)
if(machine_stat & NOPOWER)
return
options["examine"] = radial_examine
@@ -173,7 +173,7 @@
choice = show_radial_menu(user, src, options, require_near = !hasSiliconAccessInArea(user))
// post choice verification
if(operating || (isAI(user) && stat & NOPOWER) || !user.canUseTopic(src, !hasSiliconAccessInArea(user)))
if(operating || (isAI(user) && machine_stat & NOPOWER) || !user.canUseTopic(src, !hasSiliconAccessInArea(user)))
return
switch(choice)
@@ -206,7 +206,7 @@
var/obj/item/O = i
. += "<span class='notice'>- \A [O.name].</span>"
if(!(stat & (NOPOWER|BROKEN)))
if(!(machine_stat & (NOPOWER|BROKEN)))
. += "<span class='notice'>The status display reads:</span>"
. += "<span class='notice'>- Grinding reagents at <b>[speed*100]%</b>.<span>"
if(beaker)
@@ -255,7 +255,7 @@
/obj/machinery/reagentgrinder/proc/juice()
power_change()
if(!beaker || stat & (NOPOWER|BROKEN) || beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
if(!beaker || machine_stat & (NOPOWER|BROKEN) || beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
return
operate_for(50, juicing = TRUE)
for(var/obj/item/i in holdingitems)
@@ -274,7 +274,7 @@
/obj/machinery/reagentgrinder/proc/grind()
power_change()
if(!beaker || stat & (NOPOWER|BROKEN) || beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
if(!beaker || machine_stat & (NOPOWER|BROKEN) || beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
return
operate_for(60)
for(var/i in holdingitems)
@@ -296,7 +296,7 @@
/obj/machinery/reagentgrinder/proc/mix(mob/user)
//For butter and other things that would change upon shaking or mixing
power_change()
if(!beaker || stat & (NOPOWER|BROKEN))
if(!beaker || machine_stat & (NOPOWER|BROKEN))
return
operate_for(50, juicing = TRUE)
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/machinery/reagentgrinder, mix_complete)), 50)