cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 18:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes a drone ping issue

Browse Source
This commit is contained in:
Joan Lung
2017-07-20 18:16:18 -04:00
parent 5a7e352db7
commit 01d9da3da4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/items/devices/PDA/PDA.dm
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)

8
code/modules/mob/living/simple_animal/friendly/drone/say.dm
View File

@@ -17,7 +17,7 @@
//Base proc for anything to call
/proc/_alert_drones(msg, dead_can_hear = 0, mob/living/faction_checked_mob, exact_faction_match)
/proc/_alert_drones(msg, dead_can_hear = 0, atom/source, mob/living/faction_checked_mob, exact_faction_match)
for(var/W in GLOB.mob_list)
var/mob/living/simple_animal/drone/M = W
if(istype(M) && M.stat != DEAD)
@@ -26,14 +26,14 @@
to_chat(M, msg)
else
to_chat(M, msg)
if(dead_can_hear && (M in GLOB.dead_mob_list))
var/link = FOLLOW_LINK(M, faction_checked_mob)
if(dead_can_hear && source && (M in GLOB.dead_mob_list))
var/link = FOLLOW_LINK(M, source)
to_chat(M, "[link] [msg]")
//Wrapper for drones to handle factions
/mob/living/simple_animal/drone/proc/alert_drones(msg, dead_can_hear = FALSE)
_alert_drones(msg, dead_can_hear, src, TRUE)
_alert_drones(msg, dead_can_hear, src, src, TRUE)
/mob/living/simple_animal/drone/proc/drone_chat(msg)