Fixes circuit var for other consoles

Also cleans up attackby while we're at it.

Conflicts:
	code/game/dna/dna_modifier.dm
	code/game/machinery/computer/arcade.dm
	code/game/supplyshuttle.dm
	code/modules/mining/mine_items.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/research/research_shuttle.dm
	code/modules/research/server.dm
This commit is contained in:
mwerezak
2014-05-26 06:21:03 -04:00
committed by ZomgPonies
parent 89af05fd25
commit 418ba281d7
11 changed files with 30 additions and 221 deletions
+3
View File
@@ -31,6 +31,7 @@
desc = "A computer to remotely control a gas turbine"
icon = 'icons/obj/computer.dmi'
icon_state = "airtunnel0e"
circuit = /obj/item/weapon/circuitboard/turbine_control
anchored = 1
density = 1
var/obj/machinery/compressor/compressor
@@ -220,6 +221,7 @@
if(P.id == id)
doors += P
/*
/obj/machinery/computer/turbine_computer/attackby(I as obj, user as mob)
if(istype(I, /obj/item/weapon/screwdriver))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
@@ -252,6 +254,7 @@
else
src.attack_hand(user)
return
*/
/obj/machinery/computer/turbine_computer/attack_hand(var/mob/user as mob)
user.machine = src