Cael_Aislinn dd538fd3c5 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport ...

Conflicts:
	code/game/gamemodes/events.dm
	code/game/gamemodes/wizard/veilrender.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/life.dm
	code/setup.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2012-10-22 20:15:05 +10:00

..

admin

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

2012-10-22 20:15:05 +10:00

assembly

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

2012-10-22 19:35:03 +10:00

awaymissions

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

2012-10-22 20:15:05 +10:00

chemical

Added attack logging, some moderator groundwork, fixed alien species and save files.

2012-09-23 21:49:25 +01:00

client

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

2012-10-21 01:25:04 +10:00

clothing

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

2012-10-21 01:25:04 +10:00

critters

various mergefixes

2012-10-09 22:49:38 +10:00

customitems

Merge pull request #1718 from ThatOneGuy42/master

2012-09-28 11:55:55 -07: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

Merge remote-tracking branch 'remotes/git-svn' r4881 into bs12_with_tgport

2012-10-15 23:17:18 +10:00

icon generation

…

library

Bookcases and filing cabinets can now be prestocked from the map, by placing books and papers on top of them. Updated the example away mission- it's now a complete mission, and should demonstrate everything that's necessary in an away mission. It has a few power issues, but hopefully someone can fix those for me~

2012-09-09 15:28:05 +00:00

liquid

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

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

maps

Revert "Random not much finished bullshit work on mapdata."

2012-09-06 15:51:23 -07:00

mining

Merge remote-tracking branch 'remotes/git-svn' r4881 into bs12_with_tgport

2012-10-15 23:17:18 +10:00

mob

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

2012-10-22 20:15:05 +10:00

paperwork

Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport

2012-10-21 00:25:05 +10:00

power

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

2012-10-21 01:25:04 +10:00

projectiles

Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport

2012-10-21 00:25:05 +10:00

reagents

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

2012-10-22 20:15:05 +10:00

recycling

Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport

2012-10-21 00:25:05 +10:00

research

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

2012-10-05 22:21:26 +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

…