Commit Graph

11 Commits

Author SHA1 Message Date
Tastyfish
9e5925b1f9 fixed custom items loaded and custom_items.txt 2012-01-12 01:54:27 -05:00
Tastyfish
b5c8b89a4d Merge remote-tracking branch 'upstream/master'
Conflicts:
	code/WorkInProgress/Mini/customitems.dm
2012-01-12 01:48:33 -05:00
Tastyfish
e5abd35dae made custom items read from a config file 2012-01-12 01:47:55 -05:00
SkyMarshal
80761ed2e5 Added pink labcoat. 2012-01-11 22:21:26 -07:00
Albert Iordache
9d2e285190 Fixed a bug with obj/item/clothing/under/chameleon/psyche , added some small details to Antiqua and redid the arrivals arm, and removed the patient ward area. (can still be recovered via TortoiseGit, by reverting to an earlier version; I'll explain in the Antiqua topic why I removed it) 2012-01-08 19:19:53 +02:00
SkyMarshal
9a651a5a84 Added psyche jumpsuit for Asanadas
Expanded scrambled radio stuff.
2012-01-03 00:06:25 -07:00
SkyMarshal
411ccc4075 Shitload of stuff. 2012-01-02 21:48:42 -07:00
SkyMarshal
08ff9b06e7 Fixed several things. 2011-12-27 13:44:52 -07:00
SkyMarshal
607db09620 Lotsa stuff. Map update. 2011-12-26 17:59:09 -07:00
Albert Iordache
10842e2ede Custom items are now placed on the ground, if all else fails. 2011-12-24 20:59:50 +02:00
Miniature
319981a37d Trust me to forget a file. 2011-12-24 03:35:58 +10:30