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

..

admin

Merge tgstation r4633 into bs12_with_tgport

2012-09-06 13:13:57 +10:00

assembly

Merge tgstation13 r4570 into bs12_with_tgport

2012-08-28 19:57:11 +10:00

awaymissions

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)

2012-09-04 22:19:03 +10:00

chemical

Scrubbed Mime and Clown references. Fixed invisible mutantrace people. Added Tajaran to mutantrace options.

2012-08-23 16:20:40 +01:00

client

merge with tgstation's r4618, removed some broken bs12 merges (organs, pain)

2012-09-06 13:09:20 +10:00

clothing

Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport (probably broke ZAS again)

2012-09-04 22:23:50 +10:00

critters

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

customitems

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2012-09-04 22:11:21 +10:00

detectivework

Merged rag smothering, increased cyborg slots, command report titles.

2012-09-03 01:30:20 +01:00

DetectiveWork

Merged rag smothering, increased cyborg slots, command report titles.

2012-09-03 01:30:20 +01:00

flufftext

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

food

Scrubbed Mime and Clown references. Fixed invisible mutantrace people. Added Tajaran to mutantrace options.

2012-08-23 16:20:40 +01:00

icon generation

…

library

-Some more html fixing, for communication runes and books.

2012-09-06 01:05:32 +00:00

liquid

- Added the 'splash' and 'kaboom' verbs to 'debug verbs'.

2012-08-30 12:48:28 +00:00

maps

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)

2012-09-04 22:19:03 +10:00

mining

Merge tgstation13 r4570 into bs12_with_tgport

2012-08-28 19:57:11 +10:00

mob

Merge tgstation r4633 into bs12_with_tgport

2012-09-06 13:13:57 +10:00

paperwork

Merge tgstation13 r4570 into bs12_with_tgport

2012-08-28 19:57:11 +10:00

power

Merge tgstation r4633 into bs12_with_tgport

2012-09-06 13:13:57 +10:00

projectiles

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)

2012-09-04 22:19:03 +10:00

reagents

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)

2012-09-04 22:19:03 +10:00

recycling

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)

2012-09-04 22:19:03 +10:00

research

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)

2012-09-04 22:19:03 +10:00

scripting

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

security levels

…