cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #901 from CHOMPStationBot/upstream-merge-9342

Browse Source 
[MIRROR] Removes prompt for ID restoration if no ID
This commit is contained in:
Razgriz
2020-11-22 23:35:29 -07:00
committed by GitHub
parent 3b9a4407df da87900fe5
commit a34cc7a91c
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/machinery/computer/id_restorer_vr.dm
View File

@@ -30,14 +30,15 @@
if(..()) return if(..()) return
if(stat & (NOPOWER|BROKEN)) return if(stat & (NOPOWER|BROKEN)) return
if(!inserted) // No point in giving you an option what to do if there's no ID to do things with.
to_chat(user, "<span class='notice'>No ID is inserted.</span>")
return
var/choice = alert(user,"What do you want to do?","[src]","Restore ID access","Eject ID","Cancel") var/choice = alert(user,"What do you want to do?","[src]","Restore ID access","Eject ID","Cancel")
if(user.incapacitated() || (get_dist(src, user) > 1)) if(user.incapacitated() || (get_dist(src, user) > 1))
return return
switch(choice) switch(choice)
if("Restore ID access") if("Restore ID access")
if(!inserted)
to_chat(user, "<span class='notice'>No ID is inserted.</span>")
return
var/mob/living/carbon/human/H = user var/mob/living/carbon/human/H = user
if(!(istype(H))) if(!(istype(H)))
to_chat(user, "<span class='warning'>Invalid user detected. Access denied.</span>") to_chat(user, "<span class='warning'>Invalid user detected. Access denied.</span>")
@@ -66,9 +67,6 @@
flick(icon_fail, src) flick(icon_fail, src)
return return
if("Eject ID") if("Eject ID")
if(!inserted)
to_chat(user, "<span class='notice'>No ID is inserted.</span>")
return
if(ishuman(user)) if(ishuman(user))
inserted.forceMove(get_turf(src)) inserted.forceMove(get_turf(src))
if(!user.get_active_hand()) if(!user.get_active_hand())