4 Commits

Author	SHA1	Message	Date
Cael_Aislinn	56f5cb9e4e	Merge tgstation r4633 into bs12_with_tgport ... Conflicts: code/defines/obj/costume.dm code/game/gamemodes/cult/runes.dm code/game/machinery/computer/communications.dm code/game/machinery/telecomms/broadcaster.dm code/game/objects/structures/crates_lockers/closets/fitness.dm code/modules/mob/living/simple_animal/life.dm code/modules/mob/living/simple_animal/parrot.dm code/modules/power/power.dm code/modules/power/switch.dm Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>	2012-09-06 13:13:57 +10:00
johnsonmt88@gmail.com	d91ea514d9	More file structuring. ... closet.dm, costume.dm, decal.dm and window.dm have been knocked out of the define folder and their defines have been moved into appropriate files. The closet folder has been re-organized a little. supplypacks.dm has been moved into the datums folder since that's what it is. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4627 316c924e-a436-60f5-8080-3fe189b3f50e	2012-09-05 22:44:48 +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	9e30e7d2ec	Moving stuff around part 2! ... Committing this early to allow pete to commit something involving the .dme file which would probably conflict otherwise. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4514 316c924e-a436-60f5-8080-3fe189b3f50e	2012-08-22 16:32:45 +00:00