Merge branch 'master' into dev

Conflicts:
	baystation12.dme
	html/changelog.html
This commit is contained in:
Mloc
2013-09-26 10:26:03 +01:00
69 changed files with 9513 additions and 9483 deletions
+1 -1
View File
@@ -2186,7 +2186,7 @@
for(var/obj/item/clothing/under/W in world)
W.icon_state = "schoolgirl"
W.item_state = "w_suit"
W.color = "schoolgirl"
W.item_color = "schoolgirl"
message_admins("[key_name_admin(usr)] activated Japanese Animes mode")
world << sound('sound/AI/animes.ogg')
if("eagles")//SCRAW