diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index d6138adc0e5..14ed32967c6 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -196,5 +196,11 @@ GLOBAL_LIST_INIT(bitfields, list( "MOB_EPIC" = MOB_EPIC, "MOB_REPTILE" = MOB_REPTILE, "MOB_SPIRIT" = MOB_SPIRIT + ), + "machine_stat" = list ( + "BROKEN" = BROKEN, + "NOPOWER" = NOPOWER, + "MAINT" = MAINT, + "EMPED" = EMPED ) )) diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm index 718357b8bb9..e5bda7148a0 100644 --- a/code/controllers/subsystem/communications.dm +++ b/code/controllers/subsystem/communications.dm @@ -30,7 +30,7 @@ SUBSYSTEM_DEF(communications) /datum/controller/subsystem/communications/proc/send_message(datum/comm_message/sending,print = TRUE,unique = FALSE) for(var/obj/machinery/computer/communications/C in GLOB.machines) - if(!(C.stat & (BROKEN|NOPOWER)) && is_station_level(C.z)) + if(!(C.machine_stat & (BROKEN|NOPOWER)) && is_station_level(C.z)) if(unique) C.add_message(sending) else //We copy the message for each console, answers and deletions won't be shared diff --git a/code/controllers/subsystem/processing/nanites.dm b/code/controllers/subsystem/processing/nanites.dm index c34e7f78066..e138832b6b1 100644 --- a/code/controllers/subsystem/processing/nanites.dm +++ b/code/controllers/subsystem/processing/nanites.dm @@ -9,7 +9,7 @@ PROCESSING_SUBSYSTEM_DEF(nanites) var/neural_network_count = 0 /datum/controller/subsystem/processing/nanites/proc/check_hardware(datum/nanite_cloud_backup/backup) - if(QDELETED(backup.storage) || (backup.storage.stat & (NOPOWER|BROKEN))) + if(QDELETED(backup.storage) || (backup.storage.machine_stat & (NOPOWER|BROKEN))) return FALSE return TRUE diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index c79ed8e5b46..8966f85d2f9 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -307,7 +307,7 @@ SUBSYSTEM_DEF(shuttle) continue else if(istype(thing, /obj/machinery/computer/communications)) var/obj/machinery/computer/communications/C = thing - if(C.stat & BROKEN) + if(C.machine_stat & BROKEN) continue var/turf/T = get_turf(thing) diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm index 7209cb9d2b0..54e4a559850 100644 --- a/code/datums/components/butchering.dm +++ b/code/datums/components/butchering.dm @@ -118,7 +118,7 @@ if(!istype(L)) return var/obj/machinery/recycler/eater = parent - if(eater.safety_mode || (eater.stat & (BROKEN|NOPOWER))) //I'm so sorry. + if(eater.safety_mode || (eater.machine_stat & (BROKEN|NOPOWER))) //I'm so sorry. return if(L.stat == DEAD && (L.butcher_results || L.guaranteed_butcher_results)) Butcher(parent, L) diff --git a/code/datums/wires/roulette.dm b/code/datums/wires/roulette.dm index fe8d7ee2e41..f775808f908 100644 --- a/code/datums/wires/roulette.dm +++ b/code/datums/wires/roulette.dm @@ -15,7 +15,7 @@ /datum/wires/roulette/interactable(mob/user) . = FALSE var/obj/machinery/roulette/R = holder - if(R.stat & MAINT) + if(R.machine_stat & MAINT) . = TRUE /datum/wires/roulette/get_status() diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index ede4448b90e..00ba4b2eabf 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -9,7 +9,7 @@ var/list/colorlist = list() /obj/machinery/pdapainter/update_icon_state() - if(stat & BROKEN) + if(machine_stat & BROKEN) icon_state = "[initial(icon_state)]-broken" return @@ -21,7 +21,7 @@ /obj/machinery/pdapainter/update_overlays() . = ..() - if(stat & BROKEN) + if(machine_stat & BROKEN) return if(storedpda) @@ -65,7 +65,7 @@ update_icon() /obj/machinery/pdapainter/attackby(obj/item/O, mob/user, params) - if(stat & BROKEN) + if(machine_stat & BROKEN) if(O.tool_behaviour == TOOL_WELDER && user.a_intent != INTENT_HARM) if(!O.tool_start_check(user, amount=0)) return @@ -73,10 +73,10 @@ "You begin repairing [src]...", \ "You hear welding.") if(O.use_tool(src, user, 40, volume=50)) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) return to_chat(user, "You repair [src].") - stat &= ~BROKEN + machine_stat &= ~BROKEN obj_integrity = max_integrity update_icon() @@ -109,7 +109,7 @@ return if(storedpda) - if(stat & BROKEN) //otherwise the PDA is stuck until repaired + if(machine_stat & BROKEN) //otherwise the PDA is stuck until repaired ejectpda() to_chat(user, "You manage to eject the loaded PDA.") else diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index b63edb97592..552664c175f 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -96,7 +96,7 @@ Class Procs: anchored = TRUE interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_UI_INTERACT - var/stat = 0 + var/machine_stat = 0 var/use_power = IDLE_POWER_USE //0 = dont run the auto //1 = run auto, use idle @@ -176,7 +176,7 @@ Class Procs: /obj/machinery/emp_act(severity) . = ..() - if(use_power && !stat && !(. & EMP_PROTECT_SELF)) + if(use_power && !machine_stat && !(. & EMP_PROTECT_SELF)) use_power(7500/severity) new /obj/effect/temp_visual/emp(loc) @@ -235,11 +235,11 @@ Class Procs: return 1 /obj/machinery/proc/is_operational() - return !(stat & (NOPOWER|BROKEN|MAINT)) + return !(machine_stat & (NOPOWER|BROKEN|MAINT)) /obj/machinery/can_interact(mob/user) var/silicon = issiliconoradminghost(user) - if((stat & (NOPOWER|BROKEN)) && !(interaction_flags_machine & INTERACT_MACHINE_OFFLINE)) + if((machine_stat & (NOPOWER|BROKEN)) && !(interaction_flags_machine & INTERACT_MACHINE_OFFLINE)) return FALSE if(panel_open && !(interaction_flags_machine & INTERACT_MACHINE_OPEN)) if(!silicon || !(interaction_flags_machine & INTERACT_MACHINE_OPEN_SILICON)) @@ -380,8 +380,8 @@ Class Procs: /obj/machinery/obj_break(damage_flag) SHOULD_CALL_PARENT(1) . = ..() - if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1)) - stat |= BROKEN + if(!(machine_stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1)) + machine_stat |= BROKEN SEND_SIGNAL(src, COMSIG_MACHINERY_BROKEN, damage_flag) update_icon() return TRUE @@ -504,7 +504,7 @@ Class Procs: /obj/machinery/examine(mob/user) . = ..() - if(stat & BROKEN) + if(machine_stat & BROKEN) . += "It looks broken and non-functional." if(!(resistance_flags & INDESTRUCTIBLE)) if(resistance_flags & ON_FIRE) diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 8fa3571674e..4ae99a0587d 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -18,9 +18,9 @@ . += "It has [uses] uses of foam remaining." /obj/machinery/ai_slipper/update_icon_state() - if(stat & BROKEN) + if(machine_stat & BROKEN) return - if((stat & NOPOWER) || cooldown_time > world.time || !uses) + if((machine_stat & NOPOWER) || cooldown_time > world.time || !uses) icon_state = "ai-slipper0" else icon_state = "ai-slipper1" diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm index 5d3579d53f6..15d9b737c52 100644 --- a/code/game/machinery/announcement_system.dm +++ b/code/game/machinery/announcement_system.dm @@ -46,7 +46,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) if(newheadToggle) . += pinklight - if(stat & BROKEN) + if(machine_stat & BROKEN) . += errorlight /obj/machinery/announcement_system/Destroy() @@ -62,9 +62,9 @@ GLOBAL_LIST_EMPTY(announcement_systems) update_icon() else if(default_deconstruction_crowbar(P)) return - else if(P.tool_behaviour == TOOL_MULTITOOL && panel_open && (stat & BROKEN)) + else if(P.tool_behaviour == TOOL_MULTITOOL && panel_open && (machine_stat & BROKEN)) to_chat(user, "You reset [src]'s firmware.") - stat &= ~BROKEN + machine_stat &= ~BROKEN update_icon() else return ..() @@ -99,7 +99,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) . = ..() if(!user.canUseTopic(src, !issilicon(user))) return - if(stat & BROKEN) + if(machine_stat & BROKEN) visible_message("[src] buzzes.", "You hear a faint buzz.") playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, TRUE) return @@ -117,7 +117,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) return if(!usr.canUseTopic(src, !issilicon(usr))) return - if(stat & BROKEN) + if(machine_stat & BROKEN) visible_message("[src] buzzes.", "You hear a faint buzz.") playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, TRUE) return @@ -151,7 +151,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) /obj/machinery/announcement_system/attack_ai(mob/user) if(!user.canUseTopic(src, !issilicon(user))) return - if(stat & BROKEN) + if(machine_stat & BROKEN) to_chat(user, "[src]'s firmware appears to be malfunctioning!") return interact(user) @@ -165,7 +165,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) /obj/machinery/announcement_system/emp_act(severity) . = ..() - if(!(stat & (NOPOWER|BROKEN)) && !(. & EMP_PROTECT_SELF)) + if(!(machine_stat & (NOPOWER|BROKEN)) && !(. & EMP_PROTECT_SELF)) act_up() /obj/machinery/announcement_system/emag_act() diff --git a/code/game/machinery/aug_manipulator.dm b/code/game/machinery/aug_manipulator.dm index 09993792592..399d63aeb21 100644 --- a/code/game/machinery/aug_manipulator.dm +++ b/code/game/machinery/aug_manipulator.dm @@ -20,7 +20,7 @@ return ..() /obj/machinery/aug_manipulator/update_icon_state() - if(stat & BROKEN) + if(machine_stat & BROKEN) icon_state = "[initial_icon_state]-broken" return @@ -83,10 +83,10 @@ "You hear welding.") if(O.use_tool(src, user, 40, volume=50)) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) return to_chat(user, "You repair [src].") - stat &= ~BROKEN + machine_stat &= ~BROKEN obj_integrity = max(obj_integrity, max_integrity) update_icon() else diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 1f59df8dceb..97cfa97715c 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -80,7 +80,7 @@ if(!is_operational()) return - if(shocked && !(stat & NOPOWER)) + if(shocked && !(machine_stat & NOPOWER)) shock(user,50) var/dat @@ -120,7 +120,7 @@ if(user.a_intent == INTENT_HARM) //so we can hit the machine return ..() - if(stat) + if(machine_stat) return TRUE if(istype(O, /obj/item/disk/design_disk)) @@ -417,7 +417,7 @@ disabled = FALSE /obj/machinery/autolathe/proc/shock(mob/user, prb) - if(stat & (BROKEN|NOPOWER)) // unpowered, no shock + if(machine_stat & (BROKEN|NOPOWER)) // unpowered, no shock return FALSE if(!prob(prb)) return FALSE diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm index 8c60c5f384a..81fa9ce15cc 100644 --- a/code/game/machinery/bank_machine.dm +++ b/code/game/machinery/bank_machine.dm @@ -43,7 +43,7 @@ /obj/machinery/computer/bank_machine/process() ..() if(siphoning) - if (stat & (BROKEN|NOPOWER)) + if (machine_stat & (BROKEN|NOPOWER)) say("Insufficient power. Halting siphon.") end_syphon() var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 372bfeeb847..d99e70f754e 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -46,7 +46,7 @@ /obj/machinery/button/update_icon_state() if(panel_open) icon_state = "button-open" - else if(stat & (NOPOWER|BROKEN)) + else if(machine_stat & (NOPOWER|BROKEN)) icon_state = "[skin]-p" else icon_state = skin @@ -160,7 +160,7 @@ to_chat(user, "You change the button frame's front panel.") return - if((stat & (NOPOWER|BROKEN))) + if((machine_stat & (NOPOWER|BROKEN))) return if(device && device.next_activate > world.time) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 10687ea39a1..8a9b0161acd 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -140,7 +140,7 @@ update_icon() network = list() GLOB.cameranet.removeCamera(src) - stat |= EMPED + machine_stat |= EMPED set_light(0) emped = emped+1 //Increase the number of consecutive EMP's update_icon() @@ -159,7 +159,7 @@ if(emped != thisemp) //Only fix it if the camera hasn't been EMP'd again return network = previous_network - stat &= ~EMPED + machine_stat &= ~EMPED update_icon() if(can_use()) GLOB.cameranet.addCamera(src) @@ -230,7 +230,7 @@ return toggle_cam(user, 1) obj_integrity = max_integrity //this is a pretty simplistic way to heal the camera, but there's no reason for this to be complex. - stat &= ~BROKEN + machine_stat &= ~BROKEN I.play_tool_sound(src) return TRUE @@ -349,7 +349,7 @@ /obj/machinery/camera/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) - if(stat & BROKEN) + if(machine_stat & BROKEN) return damage_amount . = ..() @@ -382,7 +382,7 @@ xray_module = "xray" if(!status) icon_state = "[xray_module][default_camera_icon]_off" - else if (stat & EMPED) + else if (machine_stat & EMPED) icon_state = "[xray_module][default_camera_icon]_emp" else icon_state = "[xray_module][default_camera_icon][in_use_lights ? "_in_use" : ""]" @@ -440,7 +440,7 @@ /obj/machinery/camera/proc/can_use() if(!status) return FALSE - if(stat & EMPED) + if(machine_stat & EMPED) return FALSE return TRUE diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm index 6fdfa6421e6..3638fb50ccd 100644 --- a/code/game/machinery/camera/motion.dm +++ b/code/game/machinery/camera/motion.dm @@ -10,7 +10,7 @@ if(!isMotion()) . = PROCESS_KILL return - if(stat & EMPED) + if(machine_stat & EMPED) return if (detectTime > 0) var/elapsed = world.time - detectTime diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 542144dcb89..c847d71476f 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -17,10 +17,10 @@ if(!charging) return - + . += image(charging.icon, charging.icon_state) . += "ccharger-on" - if(!(stat & (BROKEN|NOPOWER))) + if(!(machine_stat & (BROKEN|NOPOWER))) var/newlevel = round(charging.percent() * 4 / 100) . += "ccharger-o[newlevel]" @@ -34,7 +34,7 @@ /obj/machinery/cell_charger/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/stock_parts/cell) && !panel_open) - if(stat & BROKEN) + if(machine_stat & BROKEN) to_chat(user, "[src] is broken!") return if(!anchored) @@ -108,7 +108,7 @@ /obj/machinery/cell_charger/emp_act(severity) . = ..() - if(stat & (BROKEN|NOPOWER) || . & EMP_PROTECT_CONTENTS) + if(machine_stat & (BROKEN|NOPOWER) || . & EMP_PROTECT_CONTENTS) return if(charging) @@ -120,7 +120,7 @@ charge_rate *= C.rating /obj/machinery/cell_charger/process() - if(!charging || !anchored || (stat & (BROKEN|NOPOWER))) + if(!charging || !anchored || (machine_stat & (BROKEN|NOPOWER))) return if(charging.percent() >= 100) diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm index 03ce1e137ee..ab80310982d 100644 --- a/code/game/machinery/computer/_computer.dm +++ b/code/game/machinery/computer/_computer.dm @@ -28,15 +28,15 @@ return ..() /obj/machinery/computer/process() - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return 0 return 1 /obj/machinery/computer/update_overlays() . = ..() - + SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays) - if(stat & NOPOWER) + if(machine_stat & NOPOWER) . += "[icon_keyboard]_off" return . += icon_keyboard @@ -44,14 +44,14 @@ // This whole block lets screens ignore lighting and be visible even in the darkest room // We can't do this for many things that emit light unfortunately because it layers over things that would be on top of it var/overlay_state = icon_screen - if(stat & BROKEN) + if(machine_stat & BROKEN) overlay_state = "[icon_state]_broken" SSvis_overlays.add_vis_overlay(src, icon, overlay_state, layer, plane, dir) SSvis_overlays.add_vis_overlay(src, icon, overlay_state, ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir, alpha=128) /obj/machinery/computer/power_change() . = ..() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) set_light(0) else set_light(brightness_on) @@ -68,7 +68,7 @@ /obj/machinery/computer/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) switch(damage_type) if(BRUTE) - if(stat & BROKEN) + if(machine_stat & BROKEN) playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, TRUE) else playsound(src.loc, 'sound/effects/glasshit.ogg', 75, TRUE) @@ -102,7 +102,7 @@ A.setDir(dir) A.circuit = circuit A.setAnchored(TRUE) - if(stat & BROKEN) + if(machine_stat & BROKEN) if(user) to_chat(user, "The broken glass falls out.") else diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 12b6a21069c..ae38806aaec 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -11,7 +11,7 @@ /obj/machinery/computer/aifixer/screwdriver_act(mob/living/user, obj/item/I) if(occupier) - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) to_chat(user, "The screws on [name]'s screen won't budge.") else to_chat(user, "The screws on [name]'s screen won't budge and it emits a warning beep.") @@ -111,9 +111,9 @@ /obj/machinery/computer/aifixer/update_overlays() . = ..() - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return - + if(active) . += "ai-fixer-on" if (occupier) @@ -130,7 +130,7 @@ return //Downloading AI from card to terminal. if(interaction == AI_TRANS_FROM_CARD) - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) to_chat(user, "[src] is offline and cannot take an AI at this time.") return AI.forceMove(src) diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm index 3034de97472..69118856363 100644 --- a/code/game/machinery/computer/apc_control.dm +++ b/code/game/machinery/computer/apc_control.dm @@ -18,7 +18,7 @@ result_filters = list("Name" = null, "Charge Above" = null, "Charge Below" = null, "Responsive" = null) /obj/machinery/computer/apc_control/process() - if(operator && (!operator.Adjacent(src) || stat)) + if(operator && (!operator.Adjacent(src) || machine_stat)) operator = null if(active_apc) if(!active_apc.locked) @@ -37,7 +37,7 @@ ..(user) /obj/machinery/computer/apc_control/proc/check_apc(obj/machinery/power/apc/APC) - return APC.z == z && !APC.malfhack && !APC.aidisabled && !(APC.obj_flags & EMAGGED) && !APC.stat && !istype(APC.area, /area/ai_monitored) && !APC.area.outdoors + return APC.z == z && !APC.malfhack && !APC.aidisabled && !(APC.obj_flags & EMAGGED) && !APC.machine_stat && !istype(APC.area, /area/ai_monitored) && !APC.area.outdoors /obj/machinery/computer/apc_control/ui_interact(mob/living/user) . = ..() @@ -89,7 +89,7 @@ /obj/machinery/computer/apc_control/Topic(href, href_list) if(..()) return - if(!usr || !usr.canUseTopic(src, !issilicon(usr)) || stat || QDELETED(src)) + if(!usr || !usr.canUseTopic(src, !issilicon(usr)) || machine_stat || QDELETED(src)) return if(href_list["authenticate"]) var/obj/item/card/id/ID = usr.get_idcard(TRUE) @@ -140,7 +140,7 @@ if(href_list["name_filter"]) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE) var/new_filter = stripped_input(usr, "What name are you looking for?", name) - if(!src || !usr || !usr.canUseTopic(src, !issilicon(usr)) || stat || QDELETED(src)) + if(!src || !usr || !usr.canUseTopic(src, !issilicon(usr)) || machine_stat || QDELETED(src)) return log_activity("changed name filter to \"[new_filter]\"") playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) @@ -148,7 +148,7 @@ if(href_list["above_filter"]) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE) var/new_filter = input(usr, "Enter a percentage from 1-100 to sort by (greater than).", name) as null|num - if(!src || !usr || !usr.canUseTopic(src, !issilicon(usr)) || stat || QDELETED(src)) + if(!src || !usr || !usr.canUseTopic(src, !issilicon(usr)) || machine_stat || QDELETED(src)) return log_activity("changed greater than charge filter to \"[new_filter]\"") if(new_filter) @@ -158,7 +158,7 @@ if(href_list["below_filter"]) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE) var/new_filter = input(usr, "Enter a percentage from 1-100 to sort by (lesser than).", name) as null|num - if(!src || !usr || !usr.canUseTopic(src, !issilicon(usr)) || stat || QDELETED(src)) + if(!src || !usr || !usr.canUseTopic(src, !issilicon(usr)) || machine_stat || QDELETED(src)) return log_activity("changed lesser than charge filter to \"[new_filter]\"") if(new_filter) @@ -201,6 +201,6 @@ /mob/proc/using_power_flow_console() for(var/obj/machinery/computer/apc_control/A in range(1, src)) - if(A.operator && A.operator == src && !A.stat) + if(A.operator && A.operator == src && !A.machine_stat) return TRUE return diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 1b07c5d4418..ab4d639459c 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -96,7 +96,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( if(prize_override) override = TRUE - if(stat & (NOPOWER|BROKEN) || . & EMP_PROTECT_SELF) + if(machine_stat & (NOPOWER|BROKEN) || . & EMP_PROTECT_SELF) return var/empprize = null diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 8c7e2aaf07d..5c61a0dca9d 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -82,7 +82,7 @@ /obj/machinery/computer/atmos_alert/update_overlays() . = ..() - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return if(priority_alarms.len) . += "alert:2" diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 7541490278f..bf7665b4591 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -23,7 +23,7 @@ network += "[idnum][i]" /obj/machinery/computer/security/check_eye(mob/user) - if( (stat & (NOPOWER|BROKEN)) || user.incapacitated() || user.eye_blind ) + if( (machine_stat & (NOPOWER|BROKEN)) || user.incapacitated() || user.eye_blind ) user.unset_machine() return if(!(user in watchers)) @@ -56,7 +56,7 @@ return ..() /obj/machinery/computer/security/interact(mob/user) - if (stat) + if (machine_stat) return if (ismob(user) && !isliving(user)) // ghosts don't need cameras return @@ -211,7 +211,7 @@ /obj/machinery/computer/security/telescreen/update_icon_state() icon_state = initial(icon_state) - if(stat & BROKEN) + if(machine_stat & BROKEN) icon_state += "b" /obj/machinery/computer/security/telescreen/entertainment diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index c9e6050d5c4..a9c54680e1b 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -79,7 +79,7 @@ playsound(src, 'sound/machines/terminal_off.ogg', 25, FALSE) /obj/machinery/computer/camera_advanced/check_eye(mob/user) - if( (stat & (NOPOWER|BROKEN)) || (!Adjacent(user) && !user.has_unlimited_silicon_privilege) || user.eye_blind || user.incapacitated() ) + if( (machine_stat & (NOPOWER|BROKEN)) || (!Adjacent(user) && !user.has_unlimited_silicon_privilege) || user.eye_blind || user.incapacitated() ) user.unset_machine() /obj/machinery/computer/camera_advanced/Destroy() diff --git a/code/game/machinery/computer/launchpad_control.dm b/code/game/machinery/computer/launchpad_control.dm index 430f931ecb2..26efe7c4ba0 100644 --- a/code/game/machinery/computer/launchpad_control.dm +++ b/code/game/machinery/computer/launchpad_control.dm @@ -68,7 +68,7 @@ var/list/this_pad = list() this_pad["name"] = pad.display_name this_pad["id"] = i - if(pad.stat & NOPOWER) + if(pad.machine_stat & NOPOWER) this_pad["inactive"] = TRUE pad_list += list(this_pad) else @@ -82,7 +82,7 @@ data["pad_name"] = current_pad.display_name data["range"] = current_pad.range data["selected_pad"] = current_pad - if(QDELETED(current_pad) || (current_pad.stat & NOPOWER)) + if(QDELETED(current_pad) || (current_pad.machine_stat & NOPOWER)) data["pad_active"] = FALSE return data data["pad_active"] = TRUE diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 77435242642..29ef03f1fc0 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -12,7 +12,7 @@ /obj/machinery/computer/upload/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/aiModule)) var/obj/item/aiModule/M = O - if(stat & (NOPOWER|BROKEN|MAINT)) + if(machine_stat & (NOPOWER|BROKEN|MAINT)) return if(!current) to_chat(user, "You haven't selected anything to transmit laws to!") diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index eceb1cb980a..e039bdb735f 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -535,7 +535,7 @@ /obj/machinery/computer/med_data/emp_act(severity) . = ..() - if(!(stat & (BROKEN|NOPOWER)) && !(. & EMP_PROTECT_SELF)) + if(!(machine_stat & (BROKEN|NOPOWER)) && !(. & EMP_PROTECT_SELF)) for(var/datum/data/record/R in GLOB.data_core.medical) if(prob(10/severity)) switch(rand(1,6)) diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 5d60ccd3fb4..59a56dedf4e 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -17,7 +17,7 @@ /obj/machinery/computer/pod/proc/alarm() - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return if(!connected) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 6f34e0eba1f..e3ab9d96c58 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -873,7 +873,7 @@ What a mess.*/ /obj/machinery/computer/secure_data/emp_act(severity) . = ..() - if(stat & (BROKEN|NOPOWER) || . & EMP_PROTECT_SELF) + if(machine_stat & (BROKEN|NOPOWER) || . & EMP_PROTECT_SELF) return for(var/datum/data/record/R in GLOB.data_core.security) diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 4a141e54b34..1cab2bd0456 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -33,13 +33,13 @@ data["alarms"][class] = list() for(var/area in alarms[class]) data["alarms"][class] += area - + return data /obj/machinery/computer/station_alert/proc/triggerAlarm(class, area/A, O, obj/source) if(source.z != z) return - if(stat & (BROKEN)) + if(machine_stat & (BROKEN)) return var/list/L = alarms[class] @@ -63,7 +63,7 @@ /obj/machinery/computer/station_alert/proc/cancelAlarm(class, area/A, obj/origin) - if(stat & (BROKEN)) + if(machine_stat & (BROKEN)) return var/list/L = alarms[class] var/cleared = 0 @@ -80,7 +80,7 @@ /obj/machinery/computer/station_alert/update_overlays() . = ..() - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return var/active_alarms = FALSE for(var/cat in alarms) diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm index c316a5335ce..249a3a074d6 100644 --- a/code/game/machinery/computer/teleporter.dm +++ b/code/game/machinery/computer/teleporter.dm @@ -159,12 +159,12 @@ log_game("[key_name(user)] has set the teleporter target to [target_station] at [AREACOORD(T)]") target = target_station.teleporter_hub target_station.linked_stations |= power_station - target_station.stat &= ~NOPOWER + target_station.machine_stat &= ~NOPOWER if(target_station.teleporter_hub) - target_station.teleporter_hub.stat &= ~NOPOWER + target_station.teleporter_hub.machine_stat &= ~NOPOWER target_station.teleporter_hub.update_icon() if(target_station.teleporter_console) - target_station.teleporter_console.stat &= ~NOPOWER + target_station.teleporter_console.machine_stat &= ~NOPOWER target_station.teleporter_console.update_icon() /obj/machinery/computer/teleporter/proc/is_eligible(atom/movable/AM) diff --git a/code/game/machinery/dish_drive.dm b/code/game/machinery/dish_drive.dm index f6e4e8cdc66..1211211fc70 100644 --- a/code/game/machinery/dish_drive.dm +++ b/code/game/machinery/dish_drive.dm @@ -96,7 +96,7 @@ step_towards(I, src) /obj/machinery/dish_drive/attack_ai(mob/living/user) - if(stat) + if(machine_stat) return to_chat(user, "You send a disposal transmission signal to [src].") do_the_dishes(TRUE) diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index 6884e6aa4aa..a3eea895387 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -34,11 +34,11 @@ /obj/machinery/dna_scannernew/update_icon_state() //no power or maintenance - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) icon_state = initial(icon_state)+ (state_open ? "_open" : "") + "_unpowered" return - if((stat & MAINT) || panel_open) + if((machine_stat & MAINT) || panel_open) icon_state = initial(icon_state)+ (state_open ? "_open" : "") + "_maintenance" return diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index ed09f5e297e..de235443cdb 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -340,7 +340,7 @@ return ((aiControlDisabled==1) && (!hackProof) && (!isAllPowerCut())); /obj/machinery/door/airlock/hasPower() - return ((!secondsMainPowerLost || !secondsBackupPowerLost) && !(stat & NOPOWER)) + return ((!secondsMainPowerLost || !secondsBackupPowerLost) && !(machine_stat & NOPOWER)) /obj/machinery/door/airlock/requiresID() return !(wires.is_cut(WIRE_IDSCAN) || aiDisabledIdScanner) @@ -612,7 +612,7 @@ if("closing") update_icon(AIRLOCK_CLOSING) if("deny") - if(!stat) + if(!machine_stat) update_icon(AIRLOCK_DENY) playsound(src,doorDeni,50,FALSE,3) sleep(6) @@ -651,7 +651,7 @@ else . += "It looks very robust." - if(issilicon(user) && (!stat & BROKEN)) + if(issilicon(user) && (!machine_stat & BROKEN)) . += "Shift-click [src] to [ density ? "open" : "close"] it." . += "Ctrl-click [src] to [ locked ? "raise" : "drop"] its bolts." . += "Alt-click [src] to [ secondsElectrified ? "un-electrify" : "permanently electrify"] it." @@ -970,7 +970,7 @@ "You hear welding.") if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, .proc/weld_checks, W, user))) obj_integrity = max_integrity - stat &= ~BROKEN + machine_stat &= ~BROKEN user.visible_message("[user.name] has repaired [src].", \ "You finish repairing the airlock.") update_icon() @@ -1248,7 +1248,7 @@ /obj/machinery/door/airlock/hostile_lockdown(mob/origin) // Must be powered and have working AI wire. - if(canAIControl(src) && !stat) + if(canAIControl(src) && !machine_stat) locked = FALSE //For airlocks that were bolted open. safe = FALSE //DOOR CRUSH close() @@ -1260,7 +1260,7 @@ /obj/machinery/door/airlock/disable_lockdown() // Must be powered and have working AI wire. - if(canAIControl(src) && !stat) + if(canAIControl(src) && !machine_stat) unbolt() set_electrified(MACHINE_NOT_ELECTRIFIED) open() diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm index 26fb2590806..67904fb336d 100644 --- a/code/game/machinery/doors/alarmlock.dm +++ b/code/game/machinery/doors/alarmlock.dm @@ -27,7 +27,7 @@ /obj/machinery/door/airlock/alarmlock/receive_signal(datum/signal/signal) ..() - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return var/alarm_area = signal.data["zone"] diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 53c64d9e1c2..38aca8e7e74 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -38,7 +38,7 @@ maptext_width = 32 maptext_y = -1 ui_x = 300 - ui_y = 138 + ui_y = 138 /obj/machinery/door_timer/Initialize() . = ..() @@ -70,7 +70,7 @@ // if it's less than 0, open door, reset timer // update the door_timer window and the icon /obj/machinery/door_timer/process() - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return if(timing) @@ -81,7 +81,7 @@ // open/closedoor checks if door_timer has power, if so it checks if the // linked door is open/closed (by density) then opens it/closes it. /obj/machinery/door_timer/proc/timer_start() - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return 0 activation_time = world.time @@ -104,7 +104,7 @@ /obj/machinery/door_timer/proc/timer_end(forced = FALSE) - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return 0 if(!forced) @@ -154,11 +154,11 @@ // if BROKEN, display blue screen of death icon AI uses // if timing=true, run update display function /obj/machinery/door_timer/update_icon() - if(stat & (NOPOWER)) + if(machine_stat & (NOPOWER)) icon_state = "frame" return - if(stat & (BROKEN)) + if(machine_stat & (BROKEN)) set_picture("ai_bsod") return diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index ee674490fda..725082d526f 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -274,7 +274,7 @@ else flick("doorc1", src) if("deny") - if(!stat) + if(!machine_stat) flick("door_deny", src) @@ -375,7 +375,7 @@ return 1 /obj/machinery/door/proc/hasPower() - return !(stat & NOPOWER) + return !(machine_stat & NOPOWER) /obj/machinery/door/proc/update_freelook_sight() if(!glass && GLOB.cameranet) @@ -399,11 +399,11 @@ return /obj/machinery/door/proc/hostile_lockdown(mob/origin) - if(!stat) //So that only powered doors are closed. + if(!machine_stat) //So that only powered doors are closed. close() //Close ALL the doors! /obj/machinery/door/proc/disable_lockdown() - if(!stat) //Opens only powered doors. + if(!machine_stat) //Opens only powered doors. open() //Open everything! /obj/machinery/door/ex_act(severity, target) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 6419b436eb1..9b59c5c5df1 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -143,7 +143,7 @@ /obj/machinery/door/firedoor/attack_ai(mob/user) add_fingerprint(user) - if(welded || operating || stat & NOPOWER) + if(welded || operating || machine_stat & NOPOWER) return TRUE if(density) open() @@ -204,7 +204,7 @@ /obj/machinery/door/firedoor/proc/latetoggle() - if(operating || stat & NOPOWER || !nextstate) + if(operating || machine_stat & NOPOWER || !nextstate) return switch(nextstate) if(FIREDOOR_OPEN) diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 40633fe8672..1f8c8d37e2a 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -92,5 +92,5 @@ return /obj/machinery/door/poddoor/try_to_crowbar(obj/item/I, mob/user) - if(stat & NOPOWER) + if(machine_stat & NOPOWER) open(1) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 9e3c5cf2e50..811fbec81ec 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -20,7 +20,7 @@ /obj/machinery/doppler_array/ui_interact(mob/user) . = ..() - if(stat) + if(machine_stat) return FALSE var/list/dat = list() @@ -66,7 +66,7 @@ /obj/machinery/doppler_array/proc/sense_explosion(datum/source, turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, took, orig_dev_range, orig_heavy_range, orig_light_range) - if(stat & NOPOWER) + if(machine_stat & NOPOWER) return FALSE var/turf/zone = get_turf(src) if(zone.z != epicenter.z) @@ -103,7 +103,7 @@ return ..() /obj/machinery/doppler_array/update_icon_state() - if(stat & BROKEN) + if(machine_stat & BROKEN) icon_state = "[initial(icon_state)]-broken" else if(powered()) icon_state = initial(icon_state) diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm index b69334035d7..6a17347c497 100644 --- a/code/game/machinery/droneDispenser.dm +++ b/code/game/machinery/droneDispenser.dm @@ -141,12 +141,12 @@ /obj/machinery/droneDispenser/examine(mob/user) . = ..() - if((mode == DRONE_RECHARGING) && !stat && recharging_text) + if((mode == DRONE_RECHARGING) && !machine_stat && recharging_text) . += "[recharging_text]" /obj/machinery/droneDispenser/process() ..() - if((stat & (NOPOWER|BROKEN)) || !anchored) + if((machine_stat & (NOPOWER|BROKEN)) || !anchored) return var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) @@ -203,7 +203,7 @@ .++ /obj/machinery/droneDispenser/update_icon_state() - if(stat & (BROKEN|NOPOWER)) + if(machine_stat & (BROKEN|NOPOWER)) icon_state = icon_off else if(mode == DRONE_RECHARGING) icon_state = icon_recharging @@ -220,7 +220,7 @@ to_chat(user, "You retrieve the materials from [src].") else if(I.tool_behaviour == TOOL_WELDER) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) to_chat(user, "[src] doesn't need repairs.") return @@ -238,7 +238,7 @@ "[user] fixes [src]!", "You restore [src] to operation.") - stat &= ~BROKEN + machine_stat &= ~BROKEN obj_integrity = max_integrity update_icon() else diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index 33717c2ec89..08844f1adc6 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -64,7 +64,7 @@ to_chat(user, "Access denied.") return if(controller && !controller.busy && door) - if(controller.stat & NOPOWER) + if(controller.machine_stat & NOPOWER) return busy = TRUE update_icon() @@ -83,7 +83,7 @@ update_icon() /obj/machinery/doorButtons/access_button/update_icon_state() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) icon_state = "access_button_off" else if(busy) @@ -162,7 +162,7 @@ A.safe = FALSE //Door crushies, manual door after all. Set every time in case someone changed it, safe doors can end up waiting forever. A.unbolt() if(A.close()) - if(stat & NOPOWER || lostPower || !A || QDELETED(A)) + if(machine_stat & NOPOWER || lostPower || !A || QDELETED(A)) goIdle(TRUE) return FALSE A.bolt() @@ -209,7 +209,7 @@ /obj/machinery/doorButtons/airlock_controller/proc/do_openDoor(obj/machinery/door/airlock/A) if(A && A.open()) - if(stat | (NOPOWER) && !lostPower && A && !QDELETED(A)) + if(machine_stat | (NOPOWER) && !lostPower && A && !QDELETED(A)) A.bolt() goIdle(TRUE) @@ -221,7 +221,7 @@ updateUsrDialog() /obj/machinery/doorButtons/airlock_controller/process() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) return if(busy == CYCLE_EXTERIOR) cycleOpen(exteriorAirlock) @@ -230,7 +230,7 @@ /obj/machinery/doorButtons/airlock_controller/power_change() . = ..() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) lostPower = TRUE else if(!busy) @@ -244,7 +244,7 @@ exteriorAirlock = A /obj/machinery/doorButtons/airlock_controller/update_icon_state() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) icon_state = "access_control_off" return if(busy || lostPower) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index d3e91a9055d..ed41821cf59 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -57,7 +57,7 @@ icon_state = "fire_b[buildstage]" return - if(stat & BROKEN) + if(machine_stat & BROKEN) icon_state = "firex" return @@ -67,7 +67,7 @@ . = ..() SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays) - if(stat & NOPOWER) + if(machine_stat & NOPOWER) return . += "fire_overlay" @@ -111,7 +111,7 @@ playsound(src, "sparks", 50, TRUE) /obj/machinery/firealarm/temperature_expose(datum/gas_mixture/air, temperature, volume) - if((temperature > T0C + 200 || temperature < BODYTEMP_COLD_DAMAGE_LIMIT) && (last_alarm+FIREALARM_COOLDOWN < world.time) && !(obj_flags & EMAGGED) && detecting && !stat) + if((temperature > T0C + 200 || temperature < BODYTEMP_COLD_DAMAGE_LIMIT) && (last_alarm+FIREALARM_COOLDOWN < world.time) && !(obj_flags & EMAGGED) && detecting && !machine_stat) alarm() ..() @@ -216,9 +216,9 @@ "You start prying out the circuit...") if(W.use_tool(src, user, 20, volume=50)) if(buildstage == 1) - if(stat & BROKEN) + if(machine_stat & BROKEN) to_chat(user, "You remove the destroyed circuit.") - stat &= ~BROKEN + machine_stat &= ~BROKEN else to_chat(user, "You pry out the circuit.") new /obj/item/electronics/firealarm(user.loc) @@ -272,7 +272,7 @@ /obj/machinery/firealarm/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) . = ..() if(.) //damage received - if(obj_integrity > 0 && !(stat & BROKEN) && buildstage != 0) + if(obj_integrity > 0 && !(machine_stat & BROKEN) && buildstage != 0) if(prob(33)) alarm() @@ -291,7 +291,7 @@ /obj/machinery/firealarm/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) new /obj/item/stack/sheet/metal(loc, 1) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) var/obj/item/I = new /obj/item/electronics/firealarm(loc) if(!disassembled) I.obj_integrity = I.max_integrity * 0.5 @@ -319,7 +319,7 @@ var/static/party_overlay /obj/machinery/firealarm/partyalarm/reset() - if (stat & (NOPOWER|BROKEN)) + if (machine_stat & (NOPOWER|BROKEN)) return var/area/A = get_area(src) if (!A || !A.party) @@ -328,7 +328,7 @@ A.cut_overlay(party_overlay) /obj/machinery/firealarm/partyalarm/alarm() - if (stat & (NOPOWER|BROKEN)) + if (machine_stat & (NOPOWER|BROKEN)) return var/area/A = get_area(src) if (!A || A.party || A.name == "Space") diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index f344f37348b..9a2dd768340 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -128,7 +128,7 @@ /obj/machinery/flasher/emp_act(severity) . = ..() - if(!(stat & (BROKEN|NOPOWER)) && !(. & EMP_PROTECT_SELF)) + if(!(machine_stat & (BROKEN|NOPOWER)) && !(. & EMP_PROTECT_SELF)) if(bulb && prob(75/severity)) flash() bulb.burn_out() diff --git a/code/game/machinery/gulag_teleporter.dm b/code/game/machinery/gulag_teleporter.dm index 00d4a13051a..a82a2b44a64 100644 --- a/code/game/machinery/gulag_teleporter.dm +++ b/code/game/machinery/gulag_teleporter.dm @@ -67,13 +67,13 @@ The console is located at computer/gulag_teleporter.dm /obj/machinery/gulag_teleporter/update_icon_state() icon_state = initial(icon_state) + (state_open ? "_open" : "") //no power or maintenance - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) icon_state += "_unpowered" - if((stat & MAINT) || panel_open) + if((machine_stat & MAINT) || panel_open) icon_state += "_maintenance" return - if((stat & MAINT) || panel_open) + if((machine_stat & MAINT) || panel_open) icon_state += "_maintenance" return diff --git a/code/game/machinery/harvester.dm b/code/game/machinery/harvester.dm index cbedea9bf24..5b2543ff7ef 100644 --- a/code/game/machinery/harvester.dm +++ b/code/game/machinery/harvester.dm @@ -186,7 +186,7 @@ /obj/machinery/harvester/examine(mob/user) . = ..() - if(stat & BROKEN) + if(machine_stat & BROKEN) return if(state_open) . += "[src] must be closed before harvesting." diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 19d64141d76..1883f125d1b 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -37,7 +37,7 @@ update_icon() /obj/machinery/igniter/process() //ugh why is this even in process()? - if (src.on && !(stat & NOPOWER) ) + if (src.on && !(machine_stat & NOPOWER) ) var/turf/location = src.loc if (isturf(location)) location.hotspot_expose(1000,500,1) @@ -48,7 +48,7 @@ icon_state = "igniter[on]" /obj/machinery/igniter/update_icon_state() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) icon_state = "igniter0" else icon_state = "igniter[on]" @@ -134,5 +134,5 @@ . = ..() if (. & EMP_PROTECT_SELF) return - if(!(stat & (BROKEN|NOPOWER))) + if(!(machine_stat & (BROKEN|NOPOWER))) ignite() diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm index 4f51b5dea14..8ef69e39322 100644 --- a/code/game/machinery/launch_pad.dm +++ b/code/game/machinery/launch_pad.dm @@ -81,7 +81,7 @@ ghost.forceMove(target) /obj/machinery/launchpad/proc/isAvailable() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) return FALSE if(panel_open) return FALSE diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 76d78fdb6ff..e10d82e5b32 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -24,7 +24,7 @@ update_icon() /obj/machinery/light_switch/update_icon_state() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) icon_state = "light-p" else if(area.lightswitch) @@ -56,5 +56,5 @@ . = ..() if (. & EMP_PROTECT_SELF) return - if(!(stat & (BROKEN|NOPOWER))) + if(!(machine_stat & (BROKEN|NOPOWER))) power_change() diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 7eda6a94d16..43daf1ec5f1 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -134,7 +134,7 @@ /obj/machinery/magnetic_module/process() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) on = FALSE // Sanity checks: @@ -326,7 +326,7 @@ while(moving && rpath.len >= 1) - if(stat & (BROKEN|NOPOWER)) + if(machine_stat & (BROKEN|NOPOWER)) break looping = 1 diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 4d3d6d3c623..5d300f992dc 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -15,7 +15,7 @@ id = "[idnum][id]" /obj/machinery/mass_driver/proc/drive(amount) - if(stat & (BROKEN|NOPOWER)) + if(machine_stat & (BROKEN|NOPOWER)) return use_power(500) var/O_limit @@ -37,6 +37,6 @@ . = ..() if (. & EMP_PROTECT_SELF) return - if(stat & (BROKEN|NOPOWER)) + if(machine_stat & (BROKEN|NOPOWER)) return drive() diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 14b0c46d803..910956b0d9b 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -225,7 +225,7 @@ GLOBAL_LIST_EMPTY(allCasters) return ..() /obj/machinery/newscaster/update_icon_state() - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) icon_state = "newscaster_off" else if(GLOB.news_network.wanted_issue.active) @@ -236,7 +236,7 @@ GLOBAL_LIST_EMPTY(allCasters) /obj/machinery/newscaster/update_overlays() . = ..() - if(!(stat & (NOPOWER|BROKEN)) && !GLOB.news_network.wanted_issue.active && alert) + if(!(machine_stat & (NOPOWER|BROKEN)) && !GLOB.news_network.wanted_issue.active && alert) . += "newscaster_alert" var/hp_percent = obj_integrity * 100 /max_integrity @@ -713,7 +713,7 @@ GLOBAL_LIST_EMPTY(allCasters) I.play_tool_sound(src) if(I.use_tool(src, user, 60)) playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE) - if(stat & BROKEN) + if(machine_stat & BROKEN) to_chat(user, "The broken remains of [src] fall on the ground.") new /obj/item/stack/sheet/metal(loc, 5) new /obj/item/shard(loc) @@ -723,18 +723,18 @@ GLOBAL_LIST_EMPTY(allCasters) new /obj/item/wallframe/newscaster(loc) qdel(src) else if(I.tool_behaviour == TOOL_WELDER && user.a_intent != INTENT_HARM) - if(stat & BROKEN) + if(machine_stat & BROKEN) if(!I.tool_start_check(user, amount=0)) return user.visible_message("[user] is repairing [src].", \ "You begin repairing [src]...", \ "You hear welding.") if(I.use_tool(src, user, 40, volume=50)) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) return to_chat(user, "You repair [src].") obj_integrity = max_integrity - stat &= ~BROKEN + machine_stat &= ~BROKEN update_icon() else to_chat(user, "[src] does not need repairs.") @@ -744,7 +744,7 @@ GLOBAL_LIST_EMPTY(allCasters) /obj/machinery/newscaster/play_attack_sound(damage, damage_type = BRUTE, damage_flag = 0) switch(damage_type) if(BRUTE) - if(stat & BROKEN) + if(machine_stat & BROKEN) playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 100, TRUE) else playsound(loc, 'sound/effects/glasshit.ogg', 90, TRUE) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 2b0ab3c3cf8..24d76504966 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -63,7 +63,7 @@ var/turret_flags = TURRET_FLAG_SHOOT_CRIMINALS | TURRET_FLAG_SHOOT_ANOMALOUS - + var/on = TRUE //determines if the turret is on var/list/faction = list("turret" ) // Same faction mobs will never be shot at, no matter the other settings @@ -103,7 +103,7 @@ if(!anchored) icon_state = "turretCover" return - if(stat & BROKEN) + if(machine_stat & BROKEN) icon_state = "[base_icon_state]_broken" else if(powered()) @@ -223,12 +223,12 @@ /obj/machinery/porta_turret/power_change() . = ..() - if(!anchored || (stat & BROKEN) || !powered()) + if(!anchored || (machine_stat & BROKEN) || !powered()) update_icon() remove_control() /obj/machinery/porta_turret/attackby(obj/item/I, mob/user, params) - if(stat & BROKEN) + if(machine_stat & BROKEN) if(I.tool_behaviour == TOOL_CROWBAR) //If the turret is destroyed, you can remove it with a crowbar to //try and salvage its components @@ -344,14 +344,14 @@ /obj/machinery/porta_turret/process() //the main machinery process if(cover == null && anchored) //if it has no cover and is anchored - if(stat & BROKEN) //if the turret is borked + if(machine_stat & BROKEN) //if the turret is borked qdel(cover) //delete its cover, assuming it has one. Workaround for a pesky little bug else if(has_cover) cover = new /obj/machinery/porta_turret_cover(loc) //if the turret has no cover and is anchored, give it a cover cover.parent_turret = src //assign the cover its parent_turret, which would be this (src) - if(!on || (stat & (NOPOWER|BROKEN)) || manual_control) + if(!on || (machine_stat & (NOPOWER|BROKEN)) || manual_control) return var/list/targets = list() @@ -432,7 +432,7 @@ return if(raising || raised) return - if(stat & BROKEN) + if(machine_stat & BROKEN) return invisibility = 0 raising = 1 @@ -448,7 +448,7 @@ /obj/machinery/porta_turret/proc/popDown() //pops the turret down if(raising || !raised) return - if(stat & BROKEN) + if(machine_stat & BROKEN) return layer = OBJ_LAYER raising = 1 @@ -496,7 +496,7 @@ // If we aren't shooting heads then return a threatcount of 0 if (!(turret_flags & TURRET_FLAG_SHOOT_HEADS) && (perp.get_assignment() in GLOB.command_positions)) return 0 - + return threatcount /obj/machinery/porta_turret/proc/in_faction(mob/target) @@ -829,12 +829,12 @@ /obj/machinery/turretid/examine(mob/user) . += ..() - if(issilicon(user) && (!stat & BROKEN)) + if(issilicon(user) && (!machine_stat & BROKEN)) . += {"Ctrl-click [src] to [ enabled ? "disable" : "enable"] turrets. Alt-click [src] to set turrets to [ lethal ? "stun" : "kill"]."} /obj/machinery/turretid/attackby(obj/item/I, mob/user, params) - if(stat & BROKEN) + if(machine_stat & BROKEN) return if(I.tool_behaviour == TOOL_MULTITOOL) @@ -943,7 +943,7 @@ update_icon() /obj/machinery/turretid/update_icon_state() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) icon_state = "control_off" else if (enabled) if (lethal) diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index c3c8bc999b7..e62c14c2882 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -112,7 +112,7 @@ to_chat(user, "Target pad is busy. Please wait.") return - if(target_pad.stat & NOPOWER) + if(target_pad.machine_stat & NOPOWER) to_chat(user, "Target pad is not responding to ping.") return add_fingerprint(user) @@ -141,11 +141,11 @@ if(!src || QDELETED(src)) teleporting = FALSE return - if(stat & NOPOWER) + if(machine_stat & NOPOWER) to_chat(user, "[src] is unpowered!") teleporting = FALSE return - if(!target_pad || QDELETED(target_pad) || target_pad.stat & NOPOWER) + if(!target_pad || QDELETED(target_pad) || target_pad.machine_stat & NOPOWER) to_chat(user, "Linked pad is not responding to ping. Teleport aborted.") teleporting = FALSE return diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index e67c007a183..0e8678582b2 100755 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -32,7 +32,7 @@ . += {"\The [src] contains: - \A [charging]."} - if(!(stat & (NOPOWER|BROKEN))) + if(!(machine_stat & (NOPOWER|BROKEN))) . += "The status display reads:" . += "- Recharging [recharge_coeff*10]% cell charge per cycle." if(charging) @@ -119,7 +119,7 @@ setCharging(null) /obj/machinery/recharger/process() - if(stat & (NOPOWER|BROKEN) || !anchored) + if(machine_stat & (NOPOWER|BROKEN) || !anchored) return PROCESS_KILL using_power = FALSE @@ -147,7 +147,7 @@ . = ..() if (. & EMP_PROTECT_CONTENTS) return - if(!(stat & (NOPOWER|BROKEN)) && anchored) + if(!(machine_stat & (NOPOWER|BROKEN)) && anchored) if(istype(charging, /obj/item/gun/energy)) var/obj/item/gun/energy/E = charging if(E.cell) @@ -160,7 +160,7 @@ /obj/machinery/recharger/update_icon_state() - if(stat & (NOPOWER|BROKEN) || !anchored) + if(machine_stat & (NOPOWER|BROKEN) || !anchored) icon_state = "rechargeroff" else if(panel_open) icon_state = "rechargeropen" diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 95e7dfa3015..02828ef46c9 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -50,7 +50,7 @@ /obj/machinery/recharge_station/emp_act(severity) . = ..() - if(!(stat & (BROKEN|NOPOWER))) + if(!(machine_stat & (BROKEN|NOPOWER))) if(occupant && !(. & EMP_PROTECT_CONTENTS)) occupant.emp_act(severity) if (!(. & EMP_PROTECT_SELF)) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index a13295b4afb..b62be915735 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -42,7 +42,7 @@ /obj/machinery/recycler/examine(mob/user) . = ..() . += "Reclaiming [amount_produced]% of materials salvaged." - . += {"The power light is [(stat & NOPOWER) ? "off" : "on"]. + . += {"The power light is [(machine_stat & NOPOWER) ? "off" : "on"]. The safety-mode light is [safety_mode ? "on" : "off"]. The safety-sensors status light is [obj_flags & EMAGGED ? "off" : "on"]."} @@ -73,7 +73,7 @@ /obj/machinery/recycler/update_icon_state() ..() - var/is_powered = !(stat & (BROKEN|NOPOWER)) + var/is_powered = !(machine_stat & (BROKEN|NOPOWER)) if(safety_mode) is_powered = FALSE icon_state = icon_name + "[is_powered]" + "[(blood ? "bld" : "")]" // add the blood tag at the end @@ -91,7 +91,7 @@ . = ..() /obj/machinery/recycler/proc/eat(atom/AM0, sound=TRUE) - if(stat & (BROKEN|NOPOWER)) + if(machine_stat & (BROKEN|NOPOWER)) return if(safety_mode) return diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 3ee4c84c67a..351c432b8f2 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -70,7 +70,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) armor = list("melee" = 70, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90) /obj/machinery/requests_console/update_icon_state() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) set_light(0) else set_light(1.4,0.7,"#34D352")//green light @@ -79,7 +79,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) icon_state="req_comp_open" else icon_state="req_comp_rewired" - else if(stat & NOPOWER) + else if(machine_stat & NOPOWER) if(icon_state != "req_comp_off") icon_state = "req_comp_off" else diff --git a/code/game/machinery/roulette_machine.dm b/code/game/machinery/roulette_machine.dm index eccb27eaf0c..bb17ba0a4e0 100644 --- a/code/game/machinery/roulette_machine.dm +++ b/code/game/machinery/roulette_machine.dm @@ -61,7 +61,7 @@ . = ..() /obj/machinery/roulette/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) - if(stat & MAINT) + if(machine_stat & MAINT) return ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) @@ -104,7 +104,7 @@ ///Handles setting ownership and the betting itself. /obj/machinery/roulette/attackby(obj/item/W, mob/user, params) - if(stat & MAINT && is_wire_tool(W)) + if(machine_stat & MAINT && is_wire_tool(W)) wires.interact(user) return if(playing) @@ -112,7 +112,7 @@ if(istype(W, /obj/item/card/id)) playsound(src, 'sound/machines/card_slide.ogg', 50, TRUE) - if(stat & MAINT || !on || locked) + if(machine_stat & MAINT || !on || locked) to_chat(user, "The machine appears to be disabled.") return FALSE @@ -326,7 +326,7 @@ /obj/machinery/roulette/update_icon(payout, color, rolled_number, is_winner = FALSE) cut_overlays() - if(stat & MAINT) + if(machine_stat & MAINT) return if(playing) @@ -366,17 +366,17 @@ /obj/machinery/roulette/welder_act(mob/living/user, obj/item/I) . = ..() - if(stat & MAINT) + if(machine_stat & MAINT) to_chat(user, "You start re-attaching the top section of [src]...") if(I.use_tool(src, user, 30, volume=50)) to_chat(user, "You re-attach the top section of [src].") - stat &= ~MAINT + machine_stat &= ~MAINT icon_state = "idle" else to_chat(user, "You start welding the top section from [src]...") if(I.use_tool(src, user, 30, volume=50)) to_chat(user, "You removed the top section of [src].") - stat |= MAINT + machine_stat |= MAINT icon_state = "open" /obj/machinery/roulette/proc/shock(mob/user, prb) diff --git a/code/game/machinery/scan_gate.dm b/code/game/machinery/scan_gate.dm index 2b7807a76e3..398c3d8243e 100644 --- a/code/game/machinery/scan_gate.dm +++ b/code/game/machinery/scan_gate.dm @@ -52,7 +52,7 @@ /obj/machinery/scanner_gate/Crossed(atom/movable/AM) ..() - if(!(stat & (BROKEN|NOPOWER)) && isliving(AM)) + if(!(machine_stat & (BROKEN|NOPOWER)) && isliving(AM)) perform_scan(AM) /obj/machinery/scanner_gate/proc/set_scanline(type, duration) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 3ca2627d194..4059d9d7803 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -98,7 +98,7 @@ for(var/turf/target_tile in range(shield_range, src)) if(isspaceturf(target_tile) && !(locate(/obj/structure/emergency_shield) in target_tile)) - if(!(stat & BROKEN) || prob(33)) + if(!(machine_stat & BROKEN) || prob(33)) deployed_shields += new /obj/structure/emergency_shield(target_tile) /obj/machinery/shieldgen/proc/shields_down() @@ -108,7 +108,7 @@ QDEL_LIST(deployed_shields) /obj/machinery/shieldgen/process() - if((stat & BROKEN) && active) + if((machine_stat & BROKEN) && active) if(deployed_shields.len && prob(5)) qdel(pick(deployed_shields)) @@ -151,7 +151,7 @@ to_chat(user, "You open the panel and expose the wiring.") else to_chat(user, "You close the panel.") - else if(istype(W, /obj/item/stack/cable_coil) && (stat & BROKEN) && panel_open) + else if(istype(W, /obj/item/stack/cable_coil) && (machine_stat & BROKEN) && panel_open) var/obj/item/stack/cable_coil/coil = W if (coil.get_amount() < 1) to_chat(user, "You need one length of cable to repair [src]!") @@ -162,7 +162,7 @@ return coil.use(1) obj_integrity = max_integrity - stat &= ~BROKEN + machine_stat &= ~BROKEN to_chat(user, "You repair \the [src].") update_icon() @@ -205,9 +205,9 @@ /obj/machinery/shieldgen/update_icon_state() if(active) - icon_state = (stat & BROKEN) ? "shieldonbr":"shieldon" + icon_state = (machine_stat & BROKEN) ? "shieldonbr":"shieldon" else - icon_state = (stat & BROKEN) ? "shieldoffbr":"shieldoff" + icon_state = (machine_stat & BROKEN) ? "shieldoffbr":"shieldoff" #define ACTIVE_SETUPFIELDS 1 #define ACTIVE_HASFIELDS 2 diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index d8b744955e8..84619b974dc 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -66,10 +66,10 @@ money++ //SPESSH MAJICKS /obj/machinery/computer/slot_machine/update_icon_state() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) icon_state = "slots0" - else if(stat & BROKEN) + else if(machine_stat & BROKEN) icon_state = "slotsb" else if(working) @@ -177,7 +177,7 @@ /obj/machinery/computer/slot_machine/emp_act(severity) . = ..() - if(stat & (NOPOWER|BROKEN) || . & EMP_PROTECT_SELF) + if(machine_stat & (NOPOWER|BROKEN) || . & EMP_PROTECT_SELF) return if(prob(15 * severity)) return @@ -227,9 +227,9 @@ updateDialog() /obj/machinery/computer/slot_machine/proc/can_spin(mob/user) - if(stat & NOPOWER) + if(machine_stat & NOPOWER) to_chat(user, "The slot machine has no power!") - if(stat & BROKEN) + if(machine_stat & BROKEN) to_chat(user, "The slot machine is broken!") if(working) to_chat(user, "You need to wait until the machine stops spinning before you can play again!") diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 03eb3255700..450a4df1a1a 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -66,7 +66,7 @@ /obj/machinery/space_heater/update_overlays() . = ..() - + if(panel_open) . += "sheater-open" @@ -137,7 +137,7 @@ /obj/machinery/space_heater/emp_act(severity) . = ..() - if(stat & (NOPOWER|BROKEN) || . & EMP_PROTECT_CONTENTS) + if(machine_stat & (NOPOWER|BROKEN) || . & EMP_PROTECT_CONTENTS) return if(cell) cell.emp_act(severity) diff --git a/code/game/machinery/stasis.dm b/code/game/machinery/stasis.dm index c9c68617b95..9b1e3bb4511 100644 --- a/code/game/machinery/stasis.dm +++ b/code/game/machinery/stasis.dm @@ -66,10 +66,10 @@ return stasis_enabled && is_operational() /obj/machinery/stasis/update_icon_state() - if(stat & BROKEN) + if(machine_stat & BROKEN) icon_state = "stasis_broken" return - if(panel_open || stat & MAINT) + if(panel_open || machine_stat & MAINT) icon_state = "stasis_maintenance" return icon_state = "stasis" diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 66bedaa32a2..e04ed7c9745 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -73,7 +73,7 @@ // Timed process - performs default marquee action if so needed. /obj/machinery/status_display/process() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) // No power, no processing. remove_display() return PROCESS_KILL @@ -110,7 +110,7 @@ /obj/machinery/status_display/emp_act(severity) . = ..() - if(stat & (NOPOWER|BROKEN) || . & EMP_PROTECT_SELF) + if(machine_stat & (NOPOWER|BROKEN) || . & EMP_PROTECT_SELF) return set_picture("ai_bsod") @@ -170,7 +170,7 @@ return ..() /obj/machinery/status_display/evac/process() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) // No power, no processing. remove_display() return PROCESS_KILL @@ -226,7 +226,7 @@ name = "supply display" /obj/machinery/status_display/supply/process() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) // No power, no processing. remove_display() return PROCESS_KILL @@ -270,7 +270,7 @@ var/shuttle_id /obj/machinery/status_display/shuttle/process() - if(!shuttle_id || (stat & NOPOWER)) + if(!shuttle_id || (machine_stat & NOPOWER)) // No power, no processing. remove_display() return PROCESS_KILL @@ -319,7 +319,7 @@ user.ai_statuschange() /obj/machinery/status_display/ai/process() - if(mode == SD_BLANK || (stat & NOPOWER)) + if(mode == SD_BLANK || (machine_stat & NOPOWER)) remove_display() return PROCESS_KILL diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 4677473bf50..6cfb708cbd0 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -163,7 +163,7 @@ else . += "uv" else if(state_open) - if(stat & BROKEN) + if(machine_stat & BROKEN) . += "broken" else . += "open" diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 157f641f983..189f0658e5a 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -10,7 +10,7 @@ anchored = FALSE density = TRUE layer = BELOW_MOB_LAYER //so people can't hide it and it's REALLY OBVIOUS - stat = 0 + machine_stat = 0 verb_say = "states" var/cooldown = 0 diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm index 0ab93b1474a..ff9385d72ec 100644 --- a/code/game/machinery/telecomms/computers/message.dm +++ b/code/game/machinery/telecomms/computers/message.dm @@ -3,7 +3,7 @@ Lets you read PDA and request console messages. */ -#define LINKED_SERVER_NONRESPONSIVE (!linkedServer || (linkedServer.stat & (NOPOWER|BROKEN))) +#define LINKED_SERVER_NONRESPONSIVE (!linkedServer || (linkedServer.machine_stat & (NOPOWER|BROKEN))) #define MSG_MON_SCREEN_MAIN 0 #define MSG_MON_SCREEN_LOGS 1 diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 21b07974f54..d70d03ac4e2 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -125,7 +125,7 @@ GLOBAL_LIST_EMPTY(telecomms_list) /obj/machinery/telecomms/proc/update_power() if(toggled) - if(stat & (BROKEN|NOPOWER|EMPED)) // if powered, on. if not powered, off. if too damaged, off + if(machine_stat & (BROKEN|NOPOWER|EMPED)) // if powered, on. if not powered, off. if too damaged, off on = FALSE else on = TRUE @@ -145,10 +145,10 @@ GLOBAL_LIST_EMPTY(telecomms_list) . = ..() if(. & EMP_PROTECT_SELF) return - if(prob(100/severity) && !(stat & EMPED)) - stat |= EMPED + if(prob(100/severity) && !(machine_stat & EMPED)) + machine_stat |= EMPED var/duration = (300 * 10)/severity addtimer(CALLBACK(src, .proc/de_emp), rand(duration - 20, duration + 20)) /obj/machinery/telecomms/proc/de_emp() - stat &= ~EMPED + machine_stat &= ~EMPED diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index ce80976f9c8..6830c8f18c9 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -94,7 +94,7 @@ icon_state = "tele0" /obj/machinery/teleport/hub/proc/is_ready() - . = !panel_open && !(stat & (BROKEN|NOPOWER)) && power_station && power_station.engaged && !(power_station.stat & (BROKEN|NOPOWER)) + . = !panel_open && !(machine_stat & (BROKEN|NOPOWER)) && power_station && power_station.engaged && !(power_station.machine_stat & (BROKEN|NOPOWER)) /obj/machinery/teleport/hub/syndicate/Initialize() . = ..() @@ -195,10 +195,10 @@ toggle(user) /obj/machinery/teleport/station/proc/toggle(mob/user) - if(stat & (BROKEN|NOPOWER) || !teleporter_hub || !teleporter_console ) + if(machine_stat & (BROKEN|NOPOWER) || !teleporter_hub || !teleporter_console ) return if (teleporter_console.target) - if(teleporter_hub.panel_open || teleporter_hub.stat & (BROKEN|NOPOWER)) + if(teleporter_hub.panel_open || teleporter_hub.machine_stat & (BROKEN|NOPOWER)) to_chat(user, "The teleporter hub isn't responding.") else engaged = !engaged @@ -218,7 +218,7 @@ /obj/machinery/teleport/station/update_icon_state() if(panel_open) icon_state = "controller-o" - else if(stat & (BROKEN|NOPOWER)) + else if(machine_stat & (BROKEN|NOPOWER)) icon_state = "controller-p" else if(teleporter_console && teleporter_console.calibrating) icon_state = "controller-c" diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index 1256543e8f8..794d886e64d 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -35,7 +35,7 @@ . = ..() /obj/machinery/transformer/update_icon_state() - if(stat & (BROKEN|NOPOWER) || cooldown == 1) + if(machine_stat & (BROKEN|NOPOWER) || cooldown == 1) icon_state = "separator-AO0" else icon_state = initial(icon_state) @@ -68,7 +68,7 @@ update_icon() /obj/machinery/transformer/proc/do_transform(mob/living/carbon/human/H) - if(stat & (BROKEN|NOPOWER)) + if(machine_stat & (BROKEN|NOPOWER)) return if(cooldown == 1) return diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index 7e48e9aed73..b9d3912852c 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -50,7 +50,7 @@ . += "The status display reads: Base recharge rate at [max_charge]J per cycle." /obj/machinery/mech_bay_recharge_port/process() - if(stat & NOPOWER || !recharge_console) + if(machine_stat & NOPOWER || !recharge_console) return if(!recharging_mech) recharging_mech = locate(/obj/mecha) in recharging_turf @@ -139,7 +139,7 @@ /obj/machinery/computer/mech_bay_power_console/update_overlays() . = ..() - if(!recharge_port || !recharge_port.recharging_mech || !recharge_port.recharging_mech.cell || !(recharge_port.recharging_mech.cell.charge < recharge_port.recharging_mech.cell.maxcharge) || stat & (NOPOWER|BROKEN)) + if(!recharge_port || !recharge_port.recharging_mech || !recharge_port.recharging_mech.cell || !(recharge_port.recharging_mech.cell.charge < recharge_port.recharging_mech.cell.maxcharge) || machine_stat & (NOPOWER|BROKEN)) return . += "recharge_comp_on" diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 84287b3da3d..4e474b464c9 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -212,7 +212,7 @@ return temp = null while(D) - if(stat&(NOPOWER|BROKEN)) + if(machine_stat&(NOPOWER|BROKEN)) return FALSE if(build_part(D)) remove_from_queue(1) @@ -399,11 +399,11 @@ updateUsrDialog() return -/obj/machinery/mecha_part_fabricator/proc/do_process_queue() - if(processing_queue || being_built) - return FALSE +/obj/machinery/mecha_part_fabricator/proc/do_process_queue() + if(processing_queue || being_built) + return FALSE processing_queue = 1 - process_queue() + process_queue() processing_queue = 0 /obj/machinery/mecha_part_fabricator/proc/eject_sheets(eject_sheet, eject_amt) diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 4ba26fd5ff8..d3f5a323d1f 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -263,7 +263,7 @@ Code: var/turf/pda_turf = get_turf(src) for(var/obj/machinery/computer/monitor/pMon in GLOB.machines) - if(pMon.stat & (NOPOWER | BROKEN)) //check to make sure the computer is functional + if(pMon.machine_stat & (NOPOWER | BROKEN)) //check to make sure the computer is functional continue if(pda_turf.z != pMon.z) //and that we're on the same zlevel as the computer (lore: limited signal strength) continue diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index 10708c1be26..e4ccba2341e 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -78,7 +78,7 @@ if( world.time > (last_net_update + 100)) bugged_cameras = list() for(var/obj/machinery/camera/camera in GLOB.cameranet.cameras) - if(camera.stat || !camera.can_use()) + if(camera.machine_stat || !camera.can_use()) continue if(length(list("ss13","mine", "rd", "labor", "toxins", "minisat")&camera.network)) bugged_cameras[camera.c_tag] = camera diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 754f0af7fe9..a546f68dc01 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -172,7 +172,7 @@ if(mode == "draw") if(is_type_in_list(target, charge_machines)) var/obj/machinery/M = target - if((M.stat & (NOPOWER|BROKEN)) || !M.anchored) + if((M.machine_stat & (NOPOWER|BROKEN)) || !M.anchored) to_chat(user, "[M] is unpowered!") return @@ -181,7 +181,7 @@ if(!user || !user.cell || mode != "draw") return - if((M.stat & (NOPOWER|BROKEN)) || !M.anchored) + if((M.machine_stat & (NOPOWER|BROKEN)) || !M.anchored) break if(!user.cell.give(150)) @@ -877,7 +877,7 @@ /obj/item/borg/apparatus/beaker/extra name = "secondary beaker storage apparatus" desc = "A supplementary beaker storage apparatus." - + /obj/item/borg/apparatus/beaker/service name = "beverage storage apparatus" desc = "A special apparatus for carrying drinks without spilling the contents. Alt-Z or right-click to drop the beaker." diff --git a/code/modules/NTNet/relays.dm b/code/modules/NTNet/relays.dm index 83510caaefb..43c6334d65b 100644 --- a/code/modules/NTNet/relays.dm +++ b/code/modules/NTNet/relays.dm @@ -27,7 +27,7 @@ // TODO: Implement more logic here. For now it's only a placeholder. /obj/machinery/ntnet_relay/is_operational() - if(stat & (BROKEN | NOPOWER | EMPED)) + if(machine_stat & (BROKEN | NOPOWER | EMPED)) return FALSE if(dos_failure) return FALSE diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index cb94c22b481..7a749cd11f6 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -445,7 +445,7 @@ /obj/machinery/airalarm/proc/shock(mob/user, prb) - if((stat & (NOPOWER))) // unpowered, no shock + if((machine_stat & (NOPOWER))) // unpowered, no shock return 0 if(!prob(prb)) return 0 //you lucked out, no shock for you @@ -621,7 +621,7 @@ icon_state = "alarm_b1" return - if((stat & (NOPOWER|BROKEN)) || shorted) + if((machine_stat & (NOPOWER|BROKEN)) || shorted) icon_state = "alarmp" return @@ -635,7 +635,7 @@ icon_state = "alarm1" /obj/machinery/airalarm/process() - if((stat & (NOPOWER|BROKEN)) || shorted) + if((machine_stat & (NOPOWER|BROKEN)) || shorted) return var/turf/location = get_turf(src) @@ -698,7 +698,7 @@ var/new_area_danger_level = 0 for(var/obj/machinery/airalarm/AA in A) - if (!(AA.stat & (NOPOWER|BROKEN)) && !AA.shorted) + if (!(AA.machine_stat & (NOPOWER|BROKEN)) && !AA.shorted) new_area_danger_level = max(new_area_danger_level,AA.danger_level) if(A.atmosalert(new_area_danger_level,src)) //if area was in normal state or if area was in alert state post_alert(new_area_danger_level) @@ -812,7 +812,7 @@ togglelock(user) /obj/machinery/airalarm/proc/togglelock(mob/living/user) - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) to_chat(user, "It does nothing!") else if(src.allowed(usr) && !wires.is_cut(WIRE_IDSCAN)) diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index d6cb750e7de..9a10a605038 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -59,7 +59,7 @@ icon_state = "meterX" return 0 - if(stat & (BROKEN|NOPOWER)) + if(machine_stat & (BROKEN|NOPOWER)) icon_state = "meter0" return 0 @@ -130,7 +130,7 @@ qdel(src) /obj/machinery/meter/interact(mob/user) - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return else to_chat(user, status()) diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index d21ce226be8..3eb8e809202 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -202,7 +202,7 @@ create_gas() pump = new(src, FALSE) pump.on = TRUE - pump.stat = 0 + pump.machine_stat = 0 pump.build_network() /obj/machinery/portable_atmospherics/canister/Destroy() @@ -225,9 +225,9 @@ air_contents.gases[/datum/gas/nitrogen][MOLES] = (N2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature) /obj/machinery/portable_atmospherics/canister/update_icon_state() - if(stat & BROKEN) + if(machine_stat & BROKEN) icon_state = "[icon_state]-1" - + /obj/machinery/portable_atmospherics/canister/update_overlays() . = ..() if(holding) @@ -251,7 +251,7 @@ /obj/machinery/portable_atmospherics/canister/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) canister_break() if(disassembled) new /obj/item/stack/sheet/metal (loc, 10) @@ -264,7 +264,7 @@ if(user.a_intent == INTENT_HARM) return FALSE - if(stat & BROKEN) + if(machine_stat & BROKEN) if(!I.tool_start_check(user, amount=0)) return TRUE to_chat(user, "You begin cutting [src] apart...") @@ -309,7 +309,7 @@ /obj/machinery/portable_atmospherics/canister/process_atmos() ..() - if(stat & BROKEN) + if(machine_stat & BROKEN) return PROCESS_KILL if(timing && valve_timer < world.time) valve_open = !valve_open diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm index 715f90b0030..3df41bcf501 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -119,7 +119,7 @@ /obj/machinery/portable_atmospherics/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/tank)) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) var/obj/item/tank/T = W if(!user.transferItemToLoc(T, src)) return @@ -128,7 +128,7 @@ replace_tank(user, FALSE, T) update_icon() else if(W.tool_behaviour == TOOL_WRENCH) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) if(connected_port) investigate_log("was disconnected from [connected_port] by [key_name(user)].
", INVESTIGATE_ATMOS) disconnect() @@ -158,7 +158,7 @@ return ..() /obj/machinery/portable_atmospherics/attacked_by(obj/item/I, mob/user) - if(I.force < 10 && !(stat & BROKEN)) + if(I.force < 10 && !(machine_stat & BROKEN)) take_damage(0) else investigate_log("was smacked with \a [I] by [key_name(user)].", INVESTIGATE_ATMOS) diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm index 2828e288ad6..4eb2579c3fa 100644 --- a/code/modules/atmospherics/machinery/portable/pump.dm +++ b/code/modules/atmospherics/machinery/portable/pump.dm @@ -21,7 +21,7 @@ . = ..() pump = new(src, FALSE) pump.on = TRUE - pump.stat = 0 + pump.machine_stat = 0 pump.build_network() /obj/machinery/portable_atmospherics/pump/Destroy() diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index d50abb85cad..3fc498b9f16 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -107,7 +107,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation) icon_state = "offcenter" /obj/machinery/gateway/centerstation/process() - if((stat & (NOPOWER)) && use_power) + if((machine_stat & (NOPOWER)) && use_power) if(active) toggleoff() return diff --git a/code/modules/cargo/blackmarket/blackmarket_telepad.dm b/code/modules/cargo/blackmarket/blackmarket_telepad.dm index e2b36e4b1e1..81b29375046 100644 --- a/code/modules/cargo/blackmarket/blackmarket_telepad.dm +++ b/code/modules/cargo/blackmarket/blackmarket_telepad.dm @@ -69,7 +69,7 @@ queue += purchase /obj/machinery/ltsrbt/process() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) return if(recharge_cooldown) diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 11f6a778cf4..284e4e8aca0 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -143,7 +143,7 @@ //interrupt_research /obj/machinery/shuttle_scrambler/proc/interrupt_research() for(var/obj/machinery/rnd/server/S in GLOB.machines) - if(S.stat & (NOPOWER|BROKEN)) + if(S.machine_stat & (NOPOWER|BROKEN)) continue S.emp_act(1) new /obj/effect/temp_visual/emp(get_turf(S)) diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 4473c82590e..04248903157 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -42,7 +42,7 @@ . = ..() if (dirty) . +="grbloody" - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return if (!occupant) . += "grjam" @@ -64,7 +64,7 @@ . = ..() if(.) return - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return if(operating) to_chat(user, "It's locked and running.") diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index 9deb1d0ff12..72fc79754fd 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -82,7 +82,7 @@ else . += "\The [src] is empty." - if(!(stat & (NOPOWER|BROKEN))) + if(!(machine_stat & (NOPOWER|BROKEN))) . += "The status display reads:\n"+\ "- Capacity: [max_n_of_items] items.\n"+\ "- Cook time reduced by [(efficiency - 1) * 25]%." @@ -196,7 +196,7 @@ if(operating || panel_open || !anchored || !user.canUseTopic(src, !issilicon(user))) return - if(isAI(user) && (stat & NOPOWER)) + if(isAI(user) && (machine_stat & NOPOWER)) return if(!length(ingredients)) @@ -211,7 +211,7 @@ // post choice verification if(operating || panel_open || !anchored || !user.canUseTopic(src, !issilicon(user))) return - if(isAI(user) && (stat & NOPOWER)) + if(isAI(user) && (machine_stat & NOPOWER)) return usr.set_machine(src) @@ -230,7 +230,7 @@ ingredients.Cut() /obj/machinery/microwave/proc/cook() - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return if(operating || broken > 0 || panel_open || !anchored || dirty == 100) return @@ -286,7 +286,7 @@ loop(MICROWAVE_MUCK, 4) /obj/machinery/microwave/proc/loop(type, time, wait = max(12 - 2 * efficiency, 2)) // standard wait is 10 - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) if(type == MICROWAVE_PRE) pre_fail() return diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm index 7edba9e0f12..ec472a72dbd 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm @@ -54,7 +54,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers) if(default_deconstruction_crowbar(O)) return - if(stat) //NOPOWER etc + if(machine_stat) //NOPOWER etc return else return ..() diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index b7dd49fb9a0..e493dbe2571 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -42,7 +42,7 @@ . += "The status display reads: This unit can hold a maximum of [max_n_of_items] items." /obj/machinery/smartfridge/update_icon_state() - if(!stat) + if(!machine_stat) if (visible_contents) switch(contents.len) if(0) @@ -83,7 +83,7 @@ updateUsrDialog() return - if(!stat) + if(!machine_stat) if(contents.len >= max_n_of_items) to_chat(user, "\The [src] is full!") diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index 7b53b51c94a..cbb7abf67df 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -79,7 +79,7 @@ /obj/machinery/computer/holodeck/power_change() . = ..() - toggle_power(!stat) + toggle_power(!machine_stat) /obj/machinery/computer/holodeck/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) @@ -286,7 +286,7 @@ /obj/machinery/computer/holodeck/proc/derez(obj/O, silent = TRUE, forced = FALSE) // Emagging a machine creates an anomaly in the derez systems. - if(O && (obj_flags & EMAGGED) && !stat && !forced) + if(O && (obj_flags & EMAGGED) && !machine_stat && !forced) if((ismob(O) || ismob(O.loc)) && prob(50)) addtimer(CALLBACK(src, .proc/derez, O, silent), 50) // may last a disturbingly long time return diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm index 7c481d7fec9..ac8ceb57ca8 100644 --- a/code/modules/holodeck/items.dm +++ b/code/modules/holodeck/items.dm @@ -171,7 +171,7 @@ . = ..() if(.) return - if(user.stat || stat & (NOPOWER|BROKEN)) + if(user.stat || machine_stat & (NOPOWER|BROKEN)) to_chat(user, "This device is not powered!") return diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index ee99c14e100..0e2f430d107 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -152,7 +152,7 @@ to_chat(user, "You cannot put this in [src.name]!") /obj/machinery/biogenerator/ui_interact(mob/user) - if(stat & BROKEN || panel_open) + if(machine_stat & BROKEN || panel_open) return . = ..() var/dat @@ -211,7 +211,7 @@ /obj/machinery/biogenerator/proc/activate() if (usr.stat != CONSCIOUS) return - if (src.stat != NONE) //NOPOWER etc + if (src.machine_stat != NONE) //NOPOWER etc return if(processing) to_chat(usr, "The biogenerator is in the process of working.") diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm index a1e2093e0df..eab5d28462e 100644 --- a/code/modules/hydroponics/gene_modder.dm +++ b/code/modules/hydroponics/gene_modder.dm @@ -54,7 +54,7 @@ min_wrate = 0 /obj/machinery/plantgenes/update_icon_state() - if((stat & (BROKEN|NOPOWER))) + if((machine_stat & (BROKEN|NOPOWER))) icon_state = "dnamod-off" else icon_state = "dnamod" diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm index 15410add9ba..c1bf3b359ab 100644 --- a/code/modules/hydroponics/seed_extractor.dm +++ b/code/modules/hydroponics/seed_extractor.dm @@ -124,7 +124,7 @@ /obj/machinery/seed_extractor/ui_interact(mob/user) . = ..() - if (stat) + if (machine_stat) return FALSE var/dat = "Stored seeds:
" diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 0354b480c6b..c8ec5cbc736 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -573,7 +573,7 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums return ..() /obj/machinery/bookbinder/proc/bind_book(mob/user, obj/item/paper/P) - if(stat) + if(machine_stat) return if(busy) to_chat(user, "The book binder is busy. Please wait for completion of previous operation.") @@ -586,7 +586,7 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums sleep(rand(200,400)) busy = FALSE if(P) - if(!stat) + if(!machine_stat) visible_message("[src] whirs as it prints and binds a new book.") var/obj/item/book/B = new(src.loc) B.dat = P.info diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index ecb9e24cb76..0ba25c7130d 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -53,7 +53,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also var/obj/machinery/porta_turret/aux_base/T = PDT var/integrity = max((T.obj_integrity-T.integrity_failure * T.max_integrity)/(T.max_integrity-T.integrity_failure * max_integrity)*100, 0) var/status - if(T.stat & BROKEN) + if(T.machine_stat & BROKEN) status = "ERROR" else if(!T.on) status = "Disabled" diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index f7d412c145c..8b1b83db40e 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -936,7 +936,7 @@ malfhacking = 0 clear_alert("hackingapc") - if(!istype(apc) || QDELETED(apc) || apc.stat & BROKEN) + if(!istype(apc) || QDELETED(apc) || apc.machine_stat & BROKEN) to_chat(src, "Hack aborted. The designated APC no longer exists on the power network.") playsound(get_turf(src), 'sound/machines/buzz-two.ogg', 50, TRUE, ignore_walls = FALSE) else if(apc.aidisabled) diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm index bc5ace42214..b3af8b1ef6f 100644 --- a/code/modules/mob/living/silicon/ai/life.dm +++ b/code/modules/mob/living/silicon/ai/life.dm @@ -122,7 +122,7 @@ AIarea = get_area(src) if(AIarea) for (var/obj/machinery/power/apc/APC in AIarea) - if (!(APC.stat & BROKEN)) + if (!(APC.machine_stat & BROKEN)) theAPC = APC break if (!theAPC) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index cff630c2ebf..256ca48f245 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -226,7 +226,7 @@ return FALSE if(P.has_cover &&!P.raised) //Don't attack invincible turrets return FALSE - if(P.stat & BROKEN) //Or turrets that are already broken + if(P.machine_stat & BROKEN) //Or turrets that are already broken return FALSE return TRUE diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm index 2a252fe1375..ab777e82152 100644 --- a/code/modules/modular_computers/computers/machinery/modular_computer.dm +++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm @@ -55,7 +55,7 @@ icon_state = icon_state_powered if(!cpu || !cpu.enabled) - if (!(stat & NOPOWER) && (cpu && cpu.use_power())) + if (!(machine_stat & NOPOWER) && (cpu && cpu.use_power())) add_overlay(screen_icon_screensaver) else icon_state = icon_state_unpowered @@ -121,13 +121,13 @@ visible_message("\The [src]'s screen flickers [battery_module ? "\"BATTERY [malfunction ? "MALFUNCTION" : "CRITICAL"]\"" : "\"EXTERNAL POWER LOSS\""] warning as it shuts down unexpectedly.") if(cpu) cpu.shutdown_computer(0) - stat |= NOPOWER + machine_stat |= NOPOWER update_icon() // Modular computers can have battery in them, we handle power in previous proc, so prevent this from messing it up for us. /obj/machinery/modular_computer/power_change() if(cpu && cpu.use_power()) // If MC_CPU still has a power source, PC wouldn't go offline. - stat &= ~NOPOWER + machine_stat &= ~NOPOWER update_icon() return . = ..() diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index 871cbd51d2b..9bee5681b28 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -225,7 +225,7 @@ return FALSE /obj/machinery/lapvend/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) - if(stat & (BROKEN | NOPOWER | MAINT)) + if(machine_stat & (BROKEN | NOPOWER | MAINT)) if(ui) ui.close() return FALSE diff --git a/code/modules/plumbing/plumbers/acclimator.dm b/code/modules/plumbing/plumbers/acclimator.dm index 6a0f8d52fb1..d2bc505d7d1 100644 --- a/code/modules/plumbing/plumbers/acclimator.dm +++ b/code/modules/plumbing/plumbers/acclimator.dm @@ -34,7 +34,7 @@ AddComponent(/datum/component/plumbing/acclimator, bolt) /obj/machinery/plumbing/acclimator/process() - if(stat & NOPOWER || !enabled || !reagents.total_volume || reagents.chem_temp == target_temperature) + if(machine_stat & NOPOWER || !enabled || !reagents.total_volume || reagents.chem_temp == target_temperature) if(acclimate_state != NEUTRAL) acclimate_state = NEUTRAL update_icon() diff --git a/code/modules/plumbing/plumbers/destroyer.dm b/code/modules/plumbing/plumbers/destroyer.dm index 2c80143d839..8e08b609919 100644 --- a/code/modules/plumbing/plumbers/destroyer.dm +++ b/code/modules/plumbing/plumbers/destroyer.dm @@ -10,7 +10,7 @@ AddComponent(/datum/component/plumbing/simple_demand, bolt) /obj/machinery/plumbing/disposer/process() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) return if(reagents.total_volume) if(icon_state != initial(icon_state) + "_working") //threw it here instead of update icon since it only has two states diff --git a/code/modules/plumbing/plumbers/grinder_chemical.dm b/code/modules/plumbing/plumbers/grinder_chemical.dm index 9f10ff3ac44..87f68a85c32 100644 --- a/code/modules/plumbing/plumbers/grinder_chemical.dm +++ b/code/modules/plumbing/plumbers/grinder_chemical.dm @@ -44,7 +44,7 @@ grind(AM) /obj/machinery/plumbing/grinder_chemical/proc/grind(atom/AM) - if(stat & NOPOWER) + if(machine_stat & NOPOWER) return if(reagents.holder_full()) return diff --git a/code/modules/plumbing/plumbers/pill_press.dm b/code/modules/plumbing/plumbers/pill_press.dm index a41c041b868..6731f2f3dcf 100644 --- a/code/modules/plumbing/plumbers/pill_press.dm +++ b/code/modules/plumbing/plumbers/pill_press.dm @@ -41,7 +41,7 @@ pill_styles += list(SL) /obj/machinery/plumbing/pill_press/process() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) return if(reagents.total_volume >= pill_size) var/obj/item/reagent_containers/pill/P = new(src) @@ -50,7 +50,7 @@ stored_pills += P if(pill_number == RANDOM_PILL_STYLE) P.icon_state = "pill[rand(1,21)]" - else + else P.icon_state = "pill[pill_number]" if(P.icon_state == "pill4") //mirrored from chem masters P.desc = "A tablet or capsule, but not just any, a red one, one taken by the ones not scared of knowledge, freedom, uncertainty and the brutal truths of reality." @@ -64,7 +64,7 @@ var/atom/movable/AM = stored_pills[1] //AM because forceMove is all we need stored_pills -= AM AM.forceMove(drop_location()) - + /obj/machinery/plumbing/pill_press/ui_base_html(html) var/datum/asset/spritesheet/simple/assets = get_asset_datum(/datum/asset/spritesheet/simple/pills) @@ -99,5 +99,5 @@ var/new_name = html_encode(params["name"]) if(findtext(new_name, "pill")) //names like pillatron and Pilliam are thus valid pill_name = new_name - else + else pill_name = new_name + " pill" diff --git a/code/modules/plumbing/plumbers/synthesizer.dm b/code/modules/plumbing/plumbers/synthesizer.dm index c4ab3447f6e..690a3d7f8c4 100644 --- a/code/modules/plumbing/plumbers/synthesizer.dm +++ b/code/modules/plumbing/plumbers/synthesizer.dm @@ -54,7 +54,7 @@ AddComponent(/datum/component/plumbing/simple_supply, bolt) /obj/machinery/plumbing/synthesizer/process() - if(stat & NOPOWER || !reagent_id || !amount) + if(machine_stat & NOPOWER || !reagent_id || !amount) return if(reagents.total_volume >= amount) //otherwise we get leftovers, and we need this to be precise return diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index bc0709549e6..ccbe8a06461 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -189,7 +189,7 @@ opened = APC_COVER_OPENED operating = FALSE name = "\improper [get_area_name(area, TRUE)] APC" - stat |= MAINT + machine_stat |= MAINT update_icon() addtimer(CALLBACK(src, .proc/update), 5) @@ -257,7 +257,7 @@ /obj/machinery/power/apc/examine(mob/user) . = ..() - if(stat & BROKEN) + if(machine_stat & BROKEN) return if(opened) if(has_electronics && terminal) @@ -266,7 +266,7 @@ . += {"It's [ !terminal ? "not" : "" ] wired up.\n The electronics are[!has_electronics?"n't":""] installed."} else - if (stat & MAINT) + if (machine_stat & MAINT) . += "The cover is closed. Something is wrong with it. It doesn't work." else if (malfhack) . += "The cover is broken. It may be hard to force it open." @@ -317,7 +317,7 @@ if(update & 2) SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays) - if(!(stat & (BROKEN|MAINT)) && update_state & UPSTATE_ALLGOOD) + if(!(machine_stat & (BROKEN|MAINT)) && update_state & UPSTATE_ALLGOOD) SSvis_overlays.add_vis_overlay(src, icon, "apcox-[locked]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir) SSvis_overlays.add_vis_overlay(src, icon, "apco3-[charging]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir) if(operating) @@ -351,9 +351,9 @@ if(cell) update_state |= UPSTATE_CELL_IN - if(stat & BROKEN) + if(machine_stat & BROKEN) update_state |= UPSTATE_BROKE - if(stat & MAINT) + if(machine_stat & MAINT) update_state |= UPSTATE_MAINT if(opened) if(opened==APC_COVER_OPENED) @@ -430,7 +430,7 @@ if(W.use_tool(src, user, 50)) if (has_electronics == APC_ELECTRONICS_INSTALLED) has_electronics = APC_ELECTRONICS_MISSING - if (stat & BROKEN) + if (machine_stat & BROKEN) user.visible_message("[user.name] has broken the power control board inside [src.name]!",\ "You break the charred power control board and remove the remains.", "You hear a crack.") @@ -456,8 +456,8 @@ coverlocked = TRUE //closing cover relocks it update_icon() return - else if (!(stat & BROKEN)) - if(coverlocked && !(stat & MAINT)) // locked... + else if (!(machine_stat & BROKEN)) + if(coverlocked && !(machine_stat & MAINT)) // locked... to_chat(user, "The cover is locked and cannot be opened!") return else if (panel_open) @@ -486,12 +486,12 @@ switch (has_electronics) if (APC_ELECTRONICS_INSTALLED) has_electronics = APC_ELECTRONICS_SECURED - stat &= ~MAINT + machine_stat &= ~MAINT W.play_tool_sound(src) to_chat(user, "You screw the circuit electronics into place.") if (APC_ELECTRONICS_SECURED) has_electronics = APC_ELECTRONICS_INSTALLED - stat |= MAINT + machine_stat |= MAINT W.play_tool_sound(src) to_chat(user, "You unfasten the electronics.") else @@ -522,7 +522,7 @@ "You start welding the APC frame...", \ "You hear welding.") if(W.use_tool(src, user, 50, volume=50, amount=3)) - if ((stat & BROKEN) || opened==APC_COVER_REMOVED) + if ((machine_stat & BROKEN) || opened==APC_COVER_REMOVED) new /obj/item/stack/sheet/metal(loc) user.visible_message("[user.name] has cut [src] apart with [W].",\ "You disassembled the broken APC frame.") @@ -543,7 +543,7 @@ to_chat(user, "There is a power cell already installed!") return else - if (stat & MAINT) + if (machine_stat & MAINT) to_chat(user, "There is no connector for your power cell!") return if(!user.transferItemToLoc(W, src)) @@ -593,7 +593,7 @@ if (has_electronics) to_chat(user, "There is already a board inside the [src]!") return - else if (stat & BROKEN) + else if (machine_stat & BROKEN) to_chat(user, "You cannot put the board inside, the frame is damaged!") return @@ -609,7 +609,7 @@ else if(istype(W, /obj/item/electroadaptive_pseudocircuit) && opened) var/obj/item/electroadaptive_pseudocircuit/P = W if(!has_electronics) - if(stat & BROKEN) + if(machine_stat & BROKEN) to_chat(user, "[src]'s frame is too damaged to support a circuit.") return if(!P.adapt_circuit(user, 50)) @@ -619,7 +619,7 @@ has_electronics = APC_ELECTRONICS_INSTALLED locked = FALSE else if(!cell) - if(stat & MAINT) + if(machine_stat & MAINT) to_chat(user, "There's no connector for a power cell.") return if(!P.adapt_circuit(user, 500)) @@ -635,10 +635,10 @@ to_chat(user, "[src] has both electronics and a cell.") return else if (istype(W, /obj/item/wallframe/apc) && opened) - if (!(stat & BROKEN || opened==APC_COVER_REMOVED || obj_integrity < max_integrity)) // There is nothing to repair + if (!(machine_stat & BROKEN || opened==APC_COVER_REMOVED || obj_integrity < max_integrity)) // There is nothing to repair to_chat(user, "You found no reason for repairing this APC!") return - if (!(stat & BROKEN) && opened==APC_COVER_REMOVED) // Cover is the only thing broken, we do not need to remove elctronicks to replace cover + if (!(machine_stat & BROKEN) && opened==APC_COVER_REMOVED) // Cover is the only thing broken, we do not need to remove elctronicks to replace cover user.visible_message("[user.name] replaces missing APC's cover.", \ "You begin to replace APC's cover...") if(do_after(user, 20, target = src)) // replacing cover is quicker than replacing whole frame @@ -655,7 +655,7 @@ if(do_after(user, 50, target = src)) to_chat(user, "You replace the damaged APC frame with a new one.") qdel(W) - stat &= ~BROKEN + machine_stat &= ~BROKEN obj_integrity = max_integrity if (opened==APC_COVER_REMOVED) opened = APC_COVER_OPENED @@ -669,12 +669,12 @@ /obj/machinery/power/apc/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) if(the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS) if(!has_electronics) - if(stat & BROKEN) + if(machine_stat & BROKEN) to_chat(user, "[src]'s frame is too damaged to support a circuit.") return FALSE return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 20, "cost" = 1) else if(!cell) - if(stat & MAINT) + if(machine_stat & MAINT) to_chat(user, "There's no connector for a power cell.") return FALSE return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 50, "cost" = 10) //16 for a wall @@ -687,7 +687,7 @@ switch(passed_mode) if(RCD_UPGRADE_SIMPLE_CIRCUITS) if(!has_electronics) - if(stat & BROKEN) + if(machine_stat & BROKEN) to_chat(user, "[src]'s frame is too damaged to support a circuit.") return user.visible_message("[user] fabricates a circuit and places it into [src].", \ @@ -696,7 +696,7 @@ locked = TRUE return TRUE else if(!cell) - if(stat & MAINT) + if(machine_stat & MAINT) to_chat(user, "There's no connector for a power cell.") return FALSE var/obj/item/stock_parts/cell/crap/empty/C = new(src) @@ -726,7 +726,7 @@ to_chat(user, "You must close the cover to swipe an ID card!") else if(panel_open) to_chat(user, "You must close the panel!") - else if(stat & (BROKEN|MAINT)) + else if(machine_stat & (BROKEN|MAINT)) to_chat(user, "Nothing happens!") else if(allowed(usr) && !wires.is_cut(WIRE_IDSCAN) && !malfhack) @@ -745,7 +745,7 @@ set_nightshift(!nightshift_lights) /obj/machinery/power/apc/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) - if(stat & BROKEN) + if(machine_stat & BROKEN) return damage_amount . = ..() @@ -756,7 +756,7 @@ /obj/machinery/power/apc/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) set_broken() if(opened != APC_COVER_REMOVED) opened = APC_COVER_REMOVED @@ -770,7 +770,7 @@ to_chat(user, "You must close the cover to swipe an ID card!") else if(panel_open) to_chat(user, "You must close the panel first!") - else if(stat & (BROKEN|MAINT)) + else if(machine_stat & (BROKEN|MAINT)) to_chat(user, "Nothing happens!") else flick("apc-spark", src) @@ -838,7 +838,7 @@ charging = APC_NOT_CHARGING src.update_icon() return - if((stat & MAINT) && !opened) //no board; no interface + if((machine_stat & MAINT) && !opened) //no board; no interface return /obj/machinery/power/apc/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ @@ -964,7 +964,7 @@ switch(action) if("lock") if(usr.has_unlimited_silicon_privilege) - if((obj_flags & EMAGGED) || (stat & (BROKEN|MAINT))) + if((obj_flags & EMAGGED) || (machine_stat & (BROKEN|MAINT))) to_chat(usr, "The APC does not respond to the command!") else locked = !locked @@ -1170,7 +1170,7 @@ /obj/machinery/power/apc/process() if(icon_update_needed) update_icon() - if(stat & (BROKEN|MAINT)) + if(machine_stat & (BROKEN|MAINT)) return if(!area.requires_power) return diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 377891971b0..43945a67490 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -32,7 +32,7 @@ /obj/machinery/power/generator/update_overlays() . = ..() - if(!(stat & (NOPOWER|BROKEN))) + if(!(machine_stat & (NOPOWER|BROKEN))) var/L = min(round(lastgenlev/100000),11) if(L != 0) . += mutable_appearance('icons/obj/power.dmi', "teg-op[L]") diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 7c92a29caf2..4a2165b6952 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -59,7 +59,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne obj_break() /obj/machinery/gravity_generator/proc/set_fix() - stat &= ~BROKEN + machine_stat &= ~BROKEN /obj/machinery/gravity_generator/part/Destroy() if(main_part) @@ -85,7 +85,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne /obj/machinery/gravity_generator/part/set_broken() ..() - if(main_part && !(main_part.stat & BROKEN)) + if(main_part && !(main_part.machine_stat & BROKEN)) main_part.set_broken() // @@ -165,7 +165,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne /obj/machinery/gravity_generator/main/set_broken() ..() for(var/obj/machinery/gravity_generator/M in parts) - if(!(M.stat & BROKEN)) + if(!(M.machine_stat & BROKEN)) M.set_broken() middle.cut_overlays() charge_count = 0 @@ -177,7 +177,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne /obj/machinery/gravity_generator/main/set_fix() ..() for(var/obj/machinery/gravity_generator/M in parts) - if(M.stat & BROKEN) + if(M.machine_stat & BROKEN) M.set_fix() broken_state = FALSE update_icon() @@ -236,7 +236,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne data["charge_count"] = charge_count data["charging_state"] = charging_state data["on"] = on - data["operational"] = (stat & BROKEN) ? FALSE : TRUE + data["operational"] = (machine_stat & BROKEN) ? FALSE : TRUE return data @@ -255,18 +255,18 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne /obj/machinery/gravity_generator/main/power_change() . = ..() - investigate_log("has [stat & NOPOWER ? "lost" : "regained"] power.", INVESTIGATE_GRAVITY) + investigate_log("has [machine_stat & NOPOWER ? "lost" : "regained"] power.", INVESTIGATE_GRAVITY) set_power() /obj/machinery/gravity_generator/main/get_status() - if(stat & BROKEN) + if(machine_stat & BROKEN) return "fix[min(broken_state, 3)]" return on || charging_state != POWER_IDLE ? "on" : "off" // Set the charging state based on power/breaker. /obj/machinery/gravity_generator/main/proc/set_power() var/new_state = FALSE - if(stat & (NOPOWER|BROKEN) || !breaker) + if(machine_stat & (NOPOWER|BROKEN) || !breaker) new_state = FALSE else if(breaker) new_state = TRUE @@ -303,7 +303,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne // Charge/Discharge and turn on/off gravity when you reach 0/100 percent. // Also emit radiation and handle the overlays. /obj/machinery/gravity_generator/main/process() - if(stat & BROKEN) + if(machine_stat & BROKEN) return if(charging_state != POWER_IDLE) if(charging_state == POWER_UP && charge_count >= 100) diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index ef65cb702f3..4552bdc9346 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -118,18 +118,18 @@ */ /obj/machinery/proc/power_change() SHOULD_CALL_PARENT(1) - if(stat & BROKEN) + if(machine_stat & BROKEN) return if(powered(power_channel)) - if(stat & NOPOWER) + if(machine_stat & NOPOWER) SEND_SIGNAL(src, COMSIG_MACHINERY_POWER_RESTORED) . = TRUE - stat &= ~NOPOWER + machine_stat &= ~NOPOWER else - if(!(stat & NOPOWER)) + if(!(machine_stat & NOPOWER)) SEND_SIGNAL(src, COMSIG_MACHINERY_POWER_LOST) . = TRUE - stat |= NOPOWER + machine_stat |= NOPOWER update_icon() // connect the machine to a powernet if a node cable or a terminal is present on the turf diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 5058640e3aa..e564ba5429f 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -237,7 +237,7 @@ . = ..() if(loaded_tank) . += "ptank" - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return if(active) . += "on" diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index e88969d8d2a..beba0992b4d 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -163,7 +163,7 @@ step(src, get_dir(M, src)) /obj/machinery/power/emitter/process() - if(stat & (BROKEN)) + if(machine_stat & (BROKEN)) return if(state != EMITTER_WELDED || (!powernet && active_power_usage)) active = FALSE diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 29ce04793af..a8d889ef0f2 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -133,10 +133,10 @@ /obj/machinery/particle_accelerator/control_box/power_change() . = ..() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) active = FALSE use_power = NO_POWER_USE - else if(!stat && construction_state == PA_CONSTRUCTION_COMPLETE) + else if(!machine_stat && construction_state == PA_CONSTRUCTION_COMPLETE) use_power = IDLE_POWER_USE /obj/machinery/particle_accelerator/control_box/process() @@ -232,7 +232,7 @@ if(construction_state != PA_CONSTRUCTION_COMPLETE) return - if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER))) + if((get_dist(src, user) > 1) || (machine_stat & (BROKEN|NOPOWER))) if(!issilicon(user)) user.unset_machine() user << browse(null, "window=pacontrol") diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 0d298cae863..3befc9d8271 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -99,7 +99,7 @@ if(!terminal) to_chat(user, "No power terminal found.") return - stat &= ~BROKEN + machine_stat &= ~BROKEN update_icon() return @@ -196,7 +196,7 @@ terminal = new/obj/machinery/power/terminal(T) terminal.setDir(get_dir(T,src)) terminal.master = src - stat &= ~BROKEN + machine_stat &= ~BROKEN /obj/machinery/power/smes/disconnect_terminal() if(terminal) @@ -207,7 +207,7 @@ /obj/machinery/power/smes/update_overlays() . = ..() - if(stat & BROKEN) + if(machine_stat & BROKEN) return if(panel_open) @@ -232,7 +232,7 @@ return CLAMP(round(5.5*charge/capacity),0,5) /obj/machinery/power/smes/process() - if(stat & BROKEN) + if(machine_stat & BROKEN) return //store machine state to see if we need to update the icon overlays @@ -291,7 +291,7 @@ // called after all power processes are finished // restores charge level to smes if there was excess this ptick /obj/machinery/power/smes/proc/restore() - if(stat & BROKEN) + if(machine_stat & BROKEN) return if(!outputting) diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index af09cbb14dc..5b75c55f492 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -80,7 +80,7 @@ /obj/machinery/power/solar/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) switch(damage_type) if(BRUTE) - if(stat & BROKEN) + if(machine_stat & BROKEN) playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 60, TRUE) else playsound(loc, 'sound/effects/glasshit.ogg', 90, TRUE) @@ -100,7 +100,7 @@ var/obj/item/solar_assembly/S = locate() in src if(S) S.forceMove(loc) - S.give_glass(stat & BROKEN) + S.give_glass(machine_stat & BROKEN) else playsound(src, "shatter", 70, TRUE) new /obj/item/shard(src.loc) @@ -112,7 +112,7 @@ var/matrix/turner = matrix() turner.Turn(azimuth_current) panel.transform = turner - if(stat & BROKEN) + if(machine_stat & BROKEN) panel.icon_state = "solar_panel-b" else panel.icon_state = "solar_panel" @@ -173,7 +173,7 @@ sunfrac = . /obj/machinery/power/solar/process() - if(stat & BROKEN) + if(machine_stat & BROKEN) return if(control && (!powernet || control.powernet != powernet)) unset_control() @@ -331,11 +331,11 @@ /obj/machinery/power/solar_control/update_overlays() . = ..() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) . += mutable_appearance(icon, "[icon_keyboard]_off") return . += mutable_appearance(icon, icon_keyboard) - if(stat & BROKEN) + if(machine_stat & BROKEN) . += mutable_appearance(icon, "[icon_state]_broken") else . += mutable_appearance(icon, icon_screen) @@ -397,7 +397,7 @@ /obj/machinery/power/solar_control/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_SCREWDRIVER) if(I.use_tool(src, user, 20, volume=50)) - if (src.stat & BROKEN) + if (src.machine_stat & BROKEN) to_chat(user, "The broken glass falls out.") var/obj/structure/frame/computer/A = new /obj/structure/frame/computer( src.loc ) new /obj/item/shard( src.loc ) @@ -428,7 +428,7 @@ /obj/machinery/power/solar_control/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) switch(damage_type) if(BRUTE) - if(stat & BROKEN) + if(machine_stat & BROKEN) playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, TRUE) else playsound(src.loc, 'sound/effects/glasshit.ogg', 75, TRUE) diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index ebb204e7036..aa66ed00ec4 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -74,7 +74,7 @@ var/obj/item/solar_assembly/S = locate() in src if(S) S.forceMove(loc) - S.give_glass(stat & BROKEN) + S.give_glass(machine_stat & BROKEN) else playsound(src, "shatter", 70, TRUE) new /obj/item/shard(src.loc) diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 13933e24993..72b3d3264a6 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -114,7 +114,7 @@ locate_machinery() if(turbine) to_chat(user, "Turbine connected.") - stat &= ~BROKEN + machine_stat &= ~BROKEN else to_chat(user, "Turbine not connected.") obj_break() @@ -125,9 +125,9 @@ /obj/machinery/power/compressor/process() if(!starter) return - if(!turbine || (turbine.stat & BROKEN)) + if(!turbine || (turbine.machine_stat & BROKEN)) starter = FALSE - if(stat & BROKEN || panel_open) + if(machine_stat & BROKEN || panel_open) starter = FALSE return cut_overlays() @@ -147,7 +147,7 @@ rpm = max(0, rpm - (rpm*rpm)/(COMPFRICTION*efficiency)) - if(starter && !(stat & NOPOWER)) + if(starter && !(machine_stat & NOPOWER)) use_power(2800) if(rpm<1000) rpmtarget = 1000 @@ -203,9 +203,9 @@ /obj/machinery/power/turbine/process() if(!compressor) - stat = BROKEN + machine_stat = BROKEN - if((stat & BROKEN) || panel_open) + if((machine_stat & BROKEN) || panel_open) return if(!compressor.starter) return @@ -249,7 +249,7 @@ locate_machinery() if(compressor) to_chat(user, "Compressor connected.") - stat &= ~BROKEN + machine_stat &= ~BROKEN else to_chat(user, "Compressor not connected.") obj_break() @@ -259,7 +259,7 @@ /obj/machinery/power/turbine/ui_interact(mob/user) - if(!Adjacent(user) || (stat & (NOPOWER|BROKEN)) && !issilicon(user)) + if(!Adjacent(user) || (machine_stat & (NOPOWER|BROKEN)) && !issilicon(user)) user.unset_machine(src) user << browse(null, "window=turbine") return @@ -344,9 +344,9 @@ var/list/data = list() data["compressor"] = compressor ? TRUE : FALSE - data["compressor_broke"] = (!compressor || (compressor.stat & BROKEN)) ? TRUE : FALSE + data["compressor_broke"] = (!compressor || (compressor.machine_stat & BROKEN)) ? TRUE : FALSE data["turbine"] = compressor?.turbine ? TRUE : FALSE - data["turbine_broke"] = (!compressor || !compressor.turbine || (compressor.turbine.stat & BROKEN)) ? TRUE : FALSE + data["turbine_broke"] = (!compressor || !compressor.turbine || (compressor.turbine.machine_stat & BROKEN)) ? TRUE : FALSE data["online"] = compressor?.starter data["power"] = DisplayPower(compressor?.turbine?.lastgen) diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index cfbcf6f8378..cb00e0843f6 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -61,7 +61,7 @@ /obj/machinery/chem_heater/process() ..() - if(stat & NOPOWER) + if(machine_stat & NOPOWER) return if(on) if(beaker && beaker.reagents.total_volume) diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 7a35d3038f1..60d9a335d1d 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -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) diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm index f6d5b277360..cd3b1ac5e8b 100644 --- a/code/modules/reagents/chemistry/machinery/pandemic.dm +++ b/code/modules/reagents/chemistry/machinery/pandemic.dm @@ -129,7 +129,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"]" @@ -237,7 +237,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 if(beaker) to_chat(user, "A container is already loaded into [src]!") diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index e31b485bb43..cb384e1b332 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -69,7 +69,7 @@ var/obj/item/O = i . += "- \A [O.name]." - if(!(stat & (NOPOWER|BROKEN))) + if(!(machine_stat & (NOPOWER|BROKEN))) . += "The status display reads:\n"+\ "- Grinding reagents at [speed*100]%." if(beaker) @@ -179,7 +179,7 @@ options["eject"] = radial_eject if(isAI(user)) - if(stat & NOPOWER) + if(machine_stat & NOPOWER) return options["examine"] = radial_examine @@ -201,7 +201,7 @@ choice = show_radial_menu(user, src, options, require_near = !issilicon(user)) // post choice verification - if(operating || (isAI(user) && stat & NOPOWER) || !user.canUseTopic(src, !issilicon(user))) + if(operating || (isAI(user) && machine_stat & NOPOWER) || !user.canUseTopic(src, !issilicon(user))) return switch(choice) @@ -253,7 +253,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) @@ -273,7 +273,7 @@ /obj/machinery/reagentgrinder/proc/grind(mob/user) 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) @@ -302,7 +302,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, /obj/machinery/reagentgrinder/proc/mix_complete), 50) diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 8ff4d51a937..8c53749b9aa 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -111,13 +111,13 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) update() /obj/machinery/conveyor/update_icon_state() - if(stat & BROKEN) + if(machine_stat & BROKEN) icon_state = "conveyor-broken" else icon_state = "conveyor[operating * verted]" /obj/machinery/conveyor/proc/update() - if(stat & BROKEN || !operable || stat & NOPOWER) + if(machine_stat & BROKEN || !operable || machine_stat & NOPOWER) operating = FALSE update_icon() return FALSE @@ -126,7 +126,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) // machine process // move items to the target location /obj/machinery/conveyor/process() - if(stat & (BROKEN | NOPOWER)) + if(machine_stat & (BROKEN | NOPOWER)) return //If the conveyor is broken or already moving items if(!operating || conveying) @@ -159,21 +159,21 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) user.visible_message("[user] struggles to pry up \the [src] with \the [I].", \ "You struggle to pry up \the [src] with \the [I].") if(I.use_tool(src, user, 40, volume=40)) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) var/obj/item/stack/conveyor/C = new /obj/item/stack/conveyor(loc, 1, TRUE, id) transfer_fingerprints_to(C) to_chat(user, "You remove the conveyor belt.") qdel(src) else if(I.tool_behaviour == TOOL_WRENCH) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) I.play_tool_sound(src) setDir(turn(dir,-45)) update_move_direction() to_chat(user, "You rotate [src].") else if(I.tool_behaviour == TOOL_SCREWDRIVER) - if(!(stat & BROKEN)) + if(!(machine_stat & BROKEN)) verted = verted * -1 update_move_direction() to_chat(user, "You reverse [src]'s direction.") diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index e2ecc129344..06bbd81f977 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -164,7 +164,7 @@ // monkeys and xenos can only pull the flush lever /obj/machinery/disposal/attack_paw(mob/user) - if(stat & BROKEN) + if(machine_stat & BROKEN) return flush = !flush update_icon() @@ -281,7 +281,7 @@ /obj/machinery/disposal/bin/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state) - if(stat & BROKEN) + if(machine_stat & BROKEN) return ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) @@ -347,7 +347,7 @@ /obj/machinery/disposal/bin/update_overlays() . = ..() - if(stat & BROKEN) + if(machine_stat & BROKEN) return //flush handle @@ -355,7 +355,7 @@ . += "dispover-handle" //only handle is shown if no power - if(stat & NOPOWER || panel_open) + if(machine_stat & NOPOWER || panel_open) return //check for items in disposal - occupied light @@ -375,7 +375,7 @@ //timed process //charge the gas reservoir and perform flush if ready /obj/machinery/disposal/bin/process() - if(stat & BROKEN) //nothing can happen if broken + if(machine_stat & BROKEN) //nothing can happen if broken return flush_count++ @@ -390,7 +390,7 @@ if(flush && air_contents.return_pressure() >= SEND_PRESSURE) // flush can happen even without power do_flush() - if(stat & NOPOWER) // won't charge if no power + if(machine_stat & NOPOWER) // won't charge if no power return use_power(100) // base power usage diff --git a/code/modules/research/nanites/nanite_chamber.dm b/code/modules/research/nanites/nanite_chamber.dm index 4a980a04365..782d0ef0fdd 100644 --- a/code/modules/research/nanites/nanite_chamber.dm +++ b/code/modules/research/nanites/nanite_chamber.dm @@ -51,9 +51,9 @@ SEND_SIGNAL(occupant, COMSIG_NANITE_SET_CLOUD, cloud_id) /obj/machinery/nanite_chamber/proc/inject_nanites() - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return - if((stat & MAINT) || panel_open) + if((machine_stat & MAINT) || panel_open) return if(!occupant || busy) return @@ -78,9 +78,9 @@ occupant.AddComponent(/datum/component/nanites, 100) /obj/machinery/nanite_chamber/proc/remove_nanites(datum/nanite_program/NP) - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return - if((stat & MAINT) || panel_open) + if((machine_stat & MAINT) || panel_open) return if(!occupant || busy) return @@ -118,10 +118,10 @@ /obj/machinery/nanite_chamber/update_overlays() . = ..() - if((stat & MAINT) || panel_open) + if((machine_stat & MAINT) || panel_open) . += "maint" - else if(!(stat & (NOPOWER|BROKEN))) + else if(!(machine_stat & (NOPOWER|BROKEN))) if(busy || locked) . += "red" if(locked) diff --git a/code/modules/research/nanites/public_chamber.dm b/code/modules/research/nanites/public_chamber.dm index 602402abcfa..9a08e7dc90c 100644 --- a/code/modules/research/nanites/public_chamber.dm +++ b/code/modules/research/nanites/public_chamber.dm @@ -33,9 +33,9 @@ update_icon() /obj/machinery/public_nanite_chamber/proc/inject_nanites(mob/living/attacker) - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return - if((stat & MAINT) || panel_open) + if((machine_stat & MAINT) || panel_open) return if(!occupant || busy) return @@ -61,9 +61,9 @@ occupant.AddComponent(/datum/component/nanites, 75, cloud_id) /obj/machinery/public_nanite_chamber/proc/change_cloud(mob/living/attacker) - if(stat & (NOPOWER|BROKEN)) + if(machine_stat & (NOPOWER|BROKEN)) return - if((stat & MAINT) || panel_open) + if((machine_stat & MAINT) || panel_open) return if(!occupant || busy) return @@ -98,10 +98,10 @@ /obj/machinery/public_nanite_chamber/update_overlays() . = ..() - if((stat & MAINT) || panel_open) + if((machine_stat & MAINT) || panel_open) . += "maint" - else if(!(stat & (NOPOWER|BROKEN))) + else if(!(machine_stat & (NOPOWER|BROKEN))) if(busy || locked) . += "red" if(locked) diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index 73302014758..e009681b0f5 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -27,7 +27,7 @@ return ..() /obj/machinery/rnd/proc/shock(mob/user, prb) - if(stat & (BROKEN|NOPOWER)) // unpowered, no shock + if(machine_stat & (BROKEN|NOPOWER)) // unpowered, no shock return FALSE if(!prob(prb)) return FALSE @@ -76,10 +76,10 @@ if(busy) to_chat(user, "[src] is busy right now.") return FALSE - if(stat & BROKEN) + if(machine_stat & BROKEN) to_chat(user, "[src] is broken.") return FALSE - if(stat & NOPOWER) + if(machine_stat & NOPOWER) to_chat(user, "[src] has no power.") return FALSE if(loaded_item) diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index f619479d3ac..2c436f61480 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -39,7 +39,7 @@ heat_gen /= max(1, tot_rating) /obj/machinery/rnd/server/update_icon_state() - if(stat & EMPED || stat & NOPOWER) + if(machine_stat & EMPED || machine_stat & NOPOWER) icon_state = "RD-server-off" else if(research_disabled) icon_state = "RD-server-halt" @@ -52,7 +52,7 @@ return /obj/machinery/rnd/server/proc/refresh_working() - if(stat & EMPED || research_disabled || stat & NOPOWER) + if(machine_stat & EMPED || research_disabled || machine_stat & NOPOWER) working = FALSE else working = TRUE @@ -62,12 +62,12 @@ . = ..() if(. & EMP_PROTECT_SELF) return - stat |= EMPED + machine_stat |= EMPED addtimer(CALLBACK(src, .proc/unemp), 600) refresh_working() /obj/machinery/rnd/server/proc/unemp() - stat &= ~EMPED + machine_stat &= ~EMPED refresh_working() /obj/machinery/rnd/server/proc/toggle_disable() @@ -87,7 +87,7 @@ return 0 /obj/machinery/rnd/server/proc/produce_heat(heat_amt) - if(!(stat & (NOPOWER|BROKEN))) //Blatently stolen from space heater. + if(!(machine_stat & (NOPOWER|BROKEN))) //Blatently stolen from space heater. var/turf/L = loc if(istype(L)) var/datum/gas_mixture/env = L.return_air() @@ -165,7 +165,7 @@ dat += "Connected Servers:" dat += "" for(var/obj/machinery/rnd/server/S in GLOB.machines) - dat += "
" + dat += "
" dat += "
ServerOperating TempStatus
[S.name][S.current_temp][S.stat & EMPED || stat & NOPOWER?"Offline":"([S.research_disabled? "Disabled" : "Online"])"]
[S.name][S.current_temp][S.machine_stat & EMPED || machine_stat & NOPOWER?"Offline":"([S.research_disabled? "Disabled" : "Online"])"]

