Merge pull request #1325 from Citadel-Station-13/upstream-merge-27884

[MIRROR] CereStation Security Department Revamp (and other misc fixes/changes)
This commit is contained in:
LetterJay
2017-06-14 08:49:01 -05:00
committed by GitHub
4 changed files with 163919 additions and 155812 deletions
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,19 @@
diff a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm (rejected hunks)
@@ -101529,7 +109389,7 @@ cpo
cqk
cri
cqk
-dky
+dkx
ctm
cua
cKv
@@ -101786,7 +109646,7 @@ cpo
cql
crj
csf
-dkz
+dkx
ctn
cub
cuu
+8
View File
@@ -23,6 +23,14 @@
light_color = LIGHT_COLOR_RED
/obj/machinery/computer/secure_data/laptop
name = "security laptop"
desc = "A cheap Nanotrasen security laptop, it functions as a security records console. It's bolted to the table."
icon_state = "laptop"
icon_screen = "seclaptop"
icon_keyboard = "laptop_key"
clockwork = TRUE //it'd look weird
/obj/machinery/computer/secure_data/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/weapon/card/id))
if(!scan)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB