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

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev

Browse Source
This commit is contained in:
Zuhayr
2014-10-06 20:15:59 +10:30
parent d0b3a3a39b 0f92f4d338
commit df038c9fe8
11 changed files with 54 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/paperwork/paper.dm
View File

@@ -40,6 +40,12 @@
pixel_y = rand(-8, 8)
pixel_x = rand(-9, 9)
stamps = ""
if(info != initial(info))
info = html_encode(info)
info = replacetext(info, "\n", "<BR>")
info = parsepencode(info)
spawn(2)
update_icon()
updateinfolinks()
@@ -198,7 +204,7 @@
t = replacetext(t, "\[/u\]", "</U>")
t = replacetext(t, "\[large\]", "<font size=\"4\">")
t = replacetext(t, "\[/large\]", "</font>")
t = replacetext(t, "\[sign\]", "<font face=\"[signfont]\"><i>[user.real_name]</i></font>")
t = replacetext(t, "\[sign\]", "<font face=\"[signfont]\"><i>[user ? user.real_name : "Anonymous"]</i></font>")
t = replacetext(t, "\[field\]", "<span class=\"paper_field\"></span>")
t = replacetext(t, "\[h1\]", "<H1>")
@@ -223,7 +229,7 @@
t = replacetext(t, "\[cell\]", "<td>")
t = replacetext(t, "\[logo\]", "<img src = http://baystation12.net/wiki/logo.png>")
t = "<font face=\"[deffont]\" color=[P.colour]>[t]</font>"
t = "<font face=\"[deffont]\" color=[P ? P.colour : "black"]>[t]</font>"
else // If it is a crayon, and he still tries to use these, make them empty!
t = replacetext(t, "\[*\]", "")
t = replacetext(t, "\[hr\]", "")
@@ -237,7 +243,7 @@
t = replacetext(t, "\[cell\]", "")
t = replacetext(t, "\[logo\]", "")
t = "<font face=\"[crayonfont]\" color=[P.colour]><b>[t]</b></font>"
t = "<font face=\"[crayonfont]\" color=[P ? P.colour : "black"]><b>[t]</b></font>"
// t = replacetext(t, "#", "") // Junk converted to nothing!