mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-23 00:22:12 +00:00
TGUI fixes, part 3 (#16560)
* a * TGUI fixes part 3 * ugh * bwuh * ambiguous my ass * AOAOAOAO * pt 4 * extra foolproof * a * ok good thing i caught that * enable that for AI --------- Co-authored-by: Matt Atlas <liermattia@gmail.com> Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
This commit is contained in:
@@ -253,7 +253,7 @@
|
||||
M.gestalt = src
|
||||
add_verb(M, /mob/living/carbon/alien/diona/proc/merge_back_to_gestalt)
|
||||
add_verb(M, /mob/living/carbon/alien/diona/proc/switch_to_gestalt)
|
||||
add_verb(src, /mob/living/carbon/human/proc/switch_to_nymph)
|
||||
add_verb(M, /mob/living/carbon/human/proc/switch_to_nymph)
|
||||
M.detached = TRUE
|
||||
M.update_verbs(TRUE)
|
||||
M.languages = languages.Copy()
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
/mob/living
|
||||
var/datum/language/default_language
|
||||
|
||||
/mob/living/verb/set_default_language(language as null|anything in languages)
|
||||
/mob/living/verb/set_default_language()
|
||||
set name = "Set Default Language"
|
||||
set category = "IC"
|
||||
|
||||
var/datum/language/language = input(src, "Choose a language.", "Set Default Language") as null|anything in languages
|
||||
if(language)
|
||||
to_chat(src, "<span class='notice'>You will now speak [language] if you do not specify a language when speaking.</span>")
|
||||
else
|
||||
|
||||
@@ -294,13 +294,11 @@
|
||||
if(next_alarm_notice && (world.time > next_alarm_notice))
|
||||
next_alarm_notice = 0
|
||||
|
||||
var/alarm_raised = FALSE
|
||||
for(var/datum/alarm_handler/AH in queued_alarms)
|
||||
var/list/alarms = queued_alarms[AH]
|
||||
var/reported = FALSE
|
||||
for(var/datum/alarm/A in alarms)
|
||||
if(alarms[A] == 1)
|
||||
alarm_raised = TRUE
|
||||
if(!reported)
|
||||
reported = TRUE
|
||||
to_chat(src, SPAN_WARNING("--- [AH.category] Detected ---"))
|
||||
@@ -316,9 +314,6 @@
|
||||
to_chat(src, SPAN_NOTICE("--- [AH.category] Cleared ---"))
|
||||
to_chat(src, "\The [A.alarm_name()].")
|
||||
|
||||
if(alarm_raised)
|
||||
to_chat(src, "<A HREF=?src=\ref[src];showalerts=1>\[Show Alerts\]</A>")
|
||||
|
||||
for(var/datum/alarm_handler/AH in queued_alarms)
|
||||
var/list/alarms = queued_alarms[AH]
|
||||
alarms.Cut()
|
||||
|
||||
@@ -1250,8 +1250,9 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT)
|
||||
/mob/proc/in_neck_grab()
|
||||
for(var/thing in grabbed_by)
|
||||
var/obj/item/grab/G = thing
|
||||
if(G.state >= GRAB_NECK)
|
||||
return TRUE
|
||||
if(istype(G))
|
||||
if(G.state >= GRAB_NECK)
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
/mob/get_cell()
|
||||
|
||||
@@ -78,13 +78,14 @@
|
||||
for(var/datum/computer_file/program/P in hard_drive.stored_files)
|
||||
if(P.program_hidden())
|
||||
continue
|
||||
data["programs"] += list(list(
|
||||
"filename" = P.filename,
|
||||
"desc" = P.filedesc,
|
||||
"autorun" = istype(autorun) && (autorun.stored_data == P.filename),
|
||||
"running" = (P in idle_threads)
|
||||
))
|
||||
if(P.program_type & PROGRAM_SERVICE)
|
||||
if(!istype(P, /datum/computer_file/program/scanner))
|
||||
data["programs"] += list(list(
|
||||
"filename" = P.filename,
|
||||
"desc" = P.filedesc,
|
||||
"autorun" = istype(autorun) && (autorun.stored_data == P.filename),
|
||||
"running" = (P in idle_threads)
|
||||
))
|
||||
else
|
||||
data["services"] += list(list(
|
||||
"filename" = P.filename,
|
||||
"desc" = P.filedesc,
|
||||
|
||||
@@ -143,11 +143,11 @@
|
||||
"focused" = (focused_conv == channel)
|
||||
)
|
||||
if(can_interact)
|
||||
our_channel["msg"] = channel.messages
|
||||
our_channel["users"] = list()
|
||||
for(var/datum/ntnet_user/U in channel.users)
|
||||
var/uref = text_ref(U)
|
||||
our_channel["users"] += list(list("ref" = uref, "username" = U.username))
|
||||
data["msg"] = channel.messages
|
||||
data["channels"] += list(our_channel)
|
||||
|
||||
data["users"] = list()
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
"wtype" = W.wtype
|
||||
))
|
||||
data["allwarrants"] = allwarrants
|
||||
data["active_warrant"] = null
|
||||
return data
|
||||
|
||||
/datum/computer_file/program/digitalwarrant/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
|
||||
|
||||
@@ -59,6 +59,8 @@
|
||||
if(!category)
|
||||
category = "Alive"
|
||||
var/special_char = is_special_character(M)
|
||||
if(!name)
|
||||
continue
|
||||
|
||||
ghosts += list(list("name" = name, "ref" = ref(M), "category" = category, "special_character" = special_char))
|
||||
categories |= category
|
||||
|
||||
Reference in New Issue
Block a user