cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

Browse Source
This commit is contained in:
PJB3005
2017-03-03 16:31:00 +01:00
parent 1956ace5c7 88a089dae6
commit a63608d023
441 changed files with 22654 additions and 8948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@ var/list/global_modular_computers = list()
if(cpu.active_program)
add_overlay(cpu.active_program.program_icon_state ? cpu.active_program.program_icon_state : screen_icon_state_menu)
else
overlays.Add(screen_icon_state_menu)
add_overlay(screen_icon_state_menu)
if(cpu && cpu.obj_integrity <= cpu.integrity_failure)
add_overlay("bsod")
@@ -131,7 +131,7 @@ var/list/global_modular_computers = list()
update_icon()
/obj/machinery/modular_computer/attackby(var/obj/item/weapon/W as obj, mob/user)
if(cpu)
if(cpu && !(flags & NODECONSTRUCT))
return cpu.attackby(W, user)
return ..()