cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Electric Boogaloo (#31728)" (#31868)

Browse Source 
This reverts commit 8bb40feca6.
This commit is contained in:
DamianX
2022-01-19 15:46:18 +01:00
committed by GitHub
parent a0b6b81319
commit c5dffbe635
295 changed files with 1850 additions and 3461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/research/fabricators.dm
View File

@@ -152,7 +152,7 @@
/obj/machinery/r_n_d/fabricator/process()
..()
if(busy || being_built || stat&(NOPOWER|BROKEN|FORCEDISABLE))
if(busy || being_built || stat&(NOPOWER|BROKEN))
return
if(stopped)
if(auto_make && last_made && !queue.len)
@@ -290,7 +290,7 @@
//The build_part_loop fires independently and will build stuff until the queue is over or when it is stopped.
/obj/machinery/r_n_d/fabricator/proc/build_part_loop()
if(busy || stopped || being_built || stat&(NOPOWER|BROKEN|FORCEDISABLE) || queue.len == 0)
if(busy || stopped || being_built || stat&(NOPOWER|BROKEN) || queue.len == 0)
return
var/datum/design/D = queue_pop()
if(!build_part(D))
@@ -498,7 +498,7 @@
return round(/*TechTotal(part)*/(part.MatTotal()/FAB_MAT_BASEMOD)*build_time*time_coeff, roundto)
/obj/machinery/r_n_d/fabricator/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open=NANOUI_FOCUS)
if(stat & (BROKEN|NOPOWER|FORCEDISABLE))
if(stat & (BROKEN|NOPOWER))
return
if(!isAdminGhost(user) && (user.stat || user.restrained()))
return

2
code/modules/research/mechanic/mechanic_fabs.dm
View File

@@ -108,7 +108,7 @@
return 1
/obj/machinery/r_n_d/fabricator/mechanic_fab/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open=NANOUI_FOCUS)
if(stat & (BROKEN|NOPOWER|FORCEDISABLE))
if(stat & (BROKEN|NOPOWER))
return
if((user.stat && !isobserver(user)) || user.restrained() || !allowed(user))
return

4
code/modules/research/mechanic/reverse_engine.dm
View File

@@ -139,7 +139,7 @@
if(!research_queue.len)
return
while(research_queue[1])
if(stat&(NOPOWER|BROKEN|FORCEDISABLE))
if(stat&(NOPOWER|BROKEN))
return 0
var/datum/design/current_design = research_queue[1]
if(!researchDesign(current_design))
@@ -189,7 +189,7 @@
/obj/machinery/r_n_d/reverse_engine/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open=NANOUI_FOCUS)
if(src.stat & (BROKEN|NOPOWER|FORCEDISABLE))
if(src.stat & (BROKEN|NOPOWER))
return
if((user.stat && !isobserver(user)) || user.restrained() || !allowed(user) || !Adjacent(user))
return

4
code/modules/research/message_server.dm
View File

@@ -86,7 +86,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
return newKey
/obj/machinery/message_server/proc/is_functioning()
return !disabled && !(stat & (BROKEN|NOPOWER|FORCEDISABLE))
return !disabled && !(stat & (BROKEN|NOPOWER))
/obj/machinery/message_server/proc/send_pda_message(var/recipient = "",var/sender = "",var/message = "", var/icon/img_sent = null)
pda_msgs += new/datum/data_pda_msg(recipient,sender,message,img_sent)
@@ -109,7 +109,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
update_icon()
/obj/machinery/message_server/update_icon()
if(stat & (BROKEN|NOPOWER|FORCEDISABLE))
if(stat & (BROKEN|NOPOWER))
icon_state = "pda_server-nopower"
else if (disabled)
icon_state = "pda_server-off"

2
code/modules/research/protolathe.dm
View File

@@ -39,7 +39,7 @@ it creates. All the menus and other manipulation commands are in the R&D console
/obj/machinery/r_n_d/fabricator/protolathe/power_change()
..()
if(!(stat & (BROKEN|NOPOWER|FORCEDISABLE)))
if(!(stat & (BROKEN|NOPOWER)))
set_light(2)
else
set_light(0)

4
code/modules/research/rdconsole.dm
View File

@@ -232,7 +232,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
/obj/machinery/computer/rdconsole/proc/deconstruct_item(mob/user)
if(!linked_destroy || linked_destroy.busy || !linked_destroy.loaded_item)
return
if(isLocked() || (linked_destroy.stat & (FORCEDISABLE|NOPOWER|BROKEN)) || (stat & (NOPOWER|BROKEN|FORCEDISABLE)))
if(isLocked() || (linked_destroy.stat & (NOPOWER|BROKEN)) || (stat & (NOPOWER|BROKEN)))
return
linked_destroy.busy = 1
screen = 0.1
@@ -664,7 +664,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
<div class=\"header\">[jointext(options," || ")]</div><hr />"}
/obj/machinery/computer/rdconsole/attack_hand(mob/user as mob)
if(stat & (BROKEN|NOPOWER|FORCEDISABLE))
if(stat & (BROKEN|NOPOWER))
return
user.set_machine(src)

