computer3 merge

This commit is contained in:
ZomgPonies
2013-11-03 14:18:54 -05:00
parent 88d6a3fbdc
commit 36c7fa3dcd
85 changed files with 9350 additions and 31 deletions
+2 -2
View File
@@ -21,7 +21,7 @@
var/list/files = list( )
/obj/item/weapon/card/data
name = "data disk"
name = "data card"
desc = "A disk of data."
icon_state = "data"
var/function = "storage"
@@ -125,7 +125,7 @@
desc = "A card used to provide ID and determine access across the station."
icon_state = "id"
item_state = "card-id"
var/access = list()
var/list/access = list()
var/registered_name = null // The name registered_name on the card
slot_flags = SLOT_ID
+1 -1
View File
@@ -590,7 +590,7 @@
</head>
<body>
<iframe width='100%' height='97%' src="http://http://192.241.230.211/wiki/index.php/Space_law&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe> </body>
<iframe width='100%' height='97%' src="http://http://192.241.230.212/wiki/index.php/Space_law&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe> </body>
</html>