cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mirror-38933

Browse Source
This commit is contained in:
kevinz000
2018-07-14 15:26:49 -07:00
committed by GitHub
parent bcb1b04c40 c8b9e94d1e
commit b33d2b82fb
1555 changed files with 162517 additions and 36374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/controllers/subsystem/processing/circuit.dm
View File

@@ -78,5 +78,8 @@ PROCESSING_SUBSYSTEM_DEF(circuit)
/obj/item/integrated_electronics/wirer,
/obj/item/integrated_electronics/debugger,
/obj/item/integrated_electronics/analyzer,
/obj/item/integrated_electronics/detailer
/obj/item/integrated_electronics/detailer,
/obj/item/card/data,
/obj/item/card/data/full_color,
/obj/item/card/data/disk
)

1
code/controllers/subsystem/processing/processing.dm
View File

@@ -27,7 +27,6 @@ SUBSYSTEM_DEF(processing)
if (MC_TICK_CHECK)
return
/datum/var/isprocessing = FALSE
/datum/proc/process()
set waitfor = 0
STOP_PROCESSING(SSobj, src)