cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 13:38:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

[SEMI-MODULAR] Ambitions v2 (#1743)

Browse Source 
* aaa

* a

* ahh

* aaaah

* Update ambition.dm

* Update tgstation.dme

* aaa

* Update mind.dm

* Update roundend.dm

* Update roundend.dm

Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
Azarak
2020-11-29 16:08:36 +00:00
committed by GitHub
co-authored by Gandalf
parent 0155327c08
commit d40607b484
13 changed files with 624 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/antag_panel.dm
+4
View File
@@ -101,6 +101,10 @@ GLOBAL_VAR(antag_prototypes)
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>"
//SKYRAT EDIT ADDITION BEGIN - AMBITIONS
if(my_ambitions)
out += "<b>Ambitions:</b> <a href='?src=[REF(src)];ambitions=1'>View</a><br>"
//SKYRAT EDIT ADDITION END
var/special_statuses = get_special_statuses()
if(length(special_statuses))
code/modules/admin/check_antagonists.dm
+18
View File
@@ -34,6 +34,24 @@
else
parts += ""
parts += "<a href='?_src_=holder;[HrefToken()];traitor=[REF(owner)]'>Show Objective</a>"
//SKYRAT EDIT ADDITION BEGIN - AMBITIONS
if(uses_ambitions && owner.current && owner.current.mind && owner.current.mind.my_ambitions)
var/datum/ambitions/ambs = owner.current.mind.my_ambitions
var/string = "NOT SUBMITTED"
if(ambs.submitted)
switch(ambs.intensity)
if(AMBITION_INTENSITY_STEALTH)
string = "Stealth"
if(AMBITION_INTENSITY_MILD)
string = "Mild"
if(AMBITION_INTENSITY_MEDIUM)
string = "Medium"
if(AMBITION_INTENSITY_SEVERE)
string = "Severe"
if(AMBITION_INTENSITY_EXTREME)
string = "Extreme"
parts += "<a href='?src=[REF(ambs)];admin_pref=show_ambitions'>Ambitions</a>-[string]"
//SKYRAT EDIT ADDITION END
return parts //Better as one cell or two/three
//Builds table row for the antag
code/modules/admin/verbs/adminhelp.dm
+8
View File
@@ -107,6 +107,14 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
L[++L.len] = list("Disconnected:", "[astatclick.update("[num_disconnected]")]", null, REF(astatclick))
L[++L.len] = list("Closed Tickets:", "[cstatclick.update("[closed_tickets.len]")]", null, REF(cstatclick))
L[++L.len] = list("Resolved Tickets:", "[rstatclick.update("[resolved_tickets.len]")]", null, REF(rstatclick))
//SKYRAT EDIT ADDITION BEGIN - AMBITIONS
for(var/key in GLOB.ambitions_to_review)
var/datum/ambitions/AMBI = key
var/reviewer = GLOB.ambitions_to_review[key]
L[++L.len] = list("[reviewer ? "H-[reviewer]. " : ""]AMB: [AMBI.owner_name]:", "[AMBI.narrative]", REF(AMBI))
L[++L.len] = list("Ambitions intensity:", "STL:[GLOB.intensity_counts["[AMBITION_INTENSITY_STEALTH]"]] MLD:[GLOB.intensity_counts["[AMBITION_INTENSITY_MILD]"]] MED:[GLOB.intensity_counts["[AMBITION_INTENSITY_MEDIUM]"]] SEV:[GLOB.intensity_counts["[AMBITION_INTENSITY_SEVERE]"]] EXT:[GLOB.intensity_counts["[AMBITION_INTENSITY_EXTREME]"]] (HAVOC: [GLOB.total_intensity])", null)
//SKYRAT EDIT ADDITION END
return L
//Reassociate still open ticket if one exists