cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +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

16
code/modules/mining/machine_processing.dm
View File

@@ -36,10 +36,14 @@
/obj/machinery/computer/smelting/process()
updateUsrDialog()
/obj/machinery/computer/smelting/attack_ai(mob/user)
add_hiddenprint(user)
interact(user)
/obj/machinery/computer/smelting/attack_hand(mob/user)
add_fingerprint(user)
if(stat & (FORCEDISABLE | NOPOWER | BROKEN) && id) //Power out/this thing is broken, but at least allow the guy to take his ID out if it's still in there.
if(stat & (NOPOWER | BROKEN) && id) //Power out/this thing is broken, but at least allow the guy to take his ID out if it's still in there.
id.forceMove(get_turf(src))
user.put_in_hands(id)
@@ -49,7 +53,7 @@
interact(user)
/obj/machinery/computer/smelting/interact(mob/user)
if(stat & (FORCEDISABLE | NOPOWER | BROKEN)) //It's broken ya derp.
if(stat & (NOPOWER | BROKEN)) //It's broken ya derp.
if(user.machine == src)
user.unset_machine(src)
return
@@ -234,7 +238,7 @@
radio_connection.post_signal(src, signal)
/obj/machinery/computer/smelting/receive_signal(datum/signal/signal)
if(stat & (FORCEDISABLE | NOPOWER | BROKEN) || !signal || !signal.data["tag"] || signal.data["tag"] != smelter_tag)
if(stat & (NOPOWER | BROKEN) || !signal || !signal.data["tag"] || signal.data["tag"] != smelter_tag)
return
if(signal.data["type"] != "smelter") //So I can forgo sanity, henk.
@@ -287,7 +291,7 @@
update_icon()
/obj/machinery/mineral/processing_unit/update_icon()
if(stat & (FORCEDISABLE | NOPOWER | BROKEN) || !on)
if(stat & (NOPOWER | BROKEN) || !on)
icon_state = "furnace_o"
set_light(0)
else if(on)
@@ -390,7 +394,7 @@
qdel(A)
/obj/machinery/mineral/processing_unit/process()
if(stat & (FORCEDISABLE | NOPOWER | BROKEN))
if(stat & (NOPOWER | BROKEN))
return
var/turf/in_T = get_step(src, in_dir)
@@ -431,7 +435,7 @@
broadcast_status()
/obj/machinery/mineral/processing_unit/receive_signal(datum/signal/signal)
if(stat & (FORCEDISABLE | NOPOWER | BROKEN) || !signal.data["tag"] || signal.data["tag"] != id_tag)
if(stat & (NOPOWER | BROKEN) || !signal.data["tag"] || signal.data["tag"] != id_tag)
return
if(signal.data["sigtype"] == "status")

12
code/modules/mining/machine_stacking.dm
View File

@@ -18,12 +18,16 @@
if(ticker)
initialize()
/obj/machinery/computer/stacking_unit/attack_ai(mob/user)
add_hiddenprint(user)
interact(user)
/obj/machinery/computer/stacking_unit/attack_hand(mob/user)
add_fingerprint(user)
interact(user)
/obj/machinery/computer/stacking_unit/interact(mob/user)
if(stat & (FORCEDISABLE | NOPOWER | BROKEN))
if(stat & (NOPOWER | BROKEN))
return
if(!stacker_data)
@@ -90,7 +94,7 @@
radio_connection = radio_controller.add_object(src, frequency)
/obj/machinery/computer/stacking_unit/receive_signal(datum/signal/signal)
if(stat & (FORCEDISABLE | NOPOWER|BROKEN))
if(stat & (NOPOWER|BROKEN))
return
if(!signal.data["tag"] || signal.data["tag"] != stacker_tag)
@@ -163,7 +167,7 @@
RefreshParts()
/obj/machinery/mineral/stacking_machine/update_icon()
if(stat & (FORCEDISABLE | NOPOWER | BROKEN))
if(stat & (NOPOWER | BROKEN))
icon_state = "stacker_o"
else
icon_state = "stacker"
@@ -253,7 +257,7 @@
radio_connection = radio_controller.add_object(src, frequency)
/obj/machinery/mineral/stacking_machine/receive_signal(var/datum/signal/signal)
if(stat & (FORCEDISABLE | NOPOWER|BROKEN))
if(stat & (NOPOWER|BROKEN))
return
if(!signal.data["tag"] || signal.data["tag"] != id_tag)

2
code/modules/mining/mint.dm
View File

@@ -49,7 +49,7 @@
/obj/machinery/mineral/mint/attack_hand(mob/user)
add_fingerprint(user)
if(stat & (FORCEDISABLE | NOPOWER | BROKEN))
if(stat & (NOPOWER | BROKEN))
if(user.machine == src)
user.unset_machine(src)
return