diff --git a/code/__DEFINES/cooldowns.dm b/code/__DEFINES/cooldowns.dm index 947f3202e6..13a7633409 100644 --- a/code/__DEFINES/cooldowns.dm +++ b/code/__DEFINES/cooldowns.dm @@ -28,7 +28,7 @@ //INDEXES #define COOLDOWN_EMPLOYMENT_CABINET "employment cabinet" #define COOLDOWN_AMBITION "ambition" -#define COOLDOWN_OBJECTIVES "objectives" + //TIMER COOLDOWN MACROS diff --git a/code/datums/mind.dm b/code/datums/mind.dm index a612938965..e6414f1d9f 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -30,7 +30,6 @@ */ //ambition port start #define AMBITION_COOLDOWN_TIME (5 SECONDS) -#define OBJECTIVES_COOLDOWN_TIME (10 MINUTES) //ambition port end @@ -199,7 +198,7 @@ . = LAZYLEN(antag_datums) LAZYADD(antag_datums, instanced_datum) if(!.) - current.verbs += /mob/proc/edit_objectives_and_ambitions + current.verbs += /mob/proc/edit_ambitions //ambitions port end /datum/mind/proc/remove_antag_datum(datum_type) @@ -221,8 +220,8 @@ . = LAZYLEN(antag_datums) LAZYREMOVE(antag_datums, instanced_datum) if(. && !LAZYLEN(antag_datums)) + current.verbs -= /mob/proc/edit_ambitions ambitions = null - current.verbs += /mob/proc/edit_objectives_and_ambitions //ambitions port end /datum/mind/proc/has_antag_datum(datum_type, check_subtypes = TRUE) @@ -439,56 +438,18 @@ return output.Join() -/datum/mind/proc/show_editable_objectives_and_ambitions() - var/is_admin = check_rights(R_ADMIN, FALSE) - var/self_mind = usr == current - if(!is_admin && !self_mind) - return "" - var/list/output = list() - for(var/a in antag_datums) - var/datum/antagonist/antag_datum = a - output += "Objectives:" - if(is_admin) - output += " Add Objective" - output += "" - if(is_admin) - output += "Announce objectives
" - output += "
Requested Objectives:" - if(self_mind) - output += " Request objective" - output += "
" - output += "[current.real_name]'s Ambitions:" - if(LAZYLEN(ambitions) < CONFIG_GET(number/max_ambitions)) - output += " Add Ambition" - output += "" return output.Join() @@ -499,53 +460,24 @@ mind.do_edit_ambitions() -/datum/mind/proc/do_edit_objectives_ambitions() - var/datum/browser/popup = new(usr, "objectives and ambitions", "Objectives and Ambitions") - popup.set_content(show_editable_objectives_and_ambitions()) +/datum/mind/proc/do_edit_ambitions() + var/datum/browser/popup = new(usr, "ambitions", "Ambitions") + popup.set_content(show_editable_ambitions()) popup.open() - -GLOBAL_VAR_INIT(requested_objective_uid, 0) -GLOBAL_LIST(objective_choices) - -/proc/populate_objective_choices() - GLOB.objective_choices = list() - var/list/allowed_types = list( - /datum/objective/custom, - /datum/objective/assassinate, - /datum/objective/assassinate/once, - /datum/objective/maroon, - /datum/objective/debrain, - /datum/objective/protect, - /datum/objective/destroy, - /datum/objective/hijack, - /datum/objective/escape, - /datum/objective/survive, - /datum/objective/martyr, - /datum/objective/steal, - /datum/objective/download, - /datum/objective/nuclear, - /datum/objective/absorb, - /datum/objective/blackmail_implant //SKYRAT ADDITION - ) - - for(var/t in allowed_types) - var/datum/objective/type_cast = t - GLOB.objective_choices[initial(type_cast.name)] = t //ambition port end /datum/mind/Topic(href, href_list) //ambition port start - if (href_list["refresh_obj_amb"]) - do_edit_objectives_ambitions() - + if (href_list["refresh_ambitions"]) + do_edit_ambitions() return else if (href_list["add_ambition"]) - if(!check_rights(R_ADMIN, FALSE)) + if(!check_rights(R_ADMIN)) if(usr != current) return if(COOLDOWN_CHECK(src, COOLDOWN_AMBITION)) - to_chat(usr, "You must wait [AMBITION_COOLDOWN_TIME * 0.1] seconds between changes.") + to_chat(usr, "You must wait [AMBITION_COOLDOWN_TIME * 10] seconds between changes.") return if(!isliving(current)) return @@ -554,16 +486,16 @@ GLOBAL_LIST(objective_choices) var/max_ambitions = CONFIG_GET(number/max_ambitions) if(LAZYLEN(ambitions) >= max_ambitions) to_chat(usr, "There's a limit of [max_ambitions] ambitions. Edit or remove some to accomodate for your new additions.") - do_edit_objectives_ambitions() + do_edit_ambitions() return var/new_ambition = stripped_multiline_input(usr, "Write new ambition", "Ambition", "", MAX_AMBITION_LEN) if(isnull(new_ambition)) return - if(!check_rights(R_ADMIN, FALSE)) + if(!check_rights(R_ADMIN)) if(usr != current) return if(COOLDOWN_CHECK(src, COOLDOWN_AMBITION)) - to_chat(usr, "You must wait [AMBITION_COOLDOWN_TIME * 0.1] seconds between changes.") + to_chat(usr, "You must wait [AMBITION_COOLDOWN_TIME * 10] seconds between changes.") return if(!isliving(current)) to_chat(usr, "The mind holder is no longer a living creature.") @@ -573,7 +505,7 @@ GLOBAL_LIST(objective_choices) return if(LAZYLEN(ambitions) >= max_ambitions) to_chat(usr, "There's a limit of [max_ambitions] ambitions. Edit or remove some to accomodate for your new additions.") - do_edit_objectives_ambitions() + do_edit_ambitions() return COOLDOWN_START(src, COOLDOWN_AMBITION, AMBITION_COOLDOWN_TIME) LAZYADD(ambitions, new_ambition) @@ -582,15 +514,15 @@ GLOBAL_LIST(objective_choices) else log_game("[key_name(usr)] has created [key_name(current)]'s ambition of index [LAZYLEN(ambitions)].\nNEW AMBITION:\n[new_ambition]") message_admins("[ADMIN_TPMONTY(usr)] has created [ADMIN_TPMONTY(current)]'s ambition of index [LAZYLEN(ambitions)].") - do_edit_objectives_ambitions() + do_edit_ambitions() return else if (href_list["edit_ambition"]) - if(!check_rights(R_ADMIN, FALSE)) + if(!check_rights(R_ADMIN)) if(usr != current) return if(COOLDOWN_CHECK(src, COOLDOWN_AMBITION)) - to_chat(usr, "You must wait [AMBITION_COOLDOWN_TIME * 0.1] seconds between changes.") + to_chat(usr, "You must wait [AMBITION_COOLDOWN_TIME * 10] seconds between changes.") return if(!isliving(current)) return @@ -607,11 +539,11 @@ GLOBAL_LIST(objective_choices) var/new_ambition = stripped_multiline_input(usr, "Write new ambition", "Ambition", ambitions[ambition_index], MAX_AMBITION_LEN) if(isnull(new_ambition)) return - if(!check_rights(R_ADMIN, FALSE)) + if(!check_rights(R_ADMIN)) if(usr != current) return if(COOLDOWN_CHECK(src, COOLDOWN_AMBITION)) - to_chat(usr, "You must wait [AMBITION_COOLDOWN_TIME * 0.1] seconds between changes.") + to_chat(usr, "You must wait [AMBITION_COOLDOWN_TIME * 10] seconds between changes.") return if(!isliving(current)) to_chat(usr, "The mind holder is no longer a living creature.") @@ -621,11 +553,11 @@ GLOBAL_LIST(objective_choices) return if(ambition_index > LAZYLEN(ambitions)) to_chat(usr, "The ambition we were editing was deleted before we finished. Aborting.") - do_edit_objectives_ambitions() + do_edit_ambitions() return if(old_ambition != ambitions[ambition_index]) to_chat(usr, "The ambition has changed since we started editing it. Aborting to prevent data loss.") - do_edit_objectives_ambitions() + do_edit_ambitions() return COOLDOWN_START(src, COOLDOWN_AMBITION, AMBITION_COOLDOWN_TIME) ambitions[ambition_index] = new_ambition @@ -634,15 +566,15 @@ GLOBAL_LIST(objective_choices) else log_game("[key_name(usr)] has edited [key_name(current)]'s ambition of index [ambition_index].\nOLD AMBITION:\n[old_ambition]\nNEW AMBITION:\n[new_ambition]") message_admins("[ADMIN_TPMONTY(usr)] has edited [ADMIN_TPMONTY(current)]'s ambition of index [ambition_index].") - do_edit_objectives_ambitions() + do_edit_ambitions() return else if (href_list["remove_ambition"]) - if(!check_rights(R_ADMIN, FALSE)) + if(!check_rights(R_ADMIN)) if(usr != current) return if(COOLDOWN_CHECK(src, COOLDOWN_AMBITION)) - to_chat(usr, "You must wait [AMBITION_COOLDOWN_TIME * 0.1] seconds between changes.") + to_chat(usr, "You must wait [AMBITION_COOLDOWN_TIME * 10] seconds between changes.") return if(!isliving(current)) return @@ -650,7 +582,7 @@ GLOBAL_LIST(objective_choices) return var/ambition_index = text2num(href_list["remove_ambition"]) if(ambition_index > LAZYLEN(ambitions)) - do_edit_objectives_ambitions() + do_edit_ambitions() return if(!isnum(ambition_index) || ambition_index < 0 || ambition_index % 1) log_admin_private("[key_name(usr)] attempted to remove an ambition with and invalid ambition_index ([ambition_index]) at [AREACOORD(usr.loc)].") @@ -659,11 +591,11 @@ GLOBAL_LIST(objective_choices) var/old_ambition = ambitions[ambition_index] if(alert(usr, "Are you sure you want to delete this ambition?", "Delete ambition", "Yes", "No") != "Yes") return - if(!check_rights(R_ADMIN, FALSE)) + if(!check_rights(R_ADMIN)) if(usr != current) return if(COOLDOWN_CHECK(src, COOLDOWN_AMBITION)) - to_chat(usr, "You must wait [AMBITION_COOLDOWN_TIME * 0.1] seconds between changes.") + to_chat(usr, "You must wait [AMBITION_COOLDOWN_TIME * 10] seconds between changes.") return if(!isliving(current)) to_chat(usr, "The mind holder is no longer a living creature. The ambition we were deleting should no longer exist already.") @@ -673,11 +605,11 @@ GLOBAL_LIST(objective_choices) return if(ambition_index > LAZYLEN(ambitions)) to_chat(usr, "The ambition we were deleting was deleted before we finished. No need to continue.") - do_edit_objectives_ambitions() + do_edit_ambitions() return if(old_ambition != ambitions[ambition_index]) to_chat(usr, "The ambition has changed since we started considering its deletion. Aborting to prevent conflicts.") - do_edit_objectives_ambitions() + do_edit_ambitions() return COOLDOWN_START(src, COOLDOWN_AMBITION, AMBITION_COOLDOWN_TIME) LAZYCUT(ambitions, ambition_index, ambition_index + 1) @@ -686,113 +618,7 @@ GLOBAL_LIST(objective_choices) else log_game("[key_name(usr)] has deleted [key_name(current)]'s ambition of index [ambition_index].\nDELETED AMBITION:\n[old_ambition]") message_admins("[ADMIN_TPMONTY(usr)] has deleted [ADMIN_TPMONTY(current)]'s ambition of index [ambition_index].") - do_edit_objectives_ambitions() - return - - else if (href_list["req_obj_add"]) - if(usr != current) - return - if(COOLDOWN_CHECK(src, COOLDOWN_OBJECTIVES)) - to_chat(usr, "You must wait [round(OBJECTIVES_COOLDOWN_TIME / 600, 0.1)] minutes between requests.") - return - var/datum/antagonist/target_antag = locate(href_list["target_antag"]) in antag_datums - if(!istype(target_antag)) - to_chat(usr, "No antagonist found for this objective.") - do_edit_objectives_ambitions() - return - if(!GLOB.objective_choices) - populate_objective_choices() - var/choe = input("Select desired objective type:", "Objective type") as null|anything in GLOB.objective_choices - var/selected_type = GLOB.objective_choices[choe] - if(!selected_type) - return - var/new_objective = stripped_multiline_input(usr,\ - selected_type == /datum/objective/custom\ - ? "Write the custom objective you'd like to request the admins to grant you.\ - Remember they can edit or deny your request. There's a 10 minutes cooldown between requests, so try to think it through before sending it. Cancelling does not trigger the cooldown."\ - : "Justify your request for a new objective to the admins. Add the required clarifations, if you have a specific targets in mind or the likes.\ - Remember they can edit or deny your request. There's a 10 minutes cooldown between requests, so try to think it through before sending it. Cancelling does not trigger the cooldown.",\ - "New Objective", max_length = MAX_MESSAGE_LEN) - if(isnull(new_objective)) - return - if(usr != current) - return - if(COOLDOWN_CHECK(src, COOLDOWN_OBJECTIVES)) - to_chat(usr, "You must wait [round(OBJECTIVES_COOLDOWN_TIME / 600, 0.1)] minutes between requests.") - return - if(QDELETED(target_antag)) - return - COOLDOWN_START(src, COOLDOWN_OBJECTIVES, OBJECTIVES_COOLDOWN_TIME) - var/uid = "[GLOB.requested_objective_uid++]" - LAZYADD(target_antag.requested_objectives, uid) - target_antag.requested_objectives[uid] = list("type" = selected_type, "text" = new_objective) - log_admin("[key_name(usr)] has requested a [choe] objective: [new_objective]") - message_admins("[ADMIN_TPMONTY(usr)] has requested a [choe] objective. (RPLY)") - to_chat(usr, "The admins have been notified of your request!") - do_edit_objectives_ambitions() - return - - else if (href_list["req_obj_delete"]) - if(usr != current) - return - if(COOLDOWN_CHECK(src, COOLDOWN_OBJECTIVES)) - to_chat(usr, "You must wait [round(OBJECTIVES_COOLDOWN_TIME / 600, 0.1)] minutes between requests.") - return - var/datum/objective/objective_to_delete = locate(href_list["req_obj_delete"]) - if(!istype(objective_to_delete) || QDELETED(objective_to_delete)) - to_chat(usr, "No objective found. Perhaps it was already deleted?") - do_edit_objectives_ambitions() - return - var/justifation = stripped_multiline_input(usr, - "Justify your request for a deleting this objective to the admins.\ - There's a 10 minutes cooldown between requests, so try to think it through before sending it. Cancelling does not trigger the cooldown.", - "Objective Deletion", max_length = MAX_MESSAGE_LEN) - if(isnull(justifation)) - return - if(usr != current) - return - if(COOLDOWN_CHECK(src, COOLDOWN_OBJECTIVES)) - to_chat(usr, "You must wait [round(OBJECTIVES_COOLDOWN_TIME / 600, 0.1)] minutes between requests.") - return - if(QDELETED(objective_to_delete)) - do_edit_objectives_ambitions() - return - COOLDOWN_START(src, COOLDOWN_OBJECTIVES, OBJECTIVES_COOLDOWN_TIME) - log_admin("[key_name(usr)] has requested the deletion of the following objective: [objective_to_delete.explanation_text].\nTheir justifation is as follows: [justifation]") - message_admins("[ADMIN_TPMONTY(usr)] has requested the deletion of the following objective: [objective_to_delete.explanation_text].\nTheir justifation is as follows: [justifation]\n(RPLY)") - to_chat(usr, "The admins have been notified of your request!") - do_edit_objectives_ambitions() - return - else if (href_list["req_obj_completed"]) - if(usr != current) - return - if(COOLDOWN_CHECK(src, COOLDOWN_OBJECTIVES)) - to_chat(usr, "You must wait [round(OBJECTIVES_COOLDOWN_TIME / 600, 0.1)] minutes between requests.") - return - var/datum/objective/objective_to_complete = locate(href_list["req_obj_completed"]) - if(!istype(objective_to_complete) || QDELETED(objective_to_complete)) - to_chat(usr, "No objective found. Perhaps it was already deleted?") - do_edit_objectives_ambitions() - return - var/justifation = stripped_multiline_input(usr, - "Justify your request for the [objective_to_complete.completed ? "completion" : "incompletion"] of this objective to the admins.\ - There's a 10 minutes cooldown between requests, so try to think it through before sending it. Cancelling does not trigger the cooldown.", - "Objective [objective_to_complete.completed ? "Completion" : "Incompletion"]", max_length = MAX_MESSAGE_LEN) - if(isnull(justifation)) - return - if(usr != current) - return - if(COOLDOWN_CHECK(src, COOLDOWN_OBJECTIVES)) - to_chat(usr, "You must wait [round(OBJECTIVES_COOLDOWN_TIME / 600, 0.1)] minutes between requests.") - return - if(QDELETED(objective_to_complete)) - do_edit_objectives_ambitions() - return - COOLDOWN_START(src, COOLDOWN_OBJECTIVES, OBJECTIVES_COOLDOWN_TIME) - log_admin("[key_name(usr)] has requested the [objective_to_complete.completed ? "completion" : "incompletion"] of the following objective: [objective_to_complete.explanation_text].\nTheir justifation is as follows: [justifation]") - message_admins("[ADMIN_TPMONTY(usr)] has requested the [objective_to_complete.completed ? "completion" : "incompletion"] of the following objective: [objective_to_complete.explanation_text].\nTheir justifation is as follows: [justifation]\n(RPLY)") - to_chat(usr, "The admins have been notified of your request!") - do_edit_objectives_ambitions() + do_edit_ambitions() return if(!check_rights(R_ADMIN)) return @@ -800,236 +626,12 @@ GLOBAL_LIST(objective_choices) var/self_antagging = usr == current if(href_list["edit_ambitions_panel"]) - do_edit_objectives_ambitions() + do_edit_ambitions() return - else if(href_list["refresh_antag_panel"]) traitor_panel() return - - else if (href_list["req_obj_edit"]) - var/datum/antagonist/antag_datum = locate(href_list["req_obj_edit"]) - if(QDELETED(antag_datum)) - do_edit_objectives_ambitions() - to_chat(usr, "No antag found.") - return - if(antag_datum.owner != src) - do_edit_objectives_ambitions() - to_chat(usr, "Invalid antag reference.") - return - var/uid = href_list["req_obj_id"] - var/list/requested_objective = LAZYACCESS(antag_datum.requested_objectives, uid) - if(!requested_objective) - do_edit_objectives_ambitions() - to_chat(usr, "Invalid requested objective reference.") - return - - switch(alert(usr, "Do you want to edit the requested objective type or text?", "Edit requested objective", "Type", "Text", "Cancel")) - if("Type") - if(!check_rights(R_ADMIN)) - return - if(QDELETED(antag_datum)) - to_chat(usr, "No antag found.") - do_edit_objectives_ambitions() - return - if(!LAZYACCESS(antag_datum.requested_objectives, uid)) - to_chat(usr, "Invalid requested objective reference.") - do_edit_objectives_ambitions() - return - var/datum/objective/type_cast = requested_objective["type"] - var/selected_type = input("Select new requested objective type:", "Requested Objective type", initial(type_cast.name)) as null|anything in GLOB.objective_choices - selected_type = GLOB.objective_choices[selected_type] - if(!selected_type) - return - if(!check_rights(R_ADMIN)) - return - if(QDELETED(antag_datum)) - to_chat(usr, "No antag found.") - do_edit_objectives_ambitions() - return - if(!LAZYACCESS(antag_datum.requested_objectives, uid)) - to_chat(usr, "Invalid requested objective reference.") - do_edit_objectives_ambitions() - return - log_admin("[key_name(usr)] has edited the requested objective type for [current], of UID [uid], from [requested_objective["type"]] to [selected_type]") - message_admins("[key_name_admin(usr)] has edited the requested objective type for [current], of UID [uid], from [requested_objective["type"]] to [selected_type]") - requested_objective["type"] = selected_type - if("Text") - if(!check_rights(R_ADMIN)) - return - if(QDELETED(antag_datum)) - to_chat(usr, "No antag found.") - do_edit_objectives_ambitions() - return - if(!LAZYACCESS(antag_datum.requested_objectives, uid)) - to_chat(usr, "Invalid requested objective reference.") - do_edit_objectives_ambitions() - return - var/new_text = stripped_multiline_input(usr, "Input new requested objective text", "Requested Objective Text", requested_objective["text"], MAX_MESSAGE_LEN) - if (isnull(new_text)) - return - if(!check_rights(R_ADMIN)) - return - if(QDELETED(antag_datum)) - to_chat(usr, "No antag found.") - do_edit_objectives_ambitions() - return - if(!LAZYACCESS(antag_datum.requested_objectives, uid)) - to_chat(usr, "Invalid requested objective reference.") - do_edit_objectives_ambitions() - return - log_admin("[key_name(usr)] has edited the requested objective text for [current], of UID [uid], from [requested_objective["text"]] to [new_text]") - message_admins("[key_name_admin(usr)] has edited the requested objective text for [current], of UID [uid], from [requested_objective["text"]] to [new_text]") - requested_objective["text"] = new_text - do_edit_objectives_ambitions() - return - - else if (href_list["req_obj_accept"]) - var/datum/antagonist/antag_datum = locate(href_list["req_obj_accept"]) - if(QDELETED(antag_datum)) - do_edit_objectives_ambitions() - to_chat(usr, "No antag found.") - return - if(antag_datum.owner != src) - do_edit_objectives_ambitions() - to_chat(usr, "Invalid antag reference.") - return - var/uid = href_list["req_obj_id"] - var/list/requested_objective = LAZYACCESS(antag_datum.requested_objectives, uid) - if(!requested_objective) - do_edit_objectives_ambitions() - to_chat(usr, "Invalid requested objective reference.") - return - if(alert(usr, "Are you sure you want to approve this objective?", "Approve objective", "Yes", "No") != "Yes") - return - if(!check_rights(R_ADMIN)) - return - if(QDELETED(antag_datum)) - to_chat(usr, "No antag found.") - do_edit_objectives_ambitions() - return - if(!LAZYACCESS(antag_datum.requested_objectives, uid)) - to_chat(usr, "Invalid requested objective reference.") - do_edit_objectives_ambitions() - return - var/objective_path = requested_objective["type"] - var/datum/objective/new_objective = new objective_path - new_objective.owner = src - if(istype(new_objective, /datum/objective/custom)) - new_objective.explanation_text = requested_objective["text"] - else - new_objective.admin_edit(usr) - antag_datum.objectives += new_objective - LAZYREMOVE(antag_datum.requested_objectives, uid) - message_admins("[key_name_admin(usr)] approved a requested objective from [current]: [new_objective.explanation_text]") - log_admin("[key_name(usr)] approved a requested objective from [current]: [new_objective.explanation_text]") - to_chat(current, "Your objective request has been approved.") - do_edit_objectives_ambitions() - return - - else if (href_list["req_obj_deny"]) - var/datum/antagonist/antag_datum = locate(href_list["req_obj_deny"]) - if(QDELETED(antag_datum)) - do_edit_objectives_ambitions() - to_chat(usr, "No antag found.") - return - if(antag_datum.owner != src) - do_edit_objectives_ambitions() - to_chat(usr, "Invalid antag reference.") - return - var/uid = href_list["req_obj_id"] - var/list/requested_objective = LAZYACCESS(antag_datum.requested_objectives, uid) - if(!requested_objective) - do_edit_objectives_ambitions() - to_chat(usr, "Invalid requested objective reference.") - return - var/justifation = stripped_multiline_input(usr, "Justify why you are denying this objective request.", "Deny", memory, MAX_MESSAGE_LEN) - if(isnull(justifation)) - return - if(!check_rights(R_ADMIN)) - return - if(QDELETED(antag_datum)) - to_chat(usr, "No antag found.") - do_edit_objectives_ambitions() - return - if(!LAZYACCESS(antag_datum.requested_objectives, uid)) - to_chat(usr, "Invalid requested objective reference.") - do_edit_objectives_ambitions() - return - var/datum/objective/type_cast = requested_objective["type"] - var/objective_name = initial(type_cast.name) - message_admins("[key_name_admin(usr)] denied a requested [objective_name] objective from [current]: [requested_objective["text"]]") - log_admin("[key_name(usr)] denied a requested [objective_name] objective from [current]: [requested_objective["text"]]") - to_chat(current, "Your objective request has been denied for the following reason: [justifation]") - LAZYREMOVE(antag_datum.requested_objectives, uid) - do_edit_objectives_ambitions() - return - - else if (href_list["obj_panel_complete_toggle"]) - var/datum/objective/objective_to_toggle = locate(href_list["obj_panel_complete_toggle"]) - if(!istype(objective_to_toggle) || QDELETED(objective_to_toggle)) - to_chat(usr, "No objective found. Perhaps it was already deleted?") - do_edit_objectives_ambitions() - return - if(objective_to_toggle.owner != src) - do_edit_objectives_ambitions() - to_chat(usr, "Invalid objective reference.") - return - objective_to_toggle.completed = !objective_to_toggle.completed - message_admins("[key_name_admin(usr)] toggled the win state for [current]'s objective: [objective_to_toggle.explanation_text]") - log_admin("[key_name(usr)] toggled the win state for [current]'s objective: [objective_to_toggle.explanation_text]") - if(alert(usr, "Would you like to alert the player of the change?", "Deny objective", "Yes", "No") == "Yes") - to_chat(current, "[objective_to_toggle.completed ? "" : ""]Your objective status has changed!") - do_edit_objectives_ambitions() - return - - else if (href_list["obj_panel_delete"]) - var/datum/objective/objective_to_delete = locate(href_list["obj_panel_delete"]) - if(!istype(objective_to_delete) || QDELETED(objective_to_delete)) - to_chat(usr, "No objective found. Perhaps it was already deleted?") - do_edit_objectives_ambitions() - return - if(objective_to_delete.owner != src) - do_edit_objectives_ambitions() - to_chat(usr, "Invalid objective reference.") - return - if(alert(usr, "Are you sure you want to delete this objective?", "Delete objective", "Yes", "No") != "Yes") - return - if(!check_rights(R_ADMIN)) - return - if(QDELETED(objective_to_delete)) - return - message_admins("[key_name_admin(usr)] removed an objective from [current]: [objective_to_delete.explanation_text]") - log_admin("[key_name(usr)] removed an objective from [current]: [objective_to_delete.explanation_text]") - qdel(objective_to_delete) - do_edit_objectives_ambitions() - return - - else if (href_list["obj_panel_edit"]) - var/datum/objective/objective_to_edit = locate(href_list["obj_panel_edit"]) - if(!istype(objective_to_edit) || QDELETED(objective_to_edit)) - to_chat(usr, "No objective found. Perhaps it was already deleted?") - do_edit_objectives_ambitions() - return - if(objective_to_edit.owner != src) - do_edit_objectives_ambitions() - to_chat(usr, "Invalid objective reference.") - return - var/explanation_before = objective_to_edit.explanation_text - objective_to_edit.admin_edit(usr) - if(QDELETED(objective_to_edit)) - return - message_admins("[key_name_admin(usr)] edited an objective from [current]:\ - Before: [explanation_before]\ - After: [objective_to_edit.explanation_text]") - log_admin("[key_name(usr)] edited an objective from [current]:\ - Before: [explanation_before]\ - After: [objective_to_edit.explanation_text]") - do_edit_objectives_ambitions() - return - //ambition port end - if(href_list["add_antag"]) add_antag_wrapper(text2path(href_list["add_antag"]),usr) if(href_list["remove_antag"]) @@ -1089,16 +691,38 @@ GLOBAL_LIST(objective_choices) else target_antag = target -//ambition port start - if(!GLOB.objective_choices) - populate_objective_choices() + var/static/list/choices + if(!choices) + choices = list() - if(old_objective && GLOB.objective_choices[old_objective.name]) - def_value = old_objective.name + var/list/allowed_types = list( + /datum/objective/assassinate, + /datum/objective/assassinate/once, + /datum/objective/maroon, + /datum/objective/debrain, + /datum/objective/protect, + /datum/objective/destroy, + /datum/objective/hijack, + /datum/objective/escape, + /datum/objective/survive, + /datum/objective/martyr, + /datum/objective/steal, + /datum/objective/download, + /datum/objective/nuclear, + /datum/objective/absorb, + /datum/objective/custom + ) - var/selected_type = input("Select objective type:", "Objective type", def_value) as null|anything in GLOB.objective_choices - selected_type = GLOB.objective_choices[selected_type] -//ambition port end + for(var/T in allowed_types) + 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 + selected_type = choices[selected_type] if (!selected_type) return @@ -1125,11 +749,6 @@ GLOBAL_LIST(objective_choices) target_antag.objectives.Insert(objective_pos, new_objective) message_admins("[key_name_admin(usr)] edited [current]'s objective to [new_objective.explanation_text]") log_admin("[key_name(usr)] edited [current]'s objective to [new_objective.explanation_text]") -//ambition port start - if(href_list["ambition_panel"]) - do_edit_objectives_ambitions() - return -//ambition port end else if(href_list["traitor_class"]) var/static/list/choices @@ -1215,12 +834,6 @@ GLOBAL_LIST(objective_choices) else if (href_list["obj_announce"]) announce_objectives() -//ambition port start - if(href_list["ambition_panel"]) - do_edit_objectives_ambitions() - return -//ambition port end - //Something in here might have changed your mob if(self_antagging && (!usr || !usr.client) && current.client) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 6a2bc83db7..d4afc3dbb4 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -25,9 +25,7 @@ to_chat(usr, "You seem to be selecting a mob that doesn't exist anymore.", confidential = TRUE) return -//ambition port start - var/list/body = list("Options for [M.key]") -//ambition port end + var/body = "Options for [M.key]" body += "Options panel for [M]" if(M.client) body += " played by [M.client] " @@ -127,10 +125,6 @@ body += "Subtle message | " // body += "Play sound to | " body += "Language Menu" -//ambition port start - if(M.mind) - body += " | Objective-Ambition Menu" -//ambition port end if (M.client) if(!isnewplayer(M)) @@ -212,11 +206,7 @@ body += "
" body += "" -//ambition port start - var/datum/browser/popup = new(usr, "adminplayeropts-[REF(M)]", "Player Panel", nwidth = 550, nheight = 515) - popup.set_content(body.Join()) - popup.open() -//ambition port end + usr << browse(body, "window=adminplayeropts-[REF(M)];size=550x515") SSblackbox.record_feedback("tally", "admin_verb", 1, "Player Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 9cd4fd203c..05e791984a 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2251,17 +2251,6 @@ var/mob/M = locate(href_list["HeadsetMessage"]) usr.client.admin_headset_message(M) -//ambition port start - else if(href_list["ObjectiveRequest"]) - if(!check_rights(R_ADMIN)) - return - var/datum/mind/requesting_mind = locate(href_list["ObjectiveRequest"]) - if(!istype(requesting_mind) || QDELETED(requesting_mind)) - to_chat(usr, "This mind reference is no longer valid. It has probably since been destroyed.") - return - requesting_mind.do_edit_objectives_ambitions() - return -//ambition port end else if(href_list["reject_custom_name"]) if(!check_rights(R_ADMIN)) diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index fbe40f80b8..df9a8bff2e 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -25,11 +25,6 @@ GLOBAL_LIST_EMPTY(antagonists) var/show_name_in_check_antagonists = FALSE //Will append antagonist name in admin listings - use for categories that share more than one antag type var/list/blacklisted_quirks = list(/datum/quirk/nonviolent,/datum/quirk/mute) // Quirks that will be removed upon gaining this antag. Pacifist and mute are default. var/threat = 0 // Amount of threat this antag poses, for dynamic mode -//ambition port start - /// Lazy list for antagonists to request the admins objectives. - var/list/requested_objectives -//ambition port end - var/show_to_ghosts = FALSE // Should this antagonist be shown as antag to ghosts? Shouldn't be used for stealthy antagonists like traitors var/list/skill_modifiers