cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 05:51:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Baystation12/Baystation12

Browse Source
This commit is contained in:
CaelAislinn
2012-02-08 18:16:09 +10:00
parent 22811eaf26 e96e8bc19d
commit b38922f163
35 changed files with 405 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/computer.dm
+1 -20
View File
@@ -85,28 +85,9 @@
name = "Master Air Control"
/obj/machinery/computer/card
name = "Identification Computer"
desc = "You can use this to change ID's."
icon_state = "id"
circuit = "/obj/item/weapon/circuitboard/card"
var/obj/item/weapon/card/id/scan = null
var/obj/item/weapon/card/id/modify = null
var/authenticated = 0.0
var/mode = 0.0
var/printing = null
req_access = list(access_change_ids)
/obj/machinery/computer/card/centcom
name = "CentCom Identification Computer"
circuit = "/obj/item/weapon/circuitboard/card/centcom"
req_access = list(access_cent_captain)
/obj/machinery/computer/dna
name = "DNA operations computer"
desc = "A Computer used to advanced DNA stuff."
desc = "A computer used for advanced DNA operations."
icon_state = "dna"
var/obj/item/weapon/card/data/scan = null
var/obj/item/weapon/card/data/modify = null
code/defines/obj/weapon.dm
+7 -92
View File
File diff suppressed because one or more lines are too long