Merge branch 'pr/4'

Conflicts:
	.gitignore
This commit is contained in:
ZomgPonies
2013-08-24 17:25:58 -04:00
25 changed files with 332 additions and 189 deletions
+2 -2
View File
@@ -584,7 +584,7 @@
icon_state = "bookSpaceLaw"
author = "Nanotrasen"
title = "Space Law"
/*dat = {"
dat = {"
<html><head>
</head>
@@ -594,7 +594,7 @@
</html>
"}*/
"}
/obj/item/weapon/book/manual/engineering_guide
name = "Engineering Textbook"