shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into familyport

Browse Source
This commit is contained in:
keronshb
2021-10-28 14:41:46 -04:00
parent c80d65df73 853ff1d8ad
commit 8978ee10fe
387 changed files with 1908 additions and 1658 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/mind.dm
+5 -10
View File
@@ -420,7 +420,7 @@
A.admin_remove(usr)
if (href_list["role_edit"])
var/new_role = input("Select new role", "Assigned role", assigned_role) as null|anything in get_all_jobs()
var/new_role = tgui_input_list(usr, "Select new role", "Assigned role", get_all_jobs())
if (!new_role)
return
assigned_role = new_role
@@ -433,7 +433,6 @@
else if (href_list["obj_edit"] || href_list["obj_add"])
var/objective_pos //Edited objectives need to keep same order in antag objective list
var/def_value
var/datum/antagonist/target_antag
var/datum/objective/old_objective //The old objective we're replacing/editing
var/datum/objective/new_objective //New objective we're be adding
@@ -461,7 +460,7 @@
if(1)
target_antag = antag_datums[1]
else
var/datum/antagonist/target = input("Which antagonist gets the objective:", "Antagonist", "(new custom antag)") as null|anything in antag_datums + "(new custom antag)"
var/datum/antagonist/target = tgui_input_list(usr, "Which antagonist gets the objective:", "Antagonist", list(antag_datums + "(new custom antag)"))
if (QDELETED(target))
return
else if(target == "(new custom antag)")
@@ -495,11 +494,7 @@
var/datum/objective/X = T
choices[initial(X.name)] = T
if(old_objective)
if(old_objective.name in choices)
def_value = old_objective.name
var/selected_type = input("Select objective type:", "Objective type", def_value) as null|anything in choices
var/selected_type = tgui_input_list(usr, "Select objective type:", "Objective type", choices)
selected_type = choices[selected_type]
if (!selected_type)
return
@@ -537,7 +532,7 @@
choices[initial(t.employer)] = C
var/datum/antagonist/traitor/T = locate(href_list["target_antag"]) in antag_datums
if(T)
var/selected_type = input("Select traitor class:", "Traitor class", T.traitor_kind.employer) as null|anything in choices
var/selected_type = tgui_input_list(usr, "Select traitor class:", "Traitor class", choices)
selected_type = choices[selected_type]
T.set_traitor_kind(selected_type)
@@ -598,7 +593,7 @@
if(check_rights(R_FUN, 0))
var/datum/component/uplink/U = find_syndicate_uplink()
if(U)
var/crystals = input("Amount of telecrystals for [key]","Syndicate uplink", U.telecrystals) as null | num
var/crystals = tgui_input_num(usr, "Amount of telecrystals for [key]","Syndicate uplink", U.telecrystals)
if(!isnull(crystals))
U.telecrystals = crystals
message_admins("[key_name_admin(usr)] changed [current]'s telecrystal count to [crystals].")