Merge pull request #275 from Arokha/fixes

Fixes 2 issues
This commit is contained in:
Leshana
2016-06-02 01:39:09 -04:00
7 changed files with 8 additions and 5 deletions
+2 -4
View File
@@ -37,8 +37,7 @@
return 1
get_access()
var/access = get_all_station_access()
access += list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Death Commando","Research Officer")
var/access = get_all_accesses()
return access
/datum/job/centcom_visitor //For Pleasure
@@ -80,8 +79,7 @@
return 1
get_access()
var/access = get_all_station_access()
access += list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Death Commando","Research Officer")
var/access = get_all_accesses()
return access
/datum/job/clown
+1 -1
View File
@@ -252,7 +252,7 @@
registered_name = "Central Command"
assignment = "General"
New()
access = get_all_centcom_access()
access = get_all_accesses()
..()
/obj/item/weapon/card/id/centcom/ERT
+2
View File
@@ -0,0 +1,2 @@
/obj/machinery/photocopier/faxmachine
req_one_access = list()
+1
View File
@@ -278,6 +278,7 @@
// Keep IDs around, but destroy them!
var/obj/item/weapon/card/id/ID = W
ID.desc = "A partially digested card that has seen better days. Much of it's data has been destroyed."
ID.icon = 'icons/obj/card_vr.dmi'
ID.icon_state = "digested"
ID.access = list() // No access
ID.forceMove(owner)
@@ -244,4 +244,5 @@
assignment = "CC Medical"
New()
..()
update_name()
Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

+1
View File
@@ -1641,6 +1641,7 @@
#include "code\modules\paperwork\carbonpaper.dm"
#include "code\modules\paperwork\clipboard.dm"
#include "code\modules\paperwork\faxmachine.dm"
#include "code\modules\paperwork\faxmachine_vr.dm"
#include "code\modules\paperwork\filingcabinet.dm"
#include "code\modules\paperwork\folders.dm"
#include "code\modules\paperwork\handlabeler.dm"