Merge pull request #2092 from Citadel-Station-13/upstream-merge-29409

[MIRROR] Fixes a drone ping issue
This commit is contained in:
LetterJay
2017-07-23 06:52:41 -05:00
committed by GitHub
2 changed files with 7 additions and 7 deletions
+3 -3
View File
@@ -383,11 +383,11 @@ GLOBAL_LIST_EMPTY(PDAs)
else if((!isnull(cartridge)) && (cartridge.access & CART_ATMOS))
scanmode = 5
if("Drone Phone")
var/area/A = get_area(U)
var/alert_s = input(U,"Alert severity level","Ping Drones",null) as null|anything in list("Low","Medium","High","Critical")
if(A && alert_s)
var/area/A = get_area(U)
if(A && alert_s && !QDELETED(U))
var/msg = "<span class='boldnotice'>NON-DRONE PING: [U.name]: [alert_s] priority alert in [A.name]!</span>"
_alert_drones(msg, TRUE)
_alert_drones(msg, TRUE, U)
to_chat(U, msg)