1053 Commits

Author	SHA1	Message	Date
johnsonmt88@gmail.com	179ed4c4b9	Removed a pair of empty and unused .dmis ... Moved the extinguisher_closet .dm file out of the locker folder and into the structures folder. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4581 316c924e-a436-60f5-8080-3fe189b3f50e	2012-08-29 16:26:23 +00:00
Cael_Aislinn	4c500f8b1c	Merge remote-tracking branch 'remotes/git-svn' (r4527) into bs12_with_tgport ... Conflicts: baystation12.dme code/game/gamemodes/cult/runes.dm code/game/gamemodes/events.dm code/game/machinery/telecomms/broadcaster.dm code/game/machinery/telecomms/machine_interactions.dm code/game/objects/devices/uplinks.dm code/game/objects/weapons.dm code/modules/mining/mine_items.dm html/changelog.html icons/obj/chemical.dmi maps/tgstation.2.0.9.dmm Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>	2012-08-24 21:55:58 +10:00
johnsonmt88@gmail.com	1a8fb7c09e	Another small chunk of reorganizing objects. ... I've cleared out most of the .dm files in code/game/objects/ and put it into appropriate files/folders. The stuff I've left is stuff I believe may conflict with carn's work and some code for stuff that does not have a home yet. TODO: - Files that were left in code/game/objects that may conflict with carns work - Go through all the files in all the subfolders of code/game/objects. - Move all the defines from /defines/ to their proper spots Not much right? git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4520 316c924e-a436-60f5-8080-3fe189b3f50e	2012-08-22 21:55:46 +00:00