Merge github.com:Baystation12/Baystation12

Conflicts:
	html/changelog.html
This commit is contained in:
cib
2012-05-19 19:42:30 +02:00
153 changed files with 15174 additions and 13698 deletions
+1 -1
View File
@@ -99,7 +99,7 @@ datum/preferences
b_eyes = 0
//UI style
UI = UI_OLD
UI = UI_NEW
//Mob preview
icon/preview_icon = null
@@ -173,7 +173,7 @@
hogan
name = "Hulk Hogan Mustache"
icon_state = "facial_chaplin"
icon_state = "facial_hogan" //-Neek
vandyke
name = "Van Dyke Mustache"