cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mass-replacement of stat to machine_stat (#48758)

Browse Source 
Living and machine stat vars are pretty different, one uses flags and other number-defines.
This should make some other mass-replacements and searches a bit easier.
This commit is contained in:
Rohesie
2020-01-24 12:37:17 +13:00
committed by oranges
parent b961d49f5b
commit 7bef84f009
131 changed files with 422 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/PDA/cart.dm
+1 -1
View File
@@ -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
code/game/objects/items/devices/camera_bug.dm
+1 -1
View File
@@ -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
code/game/objects/items/robot/robot_items.dm
+3 -3
View File
@@ -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, "<span class='warning'>[M] is unpowered!</span>")
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."