shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28

Browse Source
This commit is contained in:
Ghommie
2019-07-03 03:24:28 +02:00
parent d5279c8373 d01eb661cd
commit ffecca8c11
328 changed files with 9909 additions and 6862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/modular_computers/computers/item/processor.dm
View File

@@ -44,7 +44,7 @@
return machinery_computer.update_icon()
// This thing is not meant to be used on it's own, get topic data from our machinery owner.
//obj/item/modular_computer/processor/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE)
//obj/item/modular_computer/processor/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE, no_tk=FALSE)
// if(!machinery_computer)
// return 0

2
code/modules/modular_computers/computers/machinery/modular_computer.dm
View File

@@ -46,7 +46,7 @@
/obj/machinery/modular_computer/emag_act(mob/user)
. = ..()
if(cpu)
return cpu.emag_act(user)
. |= cpu.emag_act(user)
/obj/machinery/modular_computer/update_icon()
cut_overlays()