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

Merge pull request #7273 from Cyantime/obs

Browse Source 
Observing improvements
This commit is contained in:
Atermonera
2020-06-22 12:15:07 -07:00
committed by GitHub
parent a481a0fbea 34a985b983
commit c43cf40593
3 changed files with 38 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
code/modules/mob/mob.dm
View File

@@ -419,56 +419,26 @@
if(is_admin && stat == DEAD)
is_admin = 0
var/list/names = list()
var/list/namecounts = list()
var/list/creatures = list()
var/list/targets = list()
for(var/obj/O in world) //EWWWWWWWWWWWWWWWWWWWWWWWW ~needs to be optimised
if(!O.loc)
continue
if(istype(O, /obj/item/weapon/disk/nuclear))
var/name = "Nuclear Disk"
if (names.Find(name))
namecounts[name]++
name = "[name] ([namecounts[name]])"
else
names.Add(name)
namecounts[name] = 1
creatures[name] = O
if(istype(O, /obj/singularity))
var/name = "Singularity"
if (names.Find(name))
namecounts[name]++
name = "[name] ([namecounts[name]])"
else
names.Add(name)
namecounts[name] = 1
creatures[name] = O
for(var/mob/M in sortAtom(mob_list))
var/name = M.name
if (names.Find(name))
namecounts[name]++
name = "[name] ([namecounts[name]])"
else
names.Add(name)
namecounts[name] = 1
creatures[name] = M
targets += observe_list_format(nuke_disks)
targets += observe_list_format(all_singularities)
targets += getmobs()
targets += observe_list_format(sortAtom(mechas_list))
targets += observe_list_format(SSshuttles.ships)
client.perspective = EYE_PERSPECTIVE
var/eye_name = null
var/ok = "[is_admin ? "Admin Observe" : "Observe"]"
eye_name = input("Please, select a player!", ok, null, null) as null|anything in creatures
eye_name = input("Please, select a player!", ok, null, null) as null|anything in targets
if (!eye_name)
return
var/mob/mob_eye = creatures[eye_name]
var/mob/mob_eye = targets[eye_name]
if(client && mob_eye)
client.eye = mob_eye