cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

String cleanup.

Browse Source 
Removes VOX announcement system.
Cleans up a small amount of admin HTML procs.
Cleans tags off of the map.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
This commit is contained in:
Mloc-Argent
2013-08-05 22:52:10 +01:00
parent 5b2977e746
commit c0490ca81d
3 changed files with 11241 additions and 11194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

308
code/modules/admin/admin.dm
View File

@@ -48,41 +48,42 @@ var/global/floorIsLava = 0
else else
body += " \[<A href='?src=\ref[src];revive=\ref[M]'>Heal</A>\] " body += " \[<A href='?src=\ref[src];revive=\ref[M]'>Heal</A>\] "
body += "<br><br>\[ " body += {"
body += "<a href='?_src_=vars;Vars=\ref[M]'>VV</a> - " <br><br>\[
body += "<a href='?src=\ref[src];traitor=\ref[M]'>TP</a> - " <a href='?_src_=vars;Vars=\ref[M]'>VV</a> -
body += "<a href='?src=\ref[usr];priv_msg=\ref[M]'>PM</a> - " <a href='?src=\ref[src];traitor=\ref[M]'>TP</a> -
body += "<a href='?src=\ref[src];subtlemessage=\ref[M]'>SM</a> - " <a href='?src=\ref[usr];priv_msg=\ref[M]'>PM</a> -
body += "<a href='?src=\ref[src];adminplayerobservejump=\ref[M]'>JMP</a>\] </b><br>" <a href='?src=\ref[src];subtlemessage=\ref[M]'>SM</a> -
<a href='?src=\ref[src];adminplayerobservejump=\ref[M]'>JMP</a>\] </b><br>
body += "<b>Mob type</b> = [M.type]<br><br>" <b>Mob type</b> = [M.type]<br><br>
<A href='?src=\ref[src];boot2=\ref[M]'>Kick</A> |
body += "<A href='?src=\ref[src];boot2=\ref[M]'>Kick</A> | " <A href='?_src_=holder;warn=[M.ckey]'>Warn</A> |
body += "<A href='?_src_=holder;warn=[M.ckey]'>Warn</A> | " <A href='?src=\ref[src];newban=\ref[M]'>Ban</A> |
body += "<A href='?src=\ref[src];newban=\ref[M]'>Ban</A> | " <A href='?src=\ref[src];jobban2=\ref[M]'>Jobban</A> |
body += "<A href='?src=\ref[src];jobban2=\ref[M]'>Jobban</A> | " <A href='?src=\ref[src];notes=show;mob=\ref[M]'>Notes</A>
body += "<A href='?src=\ref[src];notes=show;mob=\ref[M]'>Notes</A> " "}
if(M.client) if(M.client)
body += "| <A HREF='?src=\ref[src];sendtoprison=\ref[M]'>Prison</A> | " body += "| <A HREF='?src=\ref[src];sendtoprison=\ref[M]'>Prison</A> | "
var/muted = M.client.prefs.muted var/muted = M.client.prefs.muted
body += "<br><b>Mute: </b> " body += {"<br><b>Mute: </b>
body += "\[<A href='?src=\ref[src];mute=\ref[M];mute_type=[MUTE_IC]'><font color='[(muted & MUTE_IC)?"red":"blue"]'>IC</font></a> | " \[<A href='?src=\ref[src];mute=\ref[M];mute_type=[MUTE_IC]'><font color='[(muted & MUTE_IC)?"red":"blue"]'>IC</font></a> |
body += "<A href='?src=\ref[src];mute=\ref[M];mute_type=[MUTE_OOC]'><font color='[(muted & MUTE_OOC)?"red":"blue"]'>OOC</font></a> | " <A href='?src=\ref[src];mute=\ref[M];mute_type=[MUTE_OOC]'><font color='[(muted & MUTE_OOC)?"red":"blue"]'>OOC</font></a> |
body += "<A href='?src=\ref[src];mute=\ref[M];mute_type=[MUTE_PRAY]'><font color='[(muted & MUTE_PRAY)?"red":"blue"]'>PRAY</font></a> | " <A href='?src=\ref[src];mute=\ref[M];mute_type=[MUTE_PRAY]'><font color='[(muted & MUTE_PRAY)?"red":"blue"]'>PRAY</font></a> |
body += "<A href='?src=\ref[src];mute=\ref[M];mute_type=[MUTE_ADMINHELP]'><font color='[(muted & MUTE_ADMINHELP)?"red":"blue"]'>ADMINHELP</font></a> | " <A href='?src=\ref[src];mute=\ref[M];mute_type=[MUTE_ADMINHELP]'><font color='[(muted & MUTE_ADMINHELP)?"red":"blue"]'>ADMINHELP</font></a> |
body += "<A href='?src=\ref[src];mute=\ref[M];mute_type=[MUTE_DEADCHAT]'><font color='[(muted & MUTE_DEADCHAT)?"red":"blue"]'>DEADCHAT</font></a>\]" <A href='?src=\ref[src];mute=\ref[M];mute_type=[MUTE_DEADCHAT]'><font color='[(muted & MUTE_DEADCHAT)?"red":"blue"]'>DEADCHAT</font></a>\]
body += "(<A href='?src=\ref[src];mute=\ref[M];mute_type=[MUTE_ALL]'><font color='[(muted & MUTE_ALL)?"red":"blue"]'>toggle all</font></a>)" (<A href='?src=\ref[src];mute=\ref[M];mute_type=[MUTE_ALL]'><font color='[(muted & MUTE_ALL)?"red":"blue"]'>toggle all</font></a>)
"}
body += "<br><br>" body += {"<br><br>
body += "<A href='?src=\ref[src];jumpto=\ref[M]'><b>Jump to</b></A> | " <A href='?src=\ref[src];jumpto=\ref[M]'><b>Jump to</b></A> |
body += "<A href='?src=\ref[src];getmob=\ref[M]'>Get</A> | " <A href='?src=\ref[src];getmob=\ref[M]'>Get</A> |
body += "<A href='?src=\ref[src];sendmob=\ref[M]'>Send To</A>" <A href='?src=\ref[src];sendmob=\ref[M]'>Send To</A>
<br><br>
body += "<br><br>" <A href='?src=\ref[src];traitor=\ref[M]'>Traitor panel</A> |
body += "<A href='?src=\ref[src];traitor=\ref[M]'>Traitor panel</A> | " <A href='?src=\ref[src];narrateto=\ref[M]'>Narrate to</A> |
body += "<A href='?src=\ref[src];narrateto=\ref[M]'>Narrate to</A> | " <A href='?src=\ref[src];subtlemessage=\ref[M]'>Subtle message</A>
body += "<A href='?src=\ref[src];subtlemessage=\ref[M]'>Subtle message</A>" "}
if (M.client) if (M.client)
if(!istype(M, /mob/new_player)) if(!istype(M, /mob/new_player))
@@ -106,10 +107,11 @@ var/global/floorIsLava = 0
if(isAI(M)) if(isAI(M))
body += "<B>Is an AI</B> " body += "<B>Is an AI</B> "
else if(ishuman(M)) else if(ishuman(M))
body += "<A href='?src=\ref[src];makeai=\ref[M]'>Make AI</A> | " body += {"<A href='?src=\ref[src];makeai=\ref[M]'>Make AI</A> |
body += "<A href='?src=\ref[src];makerobot=\ref[M]'>Make Robot</A> | " <A href='?src=\ref[src];makerobot=\ref[M]'>Make Robot</A> |
body += "<A href='?src=\ref[src];makealien=\ref[M]'>Make Alien</A> | " <A href='?src=\ref[src];makealien=\ref[M]'>Make Alien</A> |
body += "<A href='?src=\ref[src];makeslime=\ref[M]'>Make slime</A> " <A href='?src=\ref[src];makeslime=\ref[M]'>Make slime</A>
"}
//Simple Animals //Simple Animals
if(isanimal(M)) if(isanimal(M))
@@ -117,45 +119,46 @@ var/global/floorIsLava = 0
else else
body += "<A href='?src=\ref[src];makeanimal=\ref[M]'>Animalize</A> | " body += "<A href='?src=\ref[src];makeanimal=\ref[M]'>Animalize</A> | "
body += "<br><br>" body += {"<br><br>
body += "<b>Rudimentary transformation:</b><font size=2><br>These transformations only create a new mob type and copy stuff over. They do not take into account MMIs and similar mob-specific things. The buttons in 'Transformations' are preferred, when possible.</font><br>" <b>Rudimentary transformation:</b><font size=2><br>These transformations only create a new mob type and copy stuff over. They do not take into account MMIs and similar mob-specific things. The buttons in 'Transformations' are preferred, when possible.</font><br>
body += "<A href='?src=\ref[src];simplemake=observer;mob=\ref[M]'>Observer</A> | " <A href='?src=\ref[src];simplemake=observer;mob=\ref[M]'>Observer</A> |
body += "\[ Alien: <A href='?src=\ref[src];simplemake=drone;mob=\ref[M]'>Drone</A>, " \[ Alien: <A href='?src=\ref[src];simplemake=drone;mob=\ref[M]'>Drone</A>,
body += "<A href='?src=\ref[src];simplemake=hunter;mob=\ref[M]'>Hunter</A>, " <A href='?src=\ref[src];simplemake=hunter;mob=\ref[M]'>Hunter</A>,
body += "<A href='?src=\ref[src];simplemake=queen;mob=\ref[M]'>Queen</A>, " <A href='?src=\ref[src];simplemake=queen;mob=\ref[M]'>Queen</A>,
body += "<A href='?src=\ref[src];simplemake=sentinel;mob=\ref[M]'>Sentinel</A>, " <A href='?src=\ref[src];simplemake=sentinel;mob=\ref[M]'>Sentinel</A>,
body += "<A href='?src=\ref[src];simplemake=larva;mob=\ref[M]'>Larva</A> \] " <A href='?src=\ref[src];simplemake=larva;mob=\ref[M]'>Larva</A> \]
body += "<A href='?src=\ref[src];simplemake=human;mob=\ref[M]'>Human</A> " <A href='?src=\ref[src];simplemake=human;mob=\ref[M]'>Human</A>
body += "\[ slime: <A href='?src=\ref[src];simplemake=slime;mob=\ref[M]'>Baby</A>, " \[ slime: <A href='?src=\ref[src];simplemake=slime;mob=\ref[M]'>Baby</A>,
body += "<A href='?src=\ref[src];simplemake=adultslime;mob=\ref[M]'>Adult</A> \] " <A href='?src=\ref[src];simplemake=adultslime;mob=\ref[M]'>Adult</A> \]
body += "<A href='?src=\ref[src];simplemake=monkey;mob=\ref[M]'>Monkey</A> | " <A href='?src=\ref[src];simplemake=monkey;mob=\ref[M]'>Monkey</A> |
body += "<A href='?src=\ref[src];simplemake=robot;mob=\ref[M]'>Cyborg</A> | " <A href='?src=\ref[src];simplemake=robot;mob=\ref[M]'>Cyborg</A> |
body += "<A href='?src=\ref[src];simplemake=cat;mob=\ref[M]'>Cat</A> | " <A href='?src=\ref[src];simplemake=cat;mob=\ref[M]'>Cat</A> |
body += "<A href='?src=\ref[src];simplemake=runtime;mob=\ref[M]'>Runtime</A> | " <A href='?src=\ref[src];simplemake=runtime;mob=\ref[M]'>Runtime</A> |
body += "<A href='?src=\ref[src];simplemake=corgi;mob=\ref[M]'>Corgi</A> | " <A href='?src=\ref[src];simplemake=corgi;mob=\ref[M]'>Corgi</A> |
body += "<A href='?src=\ref[src];simplemake=ian;mob=\ref[M]'>Ian</A> | " <A href='?src=\ref[src];simplemake=ian;mob=\ref[M]'>Ian</A> |
body += "<A href='?src=\ref[src];simplemake=crab;mob=\ref[M]'>Crab</A> | " <A href='?src=\ref[src];simplemake=crab;mob=\ref[M]'>Crab</A> |
body += "<A href='?src=\ref[src];simplemake=coffee;mob=\ref[M]'>Coffee</A> | " <A href='?src=\ref[src];simplemake=coffee;mob=\ref[M]'>Coffee</A> |
//body += "<A href='?src=\ref[src];simplemake=parrot;mob=\ref[M]'>Parrot</A> | " \[ Construct: <A href='?src=\ref[src];simplemake=constructarmoured;mob=\ref[M]'>Armoured</A> ,
//body += "<A href='?src=\ref[src];simplemake=polyparrot;mob=\ref[M]'>Poly</A> | " <A href='?src=\ref[src];simplemake=constructbuilder;mob=\ref[M]'>Builder</A> ,
body += "\[ Construct: <A href='?src=\ref[src];simplemake=constructarmoured;mob=\ref[M]'>Armoured</A> , " <A href='?src=\ref[src];simplemake=constructwraith;mob=\ref[M]'>Wraith</A> \]
body += "<A href='?src=\ref[src];simplemake=constructbuilder;mob=\ref[M]'>Builder</A> , " <A href='?src=\ref[src];simplemake=shade;mob=\ref[M]'>Shade</A>
body += "<A href='?src=\ref[src];simplemake=constructwraith;mob=\ref[M]'>Wraith</A> \] " <br>
body += "<A href='?src=\ref[src];simplemake=shade;mob=\ref[M]'>Shade</A>" "}
body += "<br>"
if (M.client) if (M.client)
body += "<br><br>" body += {"<br><br>
body += "<b>Other actions:</b>" <b>Other actions:</b>
body += "<br>" <br>
body += "<A href='?src=\ref[src];forcespeech=\ref[M]'>Forcesay</A> | " <A href='?src=\ref[src];forcespeech=\ref[M]'>Forcesay</A> |
body += "<A href='?src=\ref[src];tdome1=\ref[M]'>Thunderdome 1</A> | " <A href='?src=\ref[src];tdome1=\ref[M]'>Thunderdome 1</A> |
body += "<A href='?src=\ref[src];tdome2=\ref[M]'>Thunderdome 2</A> | " <A href='?src=\ref[src];tdome2=\ref[M]'>Thunderdome 2</A> |
body += "<A href='?src=\ref[src];tdomeadmin=\ref[M]'>Thunderdome Admin</A> | " <A href='?src=\ref[src];tdomeadmin=\ref[M]'>Thunderdome Admin</A> |
body += "<A href='?src=\ref[src];tdomeobserve=\ref[M]'>Thunderdome Observer</A> | " <A href='?src=\ref[src];tdomeobserve=\ref[M]'>Thunderdome Observer</A> |
"}
body += "<br>" body += {"<br>
body += "</body></html>" </body></html>
"}
usr << browse(body, "window=adminplayeropts;size=550x515") usr << browse(body, "window=adminplayeropts;size=550x515")
feedback_add_details("admin_verb","SPP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","SPP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -281,23 +284,29 @@ var/global/floorIsLava = 0
switch(admincaster_screen) switch(admincaster_screen)
if(0) if(0)
dat += "Welcome to the admin newscaster.<BR> Here you can add, edit and censor every newspiece on the network." dat += {"Welcome to the admin newscaster.<BR> Here you can add, edit and censor every newspiece on the network.
dat += "<BR>Feed channels and stories entered through here will be uneditable and handled as official news by the rest of the units." <BR>Feed channels and stories entered through here will be uneditable and handled as official news by the rest of the units.
dat += "<BR>Note that this panel allows full freedom over the news network, there are no constrictions except the few basic ones. Don't break things!</FONT>" <BR>Note that this panel allows full freedom over the news network, there are no constrictions except the few basic ones. Don't break things!</FONT>
"}
if(news_network.wanted_issue) if(news_network.wanted_issue)
dat+= "<HR><A href='?src=\ref[src];ac_view_wanted=1'>Read Wanted Issue</A>" dat+= "<HR><A href='?src=\ref[src];ac_view_wanted=1'>Read Wanted Issue</A>"
dat+= "<HR><BR><A href='?src=\ref[src];ac_create_channel=1'>Create Feed Channel</A>"
dat+= "<BR><A href='?src=\ref[src];ac_view=1'>View Feed Channels</A>" dat+= {"<HR><BR><A href='?src=\ref[src];ac_create_channel=1'>Create Feed Channel</A>
dat+= "<BR><A href='?src=\ref[src];ac_create_feed_story=1'>Submit new Feed story</A>" <BR><A href='?src=\ref[src];ac_view=1'>View Feed Channels</A>
dat+= "<BR><BR><A href='?src=\ref[usr];mach_close=newscaster_main'>Exit</A>" <BR><A href='?src=\ref[src];ac_create_feed_story=1'>Submit new Feed story</A>
<BR><BR><A href='?src=\ref[usr];mach_close=newscaster_main'>Exit</A>
"}
var/wanted_already = 0 var/wanted_already = 0
if(news_network.wanted_issue) if(news_network.wanted_issue)
wanted_already = 1 wanted_already = 1
dat+="<HR><B>Feed Security functions:</B><BR>"
dat+="<BR><A href='?src=\ref[src];ac_menu_wanted=1'>[(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue</A>" dat+={"<HR><B>Feed Security functions:</B><BR>
dat+="<BR><A href='?src=\ref[src];ac_menu_censor_story=1'>Censor Feed Stories</A>" <BR><A href='?src=\ref[src];ac_menu_wanted=1'>[(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue</A>
dat+="<BR><A href='?src=\ref[src];ac_menu_censor_channel=1'>Mark Feed Channel with Nanotrasen D-Notice (disables and locks the channel.</A>" <BR><A href='?src=\ref[src];ac_menu_censor_story=1'>Censor Feed Stories</A>
dat+="<BR><HR><A href='?src=\ref[src];ac_set_signature=1'>The newscaster recognises you as:<BR> <FONT COLOR='green'>[src.admincaster_signature]</FONT></A>" <BR><A href='?src=\ref[src];ac_menu_censor_channel=1'>Mark Feed Channel with Nanotrasen D-Notice (disables and locks the channel.</A>
<BR><HR><A href='?src=\ref[src];ac_set_signature=1'>The newscaster recognises you as:<BR> <FONT COLOR='green'>[src.admincaster_signature]</FONT></A>
"}
if(1) if(1)
dat+= "Station Feed Channels<HR>" dat+= "Station Feed Channels<HR>"
if( isemptylist(news_network.network_channels) ) if( isemptylist(news_network.network_channels) )
@@ -308,26 +317,36 @@ var/global/floorIsLava = 0
dat+="<B><FONT style='BACKGROUND-COLOR: LightGreen'><A href='?src=\ref[src];ac_show_channel=\ref[CHANNEL]'>[CHANNEL.channel_name]</A></FONT></B><BR>" dat+="<B><FONT style='BACKGROUND-COLOR: LightGreen'><A href='?src=\ref[src];ac_show_channel=\ref[CHANNEL]'>[CHANNEL.channel_name]</A></FONT></B><BR>"
else else
dat+="<B><A href='?src=\ref[src];ac_show_channel=\ref[CHANNEL]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ()]<BR></B>" dat+="<B><A href='?src=\ref[src];ac_show_channel=\ref[CHANNEL]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ()]<BR></B>"
dat+="<BR><HR><A href='?src=\ref[src];ac_refresh=1'>Refresh</A>" dat+={"<BR><HR><A href='?src=\ref[src];ac_refresh=1'>Refresh</A>
dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Back</A>" <BR><A href='?src=\ref[src];ac_setScreen=[0]'>Back</A>
"}
if(2) if(2)
dat+="Creating new Feed Channel..." dat+={"
dat+="<HR><B><A href='?src=\ref[src];ac_set_channel_name=1'>Channel Name</A>:</B> [src.admincaster_feed_channel.channel_name]<BR>" Creating new Feed Channel...
dat+="<B><A href='?src=\ref[src];ac_set_signature=1'>Channel Author</A>:</B> <FONT COLOR='green'>[src.admincaster_signature]</FONT><BR>" <HR><B><A href='?src=\ref[src];ac_set_channel_name=1'>Channel Name</A>:</B> [src.admincaster_feed_channel.channel_name]<BR>
dat+="<B><A href='?src=\ref[src];ac_set_channel_lock=1'>Will Accept Public Feeds</A>:</B> [(src.admincaster_feed_channel.locked) ? ("NO") : ("YES")]<BR><BR>" <B><A href='?src=\ref[src];ac_set_signature=1'>Channel Author</A>:</B> <FONT COLOR='green'>[src.admincaster_signature]</FONT><BR>
dat+="<BR><A href='?src=\ref[src];ac_submit_new_channel=1'>Submit</A><BR><BR><A href='?src=\ref[src];ac_setScreen=[0]'>Cancel</A><BR>" <B><A href='?src=\ref[src];ac_set_channel_lock=1'>Will Accept Public Feeds</A>:</B> [(src.admincaster_feed_channel.locked) ? ("NO") : ("YES")]<BR><BR>
<BR><A href='?src=\ref[src];ac_submit_new_channel=1'>Submit</A><BR><BR><A href='?src=\ref[src];ac_setScreen=[0]'>Cancel</A><BR>
"}
if(3) if(3)
dat+="Creating new Feed Message..." dat+={"
dat+="<HR><B><A href='?src=\ref[src];ac_set_channel_receiving=1'>Receiving Channel</A>:</B> [src.admincaster_feed_channel.channel_name]<BR>" //MARK Creating new Feed Message...
dat+="<B>Message Author:</B> <FONT COLOR='green'>[src.admincaster_signature]</FONT><BR>" <HR><B><A href='?src=\ref[src];ac_set_channel_receiving=1'>Receiving Channel</A>:</B> [src.admincaster_feed_channel.channel_name]<BR>" //MARK
dat+="<B><A href='?src=\ref[src];ac_set_new_message=1'>Message Body</A>:</B> [src.admincaster_feed_message.body] <BR>" <B>Message Author:</B> <FONT COLOR='green'>[src.admincaster_signature]</FONT><BR>
dat+="<BR><A href='?src=\ref[src];ac_submit_new_message=1'>Submit</A><BR><BR><A href='?src=\ref[src];ac_setScreen=[0]'>Cancel</A><BR>" <B><A href='?src=\ref[src];ac_set_new_message=1'>Message Body</A>:</B> [src.admincaster_feed_message.body] <BR>
<BR><A href='?src=\ref[src];ac_submit_new_message=1'>Submit</A><BR><BR><A href='?src=\ref[src];ac_setScreen=[0]'>Cancel</A><BR>
"}
if(4) if(4)
dat+="Feed story successfully submitted to [src.admincaster_feed_channel.channel_name].<BR><BR>" dat+={"
dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Return</A><BR>" Feed story successfully submitted to [src.admincaster_feed_channel.channel_name].<BR><BR>
<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Return</A><BR>
"}
if(5) if(5)
dat+="Feed Channel [src.admincaster_feed_channel.channel_name] created successfully.<BR><BR>" dat+={"
dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Return</A><BR>" Feed Channel [src.admincaster_feed_channel.channel_name] created successfully.<BR><BR>
<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Return</A><BR>
"}
if(6) if(6)
dat+="<B><FONT COLOR='maroon'>ERROR: Could not submit Feed story to Network.</B></FONT><HR><BR>" dat+="<B><FONT COLOR='maroon'>ERROR: Could not submit Feed story to Network.</B></FONT><HR><BR>"
if(src.admincaster_feed_channel.channel_name=="") if(src.admincaster_feed_channel.channel_name=="")
@@ -350,8 +369,10 @@ var/global/floorIsLava = 0
if(9) if(9)
dat+="<B>[src.admincaster_feed_channel.channel_name]: </B><FONT SIZE=1>\[created by: <FONT COLOR='maroon'>[src.admincaster_feed_channel.author]</FONT>\]</FONT><HR>" dat+="<B>[src.admincaster_feed_channel.channel_name]: </B><FONT SIZE=1>\[created by: <FONT COLOR='maroon'>[src.admincaster_feed_channel.author]</FONT>\]</FONT><HR>"
if(src.admincaster_feed_channel.censored) if(src.admincaster_feed_channel.censored)
dat+="<FONT COLOR='red'><B>ATTENTION: </B></FONT>This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.<BR>" dat+={"
dat+="No further feed story additions are allowed while the D-Notice is in effect.</FONT><BR><BR>" <FONT COLOR='red'><B>ATTENTION: </B></FONT>This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.<BR>
No further feed story additions are allowed while the D-Notice is in effect.</FONT><BR><BR>
"}
else else
if( isemptylist(src.admincaster_feed_channel.messages) ) if( isemptylist(src.admincaster_feed_channel.messages) )
dat+="<I>No feed messages found in channel...</I><BR>" dat+="<I>No feed messages found in channel...</I><BR>"
@@ -364,13 +385,17 @@ var/global/floorIsLava = 0
usr << browse_rsc(MESSAGE.img, "tmp_photo[i].png") usr << browse_rsc(MESSAGE.img, "tmp_photo[i].png")
dat+="<img src='tmp_photo[i].png' width = '180'><BR><BR>" dat+="<img src='tmp_photo[i].png' width = '180'><BR><BR>"
dat+="<FONT SIZE=1>\[Story by <FONT COLOR='maroon'>[MESSAGE.author]</FONT>\]</FONT><BR>" dat+="<FONT SIZE=1>\[Story by <FONT COLOR='maroon'>[MESSAGE.author]</FONT>\]</FONT><BR>"
dat+="<BR><HR><A href='?src=\ref[src];ac_refresh=1'>Refresh</A>" dat+={"
dat+="<BR><A href='?src=\ref[src];ac_setScreen=[1]'>Back</A>" <BR><HR><A href='?src=\ref[src];ac_refresh=1'>Refresh</A>
<BR><A href='?src=\ref[src];ac_setScreen=[1]'>Back</A>
"}
if(10) if(10)
dat+="<B>Nanotrasen Feed Censorship Tool</B><BR>" dat+={"
dat+="<FONT SIZE=1>NOTE: Due to the nature of news Feeds, total deletion of a Feed Story is not possible.<BR>" <B>Nanotrasen Feed Censorship Tool</B><BR>
dat+="Keep in mind that users attempting to view a censored feed will instead see the \[REDACTED\] tag above it.</FONT>" <FONT SIZE=1>NOTE: Due to the nature of news Feeds, total deletion of a Feed Story is not possible.<BR>
dat+="<HR>Select Feed channel to get Stories from:<BR>" Keep in mind that users attempting to view a censored feed will instead see the \[REDACTED\] tag above it.</FONT>
<HR>Select Feed channel to get Stories from:<BR>
"}
if(isemptylist(news_network.network_channels)) if(isemptylist(news_network.network_channels))
dat+="<I>No feed channels found active...</I><BR>" dat+="<I>No feed channels found active...</I><BR>"
else else
@@ -378,10 +403,12 @@ var/global/floorIsLava = 0
dat+="<A href='?src=\ref[src];ac_pick_censor_channel=\ref[CHANNEL]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ()]<BR>" dat+="<A href='?src=\ref[src];ac_pick_censor_channel=\ref[CHANNEL]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ()]<BR>"
dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Cancel</A>" dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Cancel</A>"
if(11) if(11)
dat+="<B>Nanotrasen D-Notice Handler</B><HR>" dat+={"
dat+="<FONT SIZE=1>A D-Notice is to be bestowed upon the channel if the handling Authority deems it as harmful for the station's" <B>Nanotrasen D-Notice Handler</B><HR>
dat+="morale, integrity or disciplinary behaviour. A D-Notice will render a channel unable to be updated by anyone, without deleting any feed" <FONT SIZE=1>A D-Notice is to be bestowed upon the channel if the handling Authority deems it as harmful for the station's
dat+="stories it might contain at the time. You can lift a D-Notice if you have the required access at any time.</FONT><HR>" morale, integrity or disciplinary behaviour. A D-Notice will render a channel unable to be updated by anyone, without deleting any feed
stories it might contain at the time. You can lift a D-Notice if you have the required access at any time.</FONT><HR>
"}
if(isemptylist(news_network.network_channels)) if(isemptylist(news_network.network_channels))
dat+="<I>No feed channels found active...</I><BR>" dat+="<I>No feed channels found active...</I><BR>"
else else
@@ -390,22 +417,29 @@ var/global/floorIsLava = 0
dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Back</A>" dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Back</A>"
if(12) if(12)
dat+="<B>[src.admincaster_feed_channel.channel_name]: </B><FONT SIZE=1>\[ created by: <FONT COLOR='maroon'>[src.admincaster_feed_channel.author]</FONT> \]</FONT><BR>" dat+={"
dat+="<FONT SIZE=2><A href='?src=\ref[src];ac_censor_channel_author=\ref[src.admincaster_feed_channel]'>[(src.admincaster_feed_channel.author=="\[REDACTED\]") ? ("Undo Author censorship") : ("Censor channel Author")]</A></FONT><HR>" <B>[src.admincaster_feed_channel.channel_name]: </B><FONT SIZE=1>\[ created by: <FONT COLOR='maroon'>[src.admincaster_feed_channel.author]</FONT> \]</FONT><BR>
<FONT SIZE=2><A href='?src=\ref[src];ac_censor_channel_author=\ref[src.admincaster_feed_channel]'>[(src.admincaster_feed_channel.author=="\[REDACTED\]") ? ("Undo Author censorship") : ("Censor channel Author")]</A></FONT><HR>
"}
if( isemptylist(src.admincaster_feed_channel.messages) ) if( isemptylist(src.admincaster_feed_channel.messages) )
dat+="<I>No feed messages found in channel...</I><BR>" dat+="<I>No feed messages found in channel...</I><BR>"
else else
for(var/datum/feed_message/MESSAGE in src.admincaster_feed_channel.messages) for(var/datum/feed_message/MESSAGE in src.admincaster_feed_channel.messages)
dat+="-[MESSAGE.body] <BR><FONT SIZE=1>\[Story by <FONT COLOR='maroon'>[MESSAGE.author]</FONT>\]</FONT><BR>" dat+={"
dat+="<FONT SIZE=2><A href='?src=\ref[src];ac_censor_channel_story_body=\ref[MESSAGE]'>[(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")]</A> - <A href='?src=\ref[src];ac_censor_channel_story_author=\ref[MESSAGE]'>[(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]</A></FONT><BR>" -[MESSAGE.body] <BR><FONT SIZE=1>\[Story by <FONT COLOR='maroon'>[MESSAGE.author]</FONT>\]</FONT><BR>
<FONT SIZE=2><A href='?src=\ref[src];ac_censor_channel_story_body=\ref[MESSAGE]'>[(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")]</A> - <A href='?src=\ref[src];ac_censor_channel_story_author=\ref[MESSAGE]'>[(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]</A></FONT><BR>
"}
dat+="<BR><A href='?src=\ref[src];ac_setScreen=[10]'>Back</A>" dat+="<BR><A href='?src=\ref[src];ac_setScreen=[10]'>Back</A>"
if(13) if(13)
dat+="<B>[src.admincaster_feed_channel.channel_name]: </B><FONT SIZE=1>\[ created by: <FONT COLOR='maroon'>[src.admincaster_feed_channel.author]</FONT> \]</FONT><BR>" dat+={"
dat+="Channel messages listed below. If you deem them dangerous to the station, you can <A href='?src=\ref[src];ac_toggle_d_notice=\ref[src.admincaster_feed_channel]'>Bestow a D-Notice upon the channel</A>.<HR>" <B>[src.admincaster_feed_channel.channel_name]: </B><FONT SIZE=1>\[ created by: <FONT COLOR='maroon'>[src.admincaster_feed_channel.author]</FONT> \]</FONT><BR>
Channel messages listed below. If you deem them dangerous to the station, you can <A href='?src=\ref[src];ac_toggle_d_notice=\ref[src.admincaster_feed_channel]'>Bestow a D-Notice upon the channel</A>.<HR>
"}
if(src.admincaster_feed_channel.censored) if(src.admincaster_feed_channel.censored)
dat+="<FONT COLOR='red'><B>ATTENTION: </B></FONT>This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.<BR>" dat+={"
dat+="No further feed story additions are allowed while the D-Notice is in effect.</FONT><BR><BR>" <FONT COLOR='red'><B>ATTENTION: </B></FONT>This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.<BR>
No further feed story additions are allowed while the D-Notice is in effect.</FONT><BR><BR>
"}
else else
if( isemptylist(src.admincaster_feed_channel.messages) ) if( isemptylist(src.admincaster_feed_channel.messages) )
dat+="<I>No feed messages found in channel...</I><BR>" dat+="<I>No feed messages found in channel...</I><BR>"
@@ -423,9 +457,11 @@ var/global/floorIsLava = 0
end_param = 2 end_param = 2
if(wanted_already) if(wanted_already)
dat+="<FONT SIZE=2><BR><I>A wanted issue is already in Feed Circulation. You can edit or cancel it below.</FONT></I>" dat+="<FONT SIZE=2><BR><I>A wanted issue is already in Feed Circulation. You can edit or cancel it below.</FONT></I>"
dat+="<HR>" dat+={"
dat+="<A href='?src=\ref[src];ac_set_wanted_name=1'>Criminal Name</A>: [src.admincaster_feed_message.author] <BR>" <HR>
dat+="<A href='?src=\ref[src];ac_set_wanted_desc=1'>Description</A>: [src.admincaster_feed_message.body] <BR>" <A href='?src=\ref[src];ac_set_wanted_name=1'>Criminal Name</A>: [src.admincaster_feed_message.author] <BR>
<A href='?src=\ref[src];ac_set_wanted_desc=1'>Description</A>: [src.admincaster_feed_message.body] <BR>
"}
if(wanted_already) if(wanted_already)
dat+="<B>Wanted Issue created by:</B><FONT COLOR='green'> [news_network.wanted_issue.backup_author]</FONT><BR>" dat+="<B>Wanted Issue created by:</B><FONT COLOR='green'> [news_network.wanted_issue.backup_author]</FONT><BR>"
else else
@@ -435,8 +471,10 @@ var/global/floorIsLava = 0
dat+="<BR><A href='?src=\ref[src];ac_cancel_wanted=1'>Take down Issue</A>" dat+="<BR><A href='?src=\ref[src];ac_cancel_wanted=1'>Take down Issue</A>"
dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Cancel</A>" dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Cancel</A>"
if(15) if(15)
dat+="<FONT COLOR='green'>Wanted issue for [src.admincaster_feed_message.author] is now in Network Circulation.</FONT><BR><BR>" dat+={"
dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Return</A><BR>" <FONT COLOR='green'>Wanted issue for [src.admincaster_feed_message.author] is now in Network Circulation.</FONT><BR><BR>
<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Return</A><BR>
"}
if(16) if(16)
dat+="<B><FONT COLOR='maroon'>ERROR: Wanted Issue rejected by Network.</B></FONT><HR><BR>" dat+="<B><FONT COLOR='maroon'>ERROR: Wanted Issue rejected by Network.</B></FONT><HR><BR>"
if(src.admincaster_feed_message.author =="" || src.admincaster_feed_message.author == "\[REDACTED\]") if(src.admincaster_feed_message.author =="" || src.admincaster_feed_message.author == "\[REDACTED\]")
@@ -445,13 +483,17 @@ var/global/floorIsLava = 0
dat+="<FONT COLOR='maroon'><3E>Invalid description.</FONT><BR>" dat+="<FONT COLOR='maroon'><3E>Invalid description.</FONT><BR>"
dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Return</A><BR>" dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Return</A><BR>"
if(17) if(17)
dat+="<B>Wanted Issue successfully deleted from Circulation</B><BR>" dat+={"
dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Return</A><BR>" <B>Wanted Issue successfully deleted from Circulation</B><BR>
<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Return</A><BR>
"}
if(18) if(18)
dat+="<B><FONT COLOR ='maroon'>-- STATIONWIDE WANTED ISSUE --</B></FONT><BR><FONT SIZE=2>\[Submitted by: <FONT COLOR='green'>[news_network.wanted_issue.backup_author]</FONT>\]</FONT><HR>" dat+={"
dat+="<B>Criminal</B>: [news_network.wanted_issue.author]<BR>" <B><FONT COLOR ='maroon'>-- STATIONWIDE WANTED ISSUE --</B></FONT><BR><FONT SIZE=2>\[Submitted by: <FONT COLOR='green'>[news_network.wanted_issue.backup_author]</FONT>\]</FONT><HR>
dat+="<B>Description</B>: [news_network.wanted_issue.body]<BR>" <B>Criminal</B>: [news_network.wanted_issue.author]<BR>
dat+="<B>Photo:</B>: " <B>Description</B>: [news_network.wanted_issue.body]<BR>
<B>Photo:</B>:
"}
if(news_network.wanted_issue.img) if(news_network.wanted_issue.img)
usr << browse_rsc(news_network.wanted_issue.img, "tmp_photow.png") usr << browse_rsc(news_network.wanted_issue.img, "tmp_photow.png")
dat+="<BR><img src='tmp_photow.png' width = '180'>" dat+="<BR><img src='tmp_photow.png' width = '180'>"
@@ -459,8 +501,10 @@ var/global/floorIsLava = 0
dat+="None" dat+="None"
dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Back</A><BR>" dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Back</A><BR>"
if(19) if(19)
dat+="<FONT COLOR='green'>Wanted issue for [src.admincaster_feed_message.author] successfully edited.</FONT><BR><BR>" dat+={"
dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Return</A><BR>" <FONT COLOR='green'>Wanted issue for [src.admincaster_feed_message.author] successfully edited.</FONT><BR><BR>
<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Return</A><BR>
"}
else else
dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com"

20
code/modules/mob/living/silicon/ai/say.dm
View File

@@ -38,8 +38,9 @@ var/const/VOX_VOLUME = 75
set desc = "Display a list of vocal words to announce to the crew." set desc = "Display a list of vocal words to announce to the crew."
set category = "AI Commands" set category = "AI Commands"
src << "\red VOX is disabled until issues with the code can be sorted."
var/dat = "Here is a list of words you can type into the Announcement button to create sentences to vocally announce.<BR> \ return
/* var/dat = "Here is a list of words you can type into the Announcement button to create sentences to vocally announce.<BR> \
Do not use punctuation as you would normally, if you want a pause you can use the full stop and comma characters by separating them with spaces, like so: 'Alpha . Test , Bravo'.<BR>" Do not use punctuation as you would normally, if you want a pause you can use the full stop and comma characters by separating them with spaces, like so: 'Alpha . Test , Bravo'.<BR>"
var/index = 0 var/index = 0
@@ -49,7 +50,7 @@ var/const/VOX_VOLUME = 75
if(index != vox_sounds.len) if(index != vox_sounds.len)
dat += " / " dat += " / "
src << browse(dat, "window=announce_help;size=500x400") src << browse(dat, "window=announce_help;size=500x400")*/
/mob/living/silicon/ai/verb/announcement(var/message as text) /mob/living/silicon/ai/verb/announcement(var/message as text)
@@ -58,6 +59,9 @@ var/const/VOX_VOLUME = 75
set desc = "Create a vocal announcement by typing in the available words to create a setence. More help is available in 'Announcement Help'" set desc = "Create a vocal announcement by typing in the available words to create a setence. More help is available in 'Announcement Help'"
set category = "AI Commands" set category = "AI Commands"
src << "\red VOX is disabled until issues with the code can be sorted."
return
/*
if(!message) if(!message)
return return
//if(!announcing_vox > world.time) //if(!announcing_vox > world.time)
@@ -81,9 +85,9 @@ var/const/VOX_VOLUME = 75
if(incorrect_words.len) if(incorrect_words.len)
src << "<span class='notice'>These words are not available on the announcement system: [english_list(incorrect_words)].</span>" src << "<span class='notice'>These words are not available on the announcement system: [english_list(incorrect_words)].</span>"
*/
/proc/play_vox_word(var/word, var/z_level) /proc/play_vox_word(var/word, var/z_level)
/*
word = lowertext(word) word = lowertext(word)
if(vox_sounds[word]) if(vox_sounds[word])
@@ -99,12 +103,12 @@ var/const/VOX_VOLUME = 75
if(T.z == z_level) if(T.z == z_level)
M << voice M << voice
return 1 return 1
return 0 return 0*/
// List is required to compile the resources into the game when it loads. // List is required to compile the resources into the game when it loads.
// Dynamically loading it has bad results with sounds overtaking each other, even with the wait variable. // Dynamically loading it has bad results with sounds overtaking each other, even with the wait variable.
var/list/vox_sounds = list("," = 'sound/vox/,.wav', var/list/vox_sounds = list(/*"," = 'sound/vox/,.wav',
"." = 'sound/vox/..wav', "." = 'sound/vox/..wav',
"a" = 'sound/vox/a.wav', "a" = 'sound/vox/a.wav',
"accelerating" = 'sound/vox/accelerating.wav', "accelerating" = 'sound/vox/accelerating.wav',
@@ -719,4 +723,4 @@ var/list/vox_sounds = list("," = 'sound/vox/,.wav',
"yourself" = 'sound/vox/yourself.wav', "yourself" = 'sound/vox/yourself.wav',
"zero" = 'sound/vox/zero.wav', "zero" = 'sound/vox/zero.wav',
"zone" = 'sound/vox/zone.wav', "zone" = 'sound/vox/zone.wav',
"zulu" = 'sound/vox/zulu.wav') "zulu" = 'sound/vox/zulu.wav'*/)

22107
maps/tgstation.2.1.0.0.1.dmm
View File

File diff suppressed because it is too large Load Diff