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

Fixes #10896

Browse Source
This commit is contained in:
Chompstation Bot
2021-07-05 16:19:51 +00:00
parent c194014d3f
commit 6b6a138221
4 changed files with 1961 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/_helpers/unsorted.dm
View File

@@ -686,12 +686,12 @@ Turf and target are seperate in case you want to teleport some distance from a t
/proc/return_areas() /proc/return_areas()
var/list/area/areas = list() var/list/area/areas = list()
for(var/area/A in world) for(var/area/A in world)
areas += A areas[A.name] = A
return areas return areas
//Returns: all the areas in the world, sorted. //Returns: all the areas in the world, sorted.
/proc/return_sorted_areas() /proc/return_sorted_areas()
return sortAtom(return_areas()) return sortTim(return_areas(), /proc/cmp_text_asc)
//Takes: Area type as text string or as typepath OR an instance of the area. //Takes: Area type as text string or as typepath OR an instance of the area.
//Returns: A list of all areas of that type in the world. //Returns: A list of all areas of that type in the world.

13
code/modules/admin/secrets/admin_secrets/jump_shuttle.dm
View File

@@ -13,24 +13,25 @@
if (!shuttle_tag) return if (!shuttle_tag) return
var/datum/shuttle/S = SSshuttles.shuttles[shuttle_tag] var/datum/shuttle/S = SSshuttles.shuttles[shuttle_tag]
var/origin_area = tgui_input_list(user, "Which area is the shuttle at now? (MAKE SURE THIS IS CORRECT OR THINGS WILL BREAK)", "Area Choice", return_areas()) var/list/area_choices = return_areas()
var/origin_area = tgui_input_list(user, "Which area is the shuttle at now? (MAKE SURE THIS IS CORRECT OR THINGS WILL BREAK)", "Area Choice", area_choices)
if (!origin_area) return if (!origin_area) return
var/destination_area = tgui_input_list(user, "Which area is the shuttle at now? (MAKE SURE THIS IS CORRECT OR THINGS WILL BREAK)", "Area Choice", return_areas()) var/destination_area = tgui_input_list(user, "Which area is the shuttle at now? (MAKE SURE THIS IS CORRECT OR THINGS WILL BREAK)", "Area Choice", area_choices)
if (!destination_area) return if (!destination_area) return
var/long_jump = tgui_alert(user, "Is there a transition area for this jump?","Transition?", list("Yes","No")) var/long_jump = tgui_alert(user, "Is there a transition area for this jump?","Transition?", list("Yes","No"))
if (long_jump == "Yes") if (long_jump == "Yes")
var/transition_area = tgui_input_list(user, "Which area is the transition area? (MAKE SURE THIS IS CORRECT OR THINGS WILL BREAK)", "Area Choice", return_areas()) var/transition_area = tgui_input_list(user, "Which area is the transition area? (MAKE SURE THIS IS CORRECT OR THINGS WILL BREAK)", "Area Choice", area_choices)
if (!transition_area) return if (!transition_area) return
var/move_duration = input(user, "How many seconds will this jump take?") as num var/move_duration = input(user, "How many seconds will this jump take?") as num
S.long_jump(origin_area, destination_area, transition_area, move_duration) S.long_jump(area_choices[origin_area], area_choices[destination_area], area_choices[transition_area], move_duration)
message_admins("<span class='notice'>[key_name_admin(user)] has initiated a jump from [origin_area] to [destination_area] lasting [move_duration] seconds for the [shuttle_tag] shuttle</span>", 1) message_admins("<span class='notice'>[key_name_admin(user)] has initiated a jump from [origin_area] to [destination_area] lasting [move_duration] seconds for the [shuttle_tag] shuttle</span>", 1)
log_admin("[key_name_admin(user)] has initiated a jump from [origin_area] to [destination_area] lasting [move_duration] seconds for the [shuttle_tag] shuttle") log_admin("[key_name_admin(user)] has initiated a jump from [origin_area] to [destination_area] lasting [move_duration] seconds for the [shuttle_tag] shuttle")
else else
S.short_jump(origin_area, destination_area) S.short_jump(area_choices[origin_area], area_choices[destination_area])
message_admins("<span class='notice'>[key_name_admin(user)] has initiated a jump from [origin_area] to [destination_area] for the [shuttle_tag] shuttle</span>", 1) message_admins("<span class='notice'>[key_name_admin(user)] has initiated a jump from [origin_area] to [destination_area] for the [shuttle_tag] shuttle</span>", 1)
log_admin("[key_name_admin(user)] has initiated a jump from [origin_area] to [destination_area] for the [shuttle_tag] shuttle") log_admin("[key_name_admin(user)] has initiated a jump from [origin_area] to [destination_area] for the [shuttle_tag] shuttle")

1951
code/modules/mob/dead/observer/observer.dm
View File

File diff suppressed because it is too large Load Diff

2
code/modules/mob/living/silicon/ai/multicam.dm
View File

@@ -153,7 +153,7 @@ Whatever you did that made the last camera window disappear-- don't do that agai
. = ..() . = ..()
/area/ai_multicam_room /area/ai_multicam_room
name = "ai_multicam_room" name = "AI Multicam Room"
icon_state = "ai_camera_room" icon_state = "ai_camera_room"
dynamic_lighting = FALSE dynamic_lighting = FALSE
ambience = list() ambience = list()