6
code/modules/research/rdmachines.dm
View File

@@ -32,12 +32,6 @@ var/global/list/rnd_machines = list()
var/datum/wires/rnd/wires = null
hack_abilities = list(
/datum/malfhack_ability/toggle/disable,
/datum/malfhack_ability/oneuse/overload_quiet,
)
/obj/machinery/r_n_d/New()
rnd_machines |= src
..()

4
code/modules/research/server.dm
View File

@@ -110,7 +110,7 @@
C.files.RefreshResearch()
/obj/machinery/r_n_d/server/proc/produce_heat(heat_amt)
if(!(stat & (NOPOWER|BROKEN|FORCEDISABLE))) //Blatently stolen from space heater.
if(!(stat & (NOPOWER|BROKEN))) //Blatently stolen from space heater.
var/turf/simulated/L = loc
if(istype(L))
var/datum/gas_mixture/env = L.return_air()
@@ -235,7 +235,7 @@
return
/obj/machinery/computer/rdservercontrol/attack_hand(mob/user as mob)
if(stat & (BROKEN|NOPOWER|FORCEDISABLE))
if(stat & (BROKEN|NOPOWER))
return
user.set_machine(src)
var/dat = ""

10
code/modules/research/xenoarchaeology/machinery/analysis_base.dm
View File

@@ -33,7 +33,7 @@
/obj/machinery/anomaly/power_change()
..()
if (stat & (FORCEDISABLE|NOPOWER) && scan_process)
if (stat & NOPOWER && scan_process)
stop()
else
update_icon()
@@ -41,7 +41,7 @@
/obj/machinery/anomaly/process()
//First we deal with the machine's task
if(scan_process)
if (stat & (NOPOWER|BROKEN|FORCEDISABLE))
if (stat & (NOPOWER|BROKEN))
stop()
else
use_power = MACHINE_POWER_USE_ACTIVE
@@ -151,7 +151,7 @@
/obj/machinery/anomaly/AltClick(var/mob/user)
if (user.incapacitated() || !user.Adjacent(src) || scan_process || !held_container || stat & (NOPOWER|FORCEDISABLE))
if (user.incapacitated() || !user.Adjacent(src) || scan_process || !held_container || stat & NOPOWER)
return
eject(user)
@@ -160,14 +160,14 @@
if (!anchored)
return ..()
if (user.incapacitated() || !user.Adjacent(src) || scan_process || !held_container || stat & (NOPOWER|FORCEDISABLE))
if (user.incapacitated() || !user.Adjacent(src) || scan_process || !held_container || stat & NOPOWER)
return
start(user)
/obj/machinery/anomaly/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS)
if (stat & (FORCEDISABLE|NOPOWER))
if (stat & NOPOWER)
return
var/list/data[0]

2
code/modules/research/xenoarchaeology/machinery/analysis_hyperspectral.dm
View File

@@ -20,7 +20,7 @@
/obj/machinery/anomaly/hyperspectral/update_icon()
overlays.Cut()
if (stat & (NOPOWER | BROKEN | FORCEDISABLE))
if (stat & (NOPOWER | BROKEN))
return
overlays += "hyperspectral_on"

2
code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm
View File

@@ -62,7 +62,7 @@ var/anomaly_report_num = 0
/obj/machinery/artifact_analyser/interact(mob/user)
if(..())
return
if(stat & (NOPOWER|BROKEN|FORCEDISABLE) || get_dist(src, user) > 1)
if(stat & (NOPOWER|BROKEN) || get_dist(src, user) > 1)
user.unset_machine(src)
return

6
code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
View File

@@ -71,7 +71,7 @@
interact(user)
/obj/machinery/artifact_harvester/interact(var/mob/user as mob)
if(stat & (NOPOWER|BROKEN|FORCEDISABLE))
if(stat & (NOPOWER|BROKEN))
return
user.set_machine(src)
var/dat = "<B>Artifact Power Harvester</B><BR>"
@@ -121,7 +121,7 @@
onclose(user, "artharvester")
/obj/machinery/artifact_harvester/process()
if(stat & (NOPOWER|BROKEN|FORCEDISABLE))
if(stat & (NOPOWER|BROKEN))
return
if(harvesting > 0)
@@ -394,7 +394,7 @@
icon_state = "harvester"
set_light(0)
if(stat & (NOPOWER|BROKEN|FORCEDISABLE))
if(stat & (NOPOWER|BROKEN))
return
if (harvesting != 0)

2
code/modules/research/xenoarchaeology/machinery/artifact_scanner.dm
View File

@@ -25,7 +25,7 @@
/obj/machinery/artifact_scanpad/update_icon()
icon_state = "xenoarch_scanner0"
if(stat & (NOPOWER|BROKEN|FORCEDISABLE))
if(stat & (NOPOWER|BROKEN))
return
if (analyser_console?.scan_in_progress)