" dat += "Research Log
" diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm index 1ca0f4c63cd..7e1d37ce645 100644 --- a/code/modules/shuttle/navigation_computer.dm +++ b/code/modules/shuttle/navigation_computer.dm @@ -174,7 +174,7 @@ return TRUE /obj/machinery/computer/camera_advanced/shuttle_docker/proc/canDesignateTarget() - if(!designating_target_loc || !current_user || (eyeobj.loc != designating_target_loc) || (stat & (NOPOWER|BROKEN)) ) + if(!designating_target_loc || !current_user || (eyeobj.loc != designating_target_loc) || (machine_stat & (NOPOWER|BROKEN)) ) return FALSE return TRUE diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm index 2a4ce51d42a..9a20badbfb7 100644 --- a/code/modules/station_goals/bsa.dm +++ b/code/modules/station_goals/bsa.dm @@ -21,7 +21,7 @@ if(..()) return TRUE var/obj/machinery/bsa/full/B = locate() - if(B && !B.stat) + if(B && !B.machine_stat) return TRUE return FALSE @@ -305,7 +305,7 @@ return get_turf(G.parent) /obj/machinery/computer/bsa_control/proc/fire(mob/user) - if(cannon.stat) + if(cannon.machine_stat) notice = "Cannon unpowered!" return notice = null diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index 4aa8cb151cb..baa53690529 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -79,7 +79,7 @@ if(!opcomputer) return - if(opcomputer.stat & (NOPOWER|BROKEN)) + if(opcomputer.machine_stat & (NOPOWER|BROKEN)) return . if(replaced_by in opcomputer.advanced_surgeries) return FALSE diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 8b3c0caad9d..149b3b15659 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -231,7 +231,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C ..() /obj/machinery/vending/update_icon_state() - if(stat & BROKEN) + if(machine_stat & BROKEN) icon_state = "[initial(icon_state)]-broken" else if(powered()) icon_state = initial(icon_state) @@ -388,7 +388,7 @@ GLOBAL_LIST_EMPTY(vending_products) if(refill_canister && istype(I, refill_canister)) if (!panel_open) to_chat(user, "You should probably unscrew the service panel first!") - else if (stat & (BROKEN|NOPOWER)) + else if (machine_stat & (BROKEN|NOPOWER)) to_chat(user, "[src] does not respond.") else //if the panel is open we attempt to refill the machine @@ -633,7 +633,7 @@ GLOBAL_LIST_EMPTY(vending_products) to_chat(user, "You short out the product lock on [src].") /obj/machinery/vending/_try_interact(mob/user) - if(seconds_electrified && !(stat & NOPOWER)) + if(seconds_electrified && !(machine_stat & NOPOWER)) if(shock(user, 100)) return @@ -792,7 +792,7 @@ GLOBAL_LIST_EMPTY(vending_products) vend_ready = TRUE /obj/machinery/vending/process() - if(stat & (BROKEN|NOPOWER)) + if(machine_stat & (BROKEN|NOPOWER)) return PROCESS_KILL if(!active) return @@ -817,7 +817,7 @@ GLOBAL_LIST_EMPTY(vending_products) * * message - the message to speak */ /obj/machinery/vending/proc/speak(message) - if(stat & (BROKEN|NOPOWER)) + if(machine_stat & (BROKEN|NOPOWER)) return if(!message) return @@ -881,7 +881,7 @@ GLOBAL_LIST_EMPTY(vending_products) * * prb - probability the shock happens */ /obj/machinery/vending/proc/shock(mob/living/user, prb) - if(!istype(user) || stat & (BROKEN|NOPOWER)) // unpowered, no shock + if(!istype(user) || machine_stat & (BROKEN|NOPOWER)) // unpowered, no shock return FALSE if(!prob(prb)) return FALSE