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

This commit is contained in:
unknown
2012-06-26 21:46:03 +03:00
434 changed files with 27215 additions and 22236 deletions

View File

@@ -9,7 +9,7 @@
/obj/item/tape/police
name = "police tape"
desc = "A length of police tape. Do not cross."
req_access = list(access_security)
req_access = list(ACCESS_SECURITY)
icon_base = "police"
/obj/item/taperoll/engineering
@@ -22,7 +22,7 @@
/obj/item/tape/engineering
name = "engineering tape"
desc = "A length of engineering tape. Better not cross it."
req_access = list(access_engine,access_atmospherics)
req_access = list(ACCESS_ENGINE,ACCESS_ATMOSPHERICS)
icon_base = "engineering"
/obj/item/taperoll/attack_self(mob/user as mob)