cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 21:48:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds some more settings

Browse Source
This commit is contained in:
AffectedArc07
2018-11-18 10:23:48 +00:00
parent 2c685b4fce
commit 946aed0434
3 changed files with 75 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/telecomms/ntsl2.dm
+45 -18
View File
@@ -25,6 +25,8 @@ GLOBAL_DATUM_INIT(nttc_config, /datum/nttc_configuration, new())
/* Simple Toggles */
var/toggle_activated = TRUE
var/toggle_jobs = FALSE
var/toggle_job_color = FALSE
var/toggle_name_color = FALSE
var/toggle_timecode = FALSE
var/toggle_command_bold = FALSE
// Hack section
@@ -57,6 +59,8 @@ GLOBAL_DATUM_INIT(nttc_config, /datum/nttc_configuration, new())
var/list/to_serialize = list(
"toggle_activated",
"toggle_jobs",
"toggle_job_color",
"toggle_name_color",
"job_indicator_type",
"toggle_timecode",
"toggle_command_bold",
@@ -71,6 +75,8 @@ GLOBAL_DATUM_INIT(nttc_config, /datum/nttc_configuration, new())
var/list/serialize_sanitize = list(
"toggle_activated" = "bool",
"toggle_jobs" = "bool",
"toggle_job_color" = "bool",
"toggle_name_color" = "bool",
"job_indicator_type" = "string",
"toggle_timecode" = "bool",
"toggle_command_bold" = "bool",
@@ -92,6 +98,8 @@ GLOBAL_DATUM_INIT(nttc_config, /datum/nttc_configuration, new())
/* Simple Toggles */
toggle_activated = initial(toggle_activated)
toggle_jobs = initial(toggle_jobs)
toggle_job_color = initial(toggle_job_color)
toggle_name_color = initial(toggle_name_color)
toggle_timecode = initial(toggle_timecode)
toggle_command_bold = initial(toggle_command_bold)
// Hack section
@@ -171,12 +179,10 @@ GLOBAL_DATUM_INIT(nttc_config, /datum/nttc_configuration, new())
if(firewall.Find(signal.data["name"]))
signal.data["reject"] = 1
// These two stack properly.
// Simple job indicator switch.
if(job_indicator_type)
var/new_name = signal.data["name"]
var/job = signal.data["job"]
// All job and coloring shit
if(toggle_job_color || toggle_name_color)
var/job_color = "#000000"
var/job = signal.data["job"]
if(job in jobs_ai)
job_color = "#FF00FF"
else if(job in jobs_command)
@@ -185,7 +191,6 @@ GLOBAL_DATUM_INIT(nttc_config, /datum/nttc_configuration, new())
job_color = "#A66300"
else if(job in jobs_ert)
job_color = "#5C5C7C"
job = "ERT"
else if(job in jobs_medical)
job_color = "#009190"
else if(job in jobs_science)
@@ -196,18 +201,40 @@ GLOBAL_DATUM_INIT(nttc_config, /datum/nttc_configuration, new())
job_color = "#7F6539"
else if(job in jobs_service)
job_color = "#80A000"
switch(job_indicator_type)
if(JOB_STYLE_1)
new_name = signal.data["name"] + " <font color=\"[job_color]\">([job])</font> "
if(JOB_STYLE_2)
new_name = signal.data["name"] + " - <font color=\"[job_color]\">[job]</font> "
if(JOB_STYLE_3)
new_name = "<font color=\"[job_color]\"><small>\[[job]\]</small></font> " + signal.data["name"] + " "
if(JOB_STYLE_4)
new_name = "<font color=[job_color]>([job])</font> " + signal.data["name"] + " "
if(toggle_jobs)
signal.data["name"] = new_name
signal.data["realname"] = new_name // this is required because the broadcaster uses this directly if the speaker doesn't have a voice changer on
if(toggle_name_color)
var/new_name = "<font color=\"[job_color]\">" + signal.data["name"] + "</font>"
signal.data["name"] = new_name
signal.data["realname"] = new_name // this is required because the broadcaster uses this directly if the speaker doesn't have a voice changer on
if(toggle_jobs)
var/new_name = ""
var/job = signal.data["job"]
if(job in jobs_ert)
job = "ERT"
if(toggle_job_color)
switch(job_indicator_type)
if(JOB_STYLE_1)
new_name = signal.data["name"] + " <font color=\"[job_color]\">([job])</font> "
if(JOB_STYLE_2)
new_name = signal.data["name"] + " - <font color=\"[job_color]\">[job]</font> "
if(JOB_STYLE_3)
new_name = "<font color=\"[job_color]\"><small>\[[job]\]</small></font> " + signal.data["name"] + " "
if(JOB_STYLE_4)
new_name = "<font color=[job_color]>([job])</font> " + signal.data["name"] + " "
else
switch(job_indicator_type)
if(JOB_STYLE_1)
new_name = signal.data["name"] + " ([job]) "
if(JOB_STYLE_2)
new_name = signal.data["name"] + " - [job] "
if(JOB_STYLE_3)
new_name = "<small>\[[job]\]</small> " + signal.data["name"] + " "
if(JOB_STYLE_4)
new_name = "([job]) " + signal.data["name"] + " "
signal.data["name"] = new_name
signal.data["realname"] = new_name // this is required because the broadcaster uses this directly if the speaker doesn't have a voice changer on
// Add the current station time like a time code.
if(toggle_timecode)
html/nttc/dist/tab_filtering.html
Vendored
+15 -5
View File
@@ -1,22 +1,32 @@
<div>
<h2>Configuration</h2>
<table class="tblConfig">
<h3>Job Settings</h3>
<tr>
<td>Announce Jobs?</td>
<td><activeLink data-sconfig="toggle_jobs" data-href="toggle=toggle_jobs"></activeLink></td>
</tr>
<tr>
<td>Job Announcement Format</td>
<td>Job Announcement Format:</td>
<td><activeLink data-aconfig="job_indicator_type" data-href="setting_job_card_style=1"></activeLink></td>
</tr>
<tr>
<td>Theme Jobs?</td>
<td><activeLink data-sconfig="toggle_jobs" data-href="toggle=toggle_job_color"></activeLink></td>
</tr>
<tr>
<td>Theme Names?</td>
<td><activeLink data-sconfig="toggle_jobs" data-href="toggle=toggle_name_color"></activeLink></td>
</tr>
<h3>Misc Settings</h3>
<tr>
<td>Louder Command Members</td>
<td><activeLink data-sconfig="toggle_command_bold" data-href="toggle=toggle_command_bold"></activeLink></td>
</tr>
<tr>
<td>Announce Timecodes?</td>
<td><activeLink data-sconfig="toggle_timecode" data-href="toggle=toggle_timecode"></activeLink></td>
</tr>
<tr>
<td>Louder Command Members</td>
<td><activeLink data-sconfig="toggle_command_bold" data-href="toggle=toggle_command_bold"></activeLink></td>
</tr>
<tr>
<td>Language Conversion?</td>
<td><activeLink data-aconfig="setting_language" data-href="setting_language=1"></activeLink></td>
html/nttc/src/html/tabs/tab_filtering.html
+15 -5
View File
@@ -1,22 +1,32 @@
<div>
<h2>Configuration</h2>
<table class="tblConfig">
<h3>Job Settings</h3>
<tr>
<td>Announce Jobs?</td>
<td><activeLink data-sconfig="toggle_jobs" data-href="toggle=toggle_jobs"></activeLink></td>
</tr>
<tr>
<td>Job Announcement Format</td>
<td>Job Announcement Format:</td>
<td><activeLink data-aconfig="job_indicator_type" data-href="setting_job_card_style=1"></activeLink></td>
</tr>
<tr>
<td>Theme Jobs?</td>
<td><activeLink data-sconfig="toggle_jobs" data-href="toggle=toggle_job_color"></activeLink></td>
</tr>
<tr>
<td>Theme Names?</td>
<td><activeLink data-sconfig="toggle_jobs" data-href="toggle=toggle_name_color"></activeLink></td>
</tr>
<h3>Misc Settings</h3>
<tr>
<td>Louder Command Members</td>
<td><activeLink data-sconfig="toggle_command_bold" data-href="toggle=toggle_command_bold"></activeLink></td>
</tr>
<tr>
<td>Announce Timecodes?</td>
<td><activeLink data-sconfig="toggle_timecode" data-href="toggle=toggle_timecode"></activeLink></td>
</tr>
<tr>
<td>Louder Command Members</td>
<td><activeLink data-sconfig="toggle_command_bold" data-href="toggle=toggle_command_bold"></activeLink></td>
</tr>
<tr>
<td>Language Conversion?</td>
<td><activeLink data-aconfig="setting_language" data-href="setting_language=1"></activeLink></td>