shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

Browse Source
This commit is contained in:
Ghommie
2019-12-06 20:09:35 +01:00
parent 6484eea339 0598c35d70
commit 542c9007ee
1029 changed files with 34299 additions and 143444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/shuttle/emergency.dm
View File

@@ -57,7 +57,7 @@
var/mob/user = usr
. = FALSE
var/obj/item/card/id/ID = user.get_idcard()
var/obj/item/card/id/ID = user.get_idcard(TRUE)
if(!ID)
to_chat(user, "<span class='warning'>You don't have an ID.</span>")
@@ -93,7 +93,7 @@
minor_announce("Early launch authorization revoked, [remaining] authorizations needed")
/obj/machinery/computer/emergency_shuttle/proc/authorize(mob/user, source)
var/obj/item/card/id/ID = user.get_idcard()
var/obj/item/card/id/ID = user.get_idcard(TRUE)
if(ID in authorized)
return FALSE

2
code/modules/shuttle/special.dm
View File

@@ -199,7 +199,7 @@
if(H.mind && H.mind.assigned_role == "Bartender")
return TRUE
var/obj/item/card/id/ID = user.get_idcard()
var/obj/item/card/id/ID = user.get_idcard(FALSE)
if(ID && (ACCESS_CENT_BAR in ID.access))
return TRUE