Revert "i can't believe kevin made me code"
This reverts commit 7f38564838.
This commit is contained in:
@@ -97,14 +97,10 @@ GLOBAL_VAR(antag_prototypes)
|
||||
alert("This mind doesn't have a mob, or is deleted! For some reason!", "Edit Memory")
|
||||
return
|
||||
|
||||
//ambition port start
|
||||
var/list/out = list(
|
||||
"<B>[name]</B>[(current && (current.real_name!=name))?" (as [current.real_name])":""]<br>\
|
||||
Mind currently owned by key: [key] [active?"(synced)":"(not synced)"]<br>\
|
||||
Assigned role: [assigned_role]. <a href='?src=[REF(src)];role_edit=1'>Edit</a><br>\
|
||||
Faction and special role: <b><font color='red'>[special_role]</font></b><br>"
|
||||
)
|
||||
//ambition port end
|
||||
var/out = "<B>[name]</B>[(current && (current.real_name!=name))?" (as [current.real_name])":""]<br>"
|
||||
out += "Mind currently owned by key: [key] [active?"(synced)":"(not synced)"]<br>"
|
||||
out += "Assigned role: [assigned_role]. <a href='?src=[REF(src)];role_edit=1'>Edit</a><br>"
|
||||
out += "Faction and special role: <b><font color='red'>[special_role]</font></b><br>"
|
||||
|
||||
var/special_statuses = get_special_statuses()
|
||||
if(length(special_statuses))
|
||||
@@ -195,16 +191,6 @@ GLOBAL_VAR(antag_prototypes)
|
||||
//Uplink
|
||||
if(ishuman(current))
|
||||
var/uplink_info = "<i><b>Uplink</b></i>:"
|
||||
//ambition port start
|
||||
//Ambitions
|
||||
out += "<b>[current.real_name]'s Ambitions:</b> <a href='?src=[REF(src)];edit_ambitions_panel=1'>Edit Ambitions</a><br><ul>"
|
||||
if(!LAZYLEN(ambitions))
|
||||
out += "<li><i><b>NONE</b></i><li>"
|
||||
else
|
||||
for(var/count in 1 to LAZYLEN(ambitions))
|
||||
out += "<li><B>Ambition #[count]</B>:<br>[ambitions[count]]"
|
||||
out += "</ul>"
|
||||
|
||||
var/datum/component/uplink/U = find_syndicate_uplink()
|
||||
if(U)
|
||||
uplink_info += "<a href='?src=[REF(src)];common=takeuplink'>take</a>"
|
||||
@@ -218,16 +204,14 @@ GLOBAL_VAR(antag_prototypes)
|
||||
|
||||
out += uplink_info + "<br>"
|
||||
//Common Memory
|
||||
out += "<br><span>Common Memory:</span>"
|
||||
out += memory
|
||||
out += "<a href='?src=[REF(src)];memory_edit=1'>Edit Memory</a><br>"
|
||||
var/common_memory = "<span>Common Memory:</span>"
|
||||
common_memory += memory
|
||||
common_memory += "<a href='?src=[REF(src)];memory_edit=1'>Edit Memory</a>"
|
||||
out += common_memory + "<br>"
|
||||
//Other stuff
|
||||
out += get_common_admin_commands()
|
||||
out += "<br><a href='?src=[REF(src)];refresh_antag_panel=1'>Refresh</a>"
|
||||
|
||||
var/datum/browser/panel = new(usr, "traitorpanel", "", 600, 600)
|
||||
panel.set_content(out.Join())
|
||||
//ambition port end
|
||||
panel.set_content(out)
|
||||
panel.open()
|
||||
return
|
||||
|
||||
@@ -35,9 +35,8 @@ GLOBAL_LIST_EMPTY(antagonists)
|
||||
|
||||
/datum/antagonist/Destroy()
|
||||
GLOB.antagonists -= src
|
||||
//ambition port start
|
||||
owner?.do_remove_antag_datum(src)
|
||||
//ambition port end
|
||||
if(owner)
|
||||
LAZYREMOVE(owner.antag_datums, src)
|
||||
owner = null
|
||||
return ..()
|
||||
|
||||
@@ -134,9 +133,7 @@ GLOBAL_LIST_EMPTY(antagonists)
|
||||
remove_innate_effects()
|
||||
clear_antag_moodies()
|
||||
if(owner)
|
||||
//ambition port start
|
||||
owner.do_remove_antag_datum(src)
|
||||
//ambition port end
|
||||
LAZYREMOVE(owner.antag_datums, src)
|
||||
for(var/A in skill_modifiers)
|
||||
owner.remove_skill_modifier(GET_SKILL_MOD_ID(A, type))
|
||||
if(!silent && owner.current)
|
||||
|
||||
@@ -65,9 +65,7 @@
|
||||
user.copy_languages(target, LANGUAGE_ABSORB)
|
||||
|
||||
if(target.mind && user.mind)//if the victim and user have minds
|
||||
//ambition port start
|
||||
to_chat(user, "<i>[target.mind.show_memory()]</i>") //I can read your mind. Output all their notes.
|
||||
//ambition port end
|
||||
target.mind.show_memory(user, 0) //I can read your mind, kekeke. Output all their notes.
|
||||
|
||||
//Some of target's recent speech, so the changeling can attempt to imitate them better.
|
||||
//Recent as opposed to all because rounds tend to have a LOT of text.
|
||||
|
||||
@@ -2,10 +2,7 @@
|
||||
..()
|
||||
//Mind updates
|
||||
sync_mind()
|
||||
//ambition port start
|
||||
if(mind.memory || mind.antag_datums)
|
||||
to_chat(src, "<i>[mind.show_memory()]</i>")
|
||||
//ambition port end
|
||||
mind.show_memory(src, 0)
|
||||
|
||||
//Round specific stuff
|
||||
if(SSticker.mode)
|
||||
|
||||
@@ -441,11 +441,7 @@
|
||||
set category = "IC"
|
||||
set desc = "View your character's notes memory."
|
||||
if(mind)
|
||||
//ambition port start
|
||||
var/datum/browser/popup = new(src, "memory", "Memory and Notes")
|
||||
popup.set_content(mind.show_memory())
|
||||
popup.open()
|
||||
//ambition port
|
||||
mind.show_memory(src)
|
||||
else
|
||||
to_chat(src, "You don't have a mind datum for some reason, so you can't look at your notes, if you had any.")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user