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

Merge pull request #4724 from deathride58/fixesflavortexthopefully

Browse Source 
Fixes flavortext readmores for real this time
This commit is contained in:
deathride58
2018-01-10 04:56:13 +00:00
committed by GitHub
parent ef92431305 34297d5005
commit 99dd163de4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+2 -2
View File
@@ -412,7 +412,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(2) if(2)
dat += "<table><tr><td width='340px' height='300px' valign='top'>" dat += "<table><tr><td width='340px' height='300px' valign='top'>"
dat += "<div class='statusDisplay'><img src=previewicon.png width=[preview_icon.Width()] height=[preview_icon.Height()]></div><br>" dat += "<div class='statusDisplay'><img src=previewicon.png width=[preview_icon.Width()] height=[preview_icon.Height()]></div><br>"
dat += "<a href='byond://?src=\ref[user];preference=flavor_text;task=input'><b>Set Flavor Text</b></a><br>" dat += "<a href='?_src_=prefs;preference=flavor_text;task=input'><b>Set Flavor Text</b></a><br>"
if(lentext(features["flavor_text"]) <= 40) if(lentext(features["flavor_text"]) <= 40)
if(!lentext(features["flavor_text"])) if(!lentext(features["flavor_text"]))
dat += "\[...\]" dat += "\[...\]"
@@ -1379,7 +1379,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
else else
user << "<span class='danger'>Invalid color. Your color is not bright enough.</span>" user << "<span class='danger'>Invalid color. Your color is not bright enough.</span>"
else else
switch(href_list["preference"]) switch(href_list["preference"])
code/modules/mob/living/carbon/human/human.dm
+2 -2
View File
@@ -264,7 +264,7 @@
// Display a warning if the user mocks up // Display a warning if the user mocks up
to_chat(src, "<span class='warning'>You feel your [pocket_side] pocket being fumbled with!</span>") to_chat(src, "<span class='warning'>You feel your [pocket_side] pocket being fumbled with!</span>")
..() ..()
///////HUDs/////// ///////HUDs///////
@@ -1031,4 +1031,4 @@
race = /datum/species/zombie/infectious race = /datum/species/zombie/infectious
/mob/living/carbon/human/species/zombie/krokodil_addict /mob/living/carbon/human/species/zombie/krokodil_addict
race = /datum/species/krokodil_addict race = /datum/species/krokodil_addict