mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-28 14:37:27 +01:00
Merge pull request #10907 from VOREStation/Arokha/areasort
Fixes #10896
This commit is contained in:
@@ -334,14 +334,15 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
|
||||
to_chat(src, "<font color='blue'><B>AntagHUD [antagHUD ? "Enabled" : "Disabled"]</B></font>")
|
||||
|
||||
/mob/observer/dead/proc/jumpable_areas()
|
||||
var/list/areas = return_areas()
|
||||
var/list/areas = return_sorted_areas()
|
||||
if(client?.holder)
|
||||
return areas
|
||||
|
||||
for(var/area/A as anything in areas)
|
||||
for(var/key in areas)
|
||||
var/area/A = areas[key]
|
||||
if(A.z in using_map?.secret_levels)
|
||||
areas -= A
|
||||
return areas
|
||||
areas -= key
|
||||
return areas
|
||||
|
||||
/mob/observer/dead/proc/jumpable_mobs()
|
||||
var/list/mobs = getmobs()
|
||||
@@ -363,11 +364,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
|
||||
to_chat(usr, "Not when you're not dead!")
|
||||
return
|
||||
|
||||
|
||||
var/area/A = tgui_input_list(usr, "Select an area:", "Ghost Teleport", jumpable_areas())
|
||||
if(!A)
|
||||
var/list/areas = jumpable_areas()
|
||||
var/input = tgui_input_list(usr, "Select an area:", "Ghost Teleport", areas)
|
||||
if(!input)
|
||||
return
|
||||
|
||||
var/area/A = areas[input]
|
||||
if(!A) return
|
||||
usr.forceMove(pick(get_area_turfs(A)))
|
||||
usr.on_mob_jump()
|
||||
|
||||
|
||||
@@ -153,7 +153,7 @@ Whatever you did that made the last camera window disappear-- don't do that agai
|
||||
. = ..()
|
||||
|
||||
/area/ai_multicam_room
|
||||
name = "ai_multicam_room"
|
||||
name = "AI Multicam Room"
|
||||
icon_state = "ai_camera_room"
|
||||
dynamic_lighting = FALSE
|
||||
ambience = list()
|
||||
|
||||
Reference in New Issue
Block a user