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

Merge branch 'master' into ticket-conversion-fix

Browse Source
This commit is contained in:
farie82
2020-08-22 22:21:30 +02:00
committed by GitHub
parent e89d4e80d6 801bfea049
commit 65165ad708
6 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/ticker.dm
+3 -3
View File
@@ -61,7 +61,7 @@ SUBSYSTEM_DEF(ticker)
if(GAME_STATE_STARTUP)
// This is ran as soon as the MC starts firing, and should only run ONCE, unless startup fails
round_start_time = world.time + (config.pregame_timestart * 10)
to_chat(world, "<B><FONT color='blue'>Welcome to the pre-game lobby!</FONT></B>")
to_chat(world, "<B><span class='darkmblue'>Welcome to the pre-game lobby!</span></B>")
to_chat(world, "Please, setup your character and select ready. Game will start in [config.pregame_timestart] seconds")
current_state = GAME_STATE_PREGAME
fire() // TG says this is a good idea
@@ -217,11 +217,11 @@ SUBSYSTEM_DEF(ticker)
for(var/obj/effect/landmark/spacepod/random/R in L)
qdel(R)
to_chat(world, "<FONT color='blue'><B>Enjoy the game!</B></FONT>")
to_chat(world, "<span class='darkmblue'><B>Enjoy the game!</B></span>")
world << sound('sound/AI/welcome.ogg')// Skie
if(SSholiday.holidays)
to_chat(world, "<font color='blue'>and...</font>")
to_chat(world, "<span class='darkmblue'>and...</span>")
for(var/holidayname in SSholiday.holidays)
var/datum/holiday/holiday = SSholiday.holidays[holidayname]
to_chat(world, "<h4>[holiday.greet()]</h4>")
code/modules/admin/admin.dm
+7 -7
View File
@@ -136,12 +136,12 @@ GLOBAL_VAR_INIT(nologevent, 0)
body += "\ <A href='?_src_=holder;userandomname=[M.UID()]'>Use Random Name</A> | "
var/muted = M.client.prefs.muted
body += {"<br><b>Mute: </b>
\[<A href='?_src_=holder;mute=[M.UID()];mute_type=[MUTE_IC]'><font color='[(muted & MUTE_IC)?"red":"blue"]'>IC</font></a> |
<A href='?_src_=holder;mute=[M.UID()];mute_type=[MUTE_OOC]'><font color='[(muted & MUTE_OOC)?"red":"blue"]'>OOC</font></a> |
<A href='?_src_=holder;mute=[M.UID()];mute_type=[MUTE_PRAY]'><font color='[(muted & MUTE_PRAY)?"red":"blue"]'>PRAY</font></a> |
<A href='?_src_=holder;mute=[M.UID()];mute_type=[MUTE_ADMINHELP]'><font color='[(muted & MUTE_ADMINHELP)?"red":"blue"]'>ADMINHELP</font></a> |
<A href='?_src_=holder;mute=[M.UID()];mute_type=[MUTE_DEADCHAT]'><font color='[(muted & MUTE_DEADCHAT)?"red":"blue"]'>DEADCHAT</font></a>\]
(<A href='?_src_=holder;mute=[M.UID()];mute_type=[MUTE_ALL]'><font color='[(muted & MUTE_ALL)?"red":"blue"]'>toggle all</font></a>)
\[<A href='?_src_=holder;mute=[M.UID()];mute_type=[MUTE_IC]'><font color='[(muted & MUTE_IC)?"red":"#6685f5"]'>IC</font></a> |
<A href='?_src_=holder;mute=[M.UID()];mute_type=[MUTE_OOC]'><font color='[(muted & MUTE_OOC)?"red":"#6685f5"]'>OOC</font></a> |
<A href='?_src_=holder;mute=[M.UID()];mute_type=[MUTE_PRAY]'><font color='[(muted & MUTE_PRAY)?"red":"#6685f5"]'>PRAY</font></a> |
<A href='?_src_=holder;mute=[M.UID()];mute_type=[MUTE_ADMINHELP]'><font color='[(muted & MUTE_ADMINHELP)?"red":"#6685f5"]'>ADMINHELP</font></a> |
<A href='?_src_=holder;mute=[M.UID()];mute_type=[MUTE_DEADCHAT]'><font color='[(muted & MUTE_DEADCHAT)?"red":"#6685f5"]'>DEADCHAT</font></a>\]
(<A href='?_src_=holder;mute=[M.UID()];mute_type=[MUTE_ALL]'><font color='[(muted & MUTE_ALL)?"red":"#6685f5"]'>toggle all</font></a>)
"}
var/jumptoeye = ""
@@ -721,7 +721,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
var/msg = ""
if(SSticker.current_state == GAME_STATE_STARTUP)
msg = " (The server is still setting up, but the round will be started as soon as possible.)"
message_admins("<font color='blue'>[usr.key] has started the game.[msg]</font>")
message_admins("<span class='darkmblue'>[usr.key] has started the game.[msg]</span>")
feedback_add_details("admin_verb","SN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return 1
else
code/modules/ninja/suit/suit_initialisation.dm
+17 -17
View File
@@ -14,30 +14,30 @@
suitBusy = 1
if(suitActive && (alert("Confirm suit systems shutdown? This cannot be halted once it has started.", "Confirm Shutdown", "Yes", "No") == "Yes"))
to_chat(usr, "<span style='color: #0000ff;'>Now de-initializing...</span>")
to_chat(usr, "<span class='darkmblue'>Now de-initializing...</span>")
sleep(15)
to_chat(usr, "<span style='color: #0000ff;'>Logging off, [usr.real_name]. Shutting down <b>SpiderOS</b>.</span>")
to_chat(usr, "<span class='darkmblue'>Logging off, [usr.real_name]. Shutting down <b>SpiderOS</b>.</span>")
sleep(10)
to_chat(usr, "<span style='color: #0000ff;'>Primary system status: <B>OFFLINE</B>.\nBackup system status: <b>OFFLINE</b>.</span>")
to_chat(usr, "<span class='darkmblue'>Primary system status: <B>OFFLINE</B>.\nBackup system status: <b>OFFLINE</b>.</span>")
sleep(5)
to_chat(usr, "<span style='color: #0000ff;'>VOID-shift device status: <B>OFFLINE</B>.\nCLOAK-tech device status: <B>OFFLINE</B>.</span>")
to_chat(usr, "<span class='darkmblue'>VOID-shift device status: <B>OFFLINE</B>.\nCLOAK-tech device status: <B>OFFLINE</B>.</span>")
//TODO: Shut down any active abilities
sleep(10)
to_chat(usr, "<span style='color: #0000ff;'>Disconnecting neural-net interface...</span> <span style='color: #32CD32'><b>Success</b>.</span>")
to_chat(usr, "<span class='darkmblue'>Disconnecting neural-net interface...</span> <span style='color: #32CD32'><b>Success</b>.</span>")
QDEL_NULL(usr.hud_used)
usr.create_mob_hud()
usr.regenerate_icons()
sleep(5)
to_chat(usr, "<span style='color: #0000ff;'>Disengaging neural-net interface...</span> <span style='color: #32CD32'><b>Success</b>.</span>")
to_chat(usr, "<span class='darkmblue'>Disengaging neural-net interface...</span> <span style='color: #32CD32'><b>Success</b>.</span>")
sleep(10)
to_chat(usr, "<span style='color: #0000ff;'>Unsecuring external locking mechanism...\nNeural-net abolished.\nOperation status: <B>FINISHED</B>.</span>")
to_chat(usr, "<span class='darkmblue'>Unsecuring external locking mechanism...\nNeural-net abolished.\nOperation status: <B>FINISHED</B>.</span>")
//TODO: Grant verbs
toggle_suit_lock(usr)
usr.regenerate_icons()
@@ -45,24 +45,24 @@
suitActive = 0
else if(!suitActive) // Activate the suit.
to_chat(usr, "<span style='color: #0000ff;'>Now initializing...</span>")
to_chat(usr, "<span class='darkmblue'>Now initializing...</span>")
sleep(15)
to_chat(usr, "<span style='color: #0000ff;'>Now establishing neural-net interface...")
to_chat(usr, "<span class='darkmblue'>Now establishing neural-net interface...")
if(usr.mind.special_role != "Ninja")
to_chat(usr, "<span style='color: #ff0000;'><b>FĆAL �Rr�R</b>: ŧer nt recgnized, c-cntr-r䣧-ç äcked.")
return
sleep(10)
to_chat(usr, "<span style='color: #0000ff;'>Neural-net established. Now monitoring brainwave pattern. \nBrainwave pattern</span> <span style='color: #32CD32;'><b>GREEN</b></span><span style='color: #0000ff;'>, proceeding.</span>")
to_chat(usr, "<span class='darkmblue'>Neural-net established. Now monitoring brainwave pattern. \nBrainwave pattern</span> <span style='color: #32CD32;'><b>GREEN</b></span><span class='darkmblue'>, proceeding.</span>")
sleep(10)
to_chat(usr, "<span style='color: #0000ff;'>Securing external locking mechanism...</span>")
to_chat(usr, "<span class='darkmblue'>Securing external locking mechanism...</span>")
if(!toggle_suit_lock(usr))
return
sleep(5)
to_chat(usr, "<span style='color: #0000ff;'>Suit secured, extending neural-net interface...</span>")
to_chat(usr, "<span class='darkmblue'>Suit secured, extending neural-net interface...</span>")
QDEL_NULL(usr.hud_used)
usr.hud_used = new /datum/hud/human(usr, 'icons/mob/screen_ninja.dmi', "#ffffff", 255)
@@ -71,22 +71,22 @@
usr.regenerate_icons()
sleep(10)
to_chat(usr, "<span style='color: #0000ff;'>VOID-shift device status: <b>ONLINE</b>.\nCLOAK-tech device status:<b>ONLINE</b></span>")
to_chat(usr, "<span class='darkmblue'>VOID-shift device status: <b>ONLINE</b>.\nCLOAK-tech device status:<b>ONLINE</b></span>")
sleep(5)
to_chat(usr, "<span style='color: #0000ff;'>Primary system status: <b>ONLINE</b>.\nBackup system status: <b>ONLINE</b>.</span>")
to_chat(usr, "<span class='darkmblue'>Primary system status: <b>ONLINE</b>.\nBackup system status: <b>ONLINE</b>.</span>")
if(suitCell)
to_chat(usr, "<span style='color: #0000ff;'>Current energy capacity: <b>[suitCell.charge]/[suitCell.maxcharge]</b>.</span>")
to_chat(usr, "<span class='darkmblue'>Current energy capacity: <b>[suitCell.charge]/[suitCell.maxcharge]</b>.</span>")
sleep(10)
to_chat(usr, "<span style='color: #0000ff;'>All systems operational. Welcome to <b>SpiderOS</b>, [usr.real_name].</span>")
to_chat(usr, "<span class='darkmblue'>All systems operational. Welcome to <b>SpiderOS</b>, [usr.real_name].</span>")
//TODO: Grant ninja verbs here.
suitBusy = 0
suitActive = 1
else
suitBusy = 0
to_chat(usr, "<span style='color: #0000ff;'><b>NOTICE: </b>Suit de-activation protocals aborted.</span>")
to_chat(usr, "<span class='darkmblue'><b>NOTICE: </b>Suit de-activation protocals aborted.</span>")
else
to_chat(usr, "<span style='color: #ff0000;'><b>FĆAL �Rr�R</b>: ŧer nt recgnized, c-cntr-r䣧-ç äcked.")
return
code/modules/paperwork/ticketmachine.dm
+1
View File
@@ -7,6 +7,7 @@
icon_state = "ticketmachine"
desc = "A marvel of bureaucratic engineering encased in an efficient plastic shell. It can be refilled with a hand labeler refill roll and linked to buttons with a multitool."
density = FALSE
anchored = TRUE
maptext_height = 26
maptext_width = 32
maptext_x = 7
goon/browserassets/css/browserOutput-dark.css
+11 -10
View File
@@ -250,6 +250,7 @@ em {font-style: normal; font-weight: bold;}
{color: #638500; text-decoration: underline;}
.motd a, .motd a:link, .motd a:visited, .motd a:active, .motd a:hover
{color: #638500;}
.darkmblue {color: #6685f5;}
.prefix { font-weight: bold;}
.ooc { font-weight: bold;}
.looc {color: #6699CC;}
@@ -261,19 +262,19 @@ em {font-style: normal; font-weight: bold;}
.mentorhelp {color: #0077bb; font-weight: bold;}
.adminhelp {color: #aa0000; font-weight: bold;}
.playerreply {color: #8800bb; font-weight: bold;}
.pmsend {color: #0000ff;}
.pmsend {color: #6685f5;}
.name { font-weight: bold;}
.say {}
.yell { font-weight: bold;}
.siliconsay {font-family: 'Courier New', Courier, monospace;}
.deadsay {color: #cc00c6;}
.deadsay {color: #B800B1;}
.radio {color: #408010;}
.deptradio {color: #993399;}
.comradio {color: #2040ff;}
.comradio {color: #526aff;}
.syndradio {color: #993F40;}
.dsquadradio {color: #998599;}
.resteamradio {color: #18BC46;}
.airadio {color: #FF00FF;}
.airadio {color: #FF94FF;}
.centradio {color: #5C5C7C;}
.secradio {color: #CF0000;}
.engradio {color: #A66300;}
@@ -304,10 +305,10 @@ h1.alert, h2.alert {color: #FFF;}
.userdanger {color: #ff0000; font-weight: bold; font-size: 120%;}
.biggerdanger {color: #ff0000; font-weight: bold; font-size: 150%;}
.info {color: #0044DD;}
.notice {color: #0044DD;}
.bnotice {color: #0044DD; font-weight: bold;}
.boldnotice {color: #0044DD; font-weight: bold;}
.info {color: #6685f5;}
.notice {color: #6685f5;}
.bnotice {color: #6685f5; font-weight: bold;}
.boldnotice {color: #6685f5; font-weight: bold;}
.suicide {color: #ff5050; font-style: italic;}
.green {color: #03bb39;}
.announce {color: #228b22; font-weight: bold;}
@@ -366,7 +367,7 @@ h1.alert, h2.alert {color: #FFF;}
.bold {font-weight: bold;}
.center {text-align: center;}
.red {color: #FF0000;}
.purple {color: #5e2d79;}
.purple {color: #9031C4;}
.skeleton {color: #C8C8C8; font-weight: bold; font-style: italic;}
.gutter {color: #7092BE; font-family: "Trebuchet MS", cursive, sans-serif;}
.orange {color: #ffa500;}
@@ -398,7 +399,7 @@ h1.alert, h2.alert {color: #FFF;}
.connectionClosed, .fatalError {background: red; color: white; padding: 5px;}
.connectionClosed.restored {background: green;}
.internal.boldnshit {color: blue; font-weight: bold;}
.internal.boldnshit {color: #6685f5; font-weight: bold;}
/* HELPER CLASSES */
.text-normal {font-weight: normal; font-style: normal;}
goon/browserassets/css/browserOutput.css
+1
View File
@@ -247,6 +247,7 @@ em {font-style: normal; font-weight: bold;}
{color: #638500; text-decoration: underline;}
.motd a, .motd a:link, .motd a:visited, .motd a:active, .motd a:hover
{color: #638500;}
.darkmblue {color: #0000ff;}
.prefix { font-weight: bold;}
.ooc { font-weight: bold;}
.looc {color: #6699CC;}