cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-26 14:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflict resolution.

Browse Source
This commit is contained in:
Zuhayr
2014-11-10 13:00:06 +10:30
parent c481bd151d 57110b4059
commit b4ea25d064
42 changed files with 2122 additions and 2046 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/paper.dm
+1 -1
View File
@@ -225,7 +225,7 @@
t = replacetext(t, "\[/grid\]", "</td></tr></table>")
t = replacetext(t, "\[row\]", "</td><tr>")
t = replacetext(t, "\[cell\]", "<td>")
t = replacetext(t, "\[logo\]", "<img src = http://baystation12.net/wiki/logo.png>")
t = replacetext(t, "\[logo\]", "<img src = html/images/ntlogo.png>")
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!