cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bleeding-edge-freeze

Browse Source 
Conflicts:
	html/changelog.html

Signed-off-by: Mloc <colmohici@gmail.com>
This commit is contained in:
Mloc
2013-05-16 12:21:55 +01:00
parent 566454b4c2 db292f44b2
commit 5faabba7fb
21 changed files with 78 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/new_player/preferences_setup.dm
+1 -1
View File
@@ -559,7 +559,7 @@ datum/preferences
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
if(disabilities & NEARSIGHTED)
clothes_s.Blend(new /icon('icons/mob/eyes.dmi', "glasses"), ICON_OVERLAY)
preview_icon.Blend(new /icon('icons/mob/eyes.dmi', "glasses"), ICON_OVERLAY)
preview_icon.Blend(eyes_s, ICON_OVERLAY)
if(clothes_s)