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

Merge pull request #7489 from Citadel-Station-13/nanites

Browse Source 
Nanites port
This commit is contained in:
deathride58
2018-09-03 13:47:28 -04:00
committed by GitHub
parent 5425f02612 4446251a6d
commit c8a3f56af6
109 changed files with 5816 additions and 3795 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_investigate.dm
+1 -1
View File
@@ -4,7 +4,7 @@
var/F = file("[GLOB.log_directory]/[subject].html")
WRITE_FILE(F, "<small>[time_stamp()] [REF(src)] ([x],[y],[z])</small> || [src] [message]<br>")
/client/proc/investigate_show(subject in list("notes, memos, watchlist", INVESTIGATE_RESEARCH, INVESTIGATE_EXONET, INVESTIGATE_PORTAL, INVESTIGATE_SINGULO, INVESTIGATE_WIRES, INVESTIGATE_TELESCI, INVESTIGATE_GRAVITY, INVESTIGATE_RECORDS, INVESTIGATE_CARGO, INVESTIGATE_SUPERMATTER, INVESTIGATE_ATMOS, INVESTIGATE_EXPERIMENTOR, INVESTIGATE_BOTANY, INVESTIGATE_HALLUCINATIONS, INVESTIGATE_RADIATION, INVESTIGATE_CIRCUIT) )
/client/proc/investigate_show(subject in list("notes, memos, watchlist", INVESTIGATE_RESEARCH, INVESTIGATE_EXONET, INVESTIGATE_PORTAL, INVESTIGATE_SINGULO, INVESTIGATE_WIRES, INVESTIGATE_TELESCI, INVESTIGATE_GRAVITY, INVESTIGATE_RECORDS, INVESTIGATE_CARGO, INVESTIGATE_SUPERMATTER, INVESTIGATE_ATMOS, INVESTIGATE_EXPERIMENTOR, INVESTIGATE_BOTANY, INVESTIGATE_HALLUCINATIONS, INVESTIGATE_RADIATION, INVESTIGATE_CIRCUIT, INVESTIGATE_NANITES) )
set name = "Investigate"
set category = "Admin"
if(!holder)
code/modules/admin/antag_panel.dm
+10 -10
View File
@@ -35,9 +35,9 @@ GLOBAL_VAR(antag_prototypes)
var/data_part = antag_panel_data()
var/objective_part = antag_panel_objectives()
var/memory_part = antag_panel_memory()
var/list/parts = listtrim(list(command_part,data_part,objective_part,memory_part))
return parts.Join("<br>")
/datum/antagonist/proc/antag_panel_objectives()
@@ -80,7 +80,7 @@ GLOBAL_VAR(antag_prototypes)
var/list/result = list()
if(!current)
result += "<span class='bad'>No body!</span>"
if(current && current.isloyal())
if(current && current.has_trait(TRAIT_MINDSHIELD))
result += "<span class='good'>Mindshielded</span>"
//Move these to mob
if(iscyborg(current))
@@ -155,8 +155,8 @@ GLOBAL_VAR(antag_prototypes)
priority_sections |= antag_category
antag_header_parts += "<span class='bad'>[current_antag.name]</span>"
antag_header_parts += "<a href='?src=[REF(src)];remove_antag=[REF(current_antag)]'>Remove</a>"
//We aren't antag of this category, grab first prototype to check the prefs (This is pretty vague but really not sure how else to do this)
var/datum/antagonist/pref_source = current_antag
if(!pref_source)
@@ -167,7 +167,7 @@ GLOBAL_VAR(antag_prototypes)
break
if(pref_source.job_rank)
antag_header_parts += pref_source.enabled_in_preferences(src) ? "Enabled in Prefs" : "Disabled in Prefs"
//Traitor : None | Traitor | IAA
// Command1 | Command2 | Command3
// Secret Word : Banana
@@ -180,12 +180,12 @@ GLOBAL_VAR(antag_prototypes)
if(current_antag)
cat_section += current_antag.antag_panel()
sections[antag_category] = cat_section
for(var/s in priority_sections)
out += sections[s]
for(var/s in sections - priority_sections)
out += sections[s]
out += "<br>"
//Uplink
@@ -201,7 +201,7 @@ GLOBAL_VAR(antag_prototypes)
else
uplink_info += "<a href='?src=[REF(src)];common=uplink'>give</a>"
uplink_info += "." //hiel grammar
out += uplink_info + "<br>"
//Common Memory
var/common_memory = "<span>Common Memory:</span>"
@@ -210,7 +210,7 @@ GLOBAL_VAR(antag_prototypes)
out += common_memory + "<br>"
//Other stuff
out += get_common_admin_commands()
var/datum/browser/panel = new(usr, "traitorpanel", "", 600, 600)
panel.set_content(out)
panel.open()