shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update preferences.dm

Browse Source
This commit is contained in:
LetterJay
2017-09-29 23:43:39 -05:00
committed by GitHub
parent 6fe6cfd68e
commit 03ee5a9303
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/client/preferences.dm
View File

@@ -274,10 +274,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "<div class='statusDisplay'><center><img src=previewicon.png width=[preview_icon.Width()] height=[preview_icon.Height()]></center></div>"
dat += "</td></tr></table>"
<<<<<<< HEAD
// dat += "<b>Size:</b> <a href='?_src_=prefs;preference=character_size;task=input'>[character_size]</a><BR>"
dat += "<br>"
=======
dat += "<h2>Body</h2>"
dat += "<a href='?_src_=prefs;preference=all;task=random'>Random Body</A> "
@@ -441,8 +439,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "</tr></table>"
>>>>>>> 4178c20... Configuration datum refactor (#30763)
if (1) // Game Preferences
dat += "<table><tr><td width='340px' height='300px' valign='top'>"
dat += "<h2>General Settings</h2>"