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

Conflicts:
	code/controllers/configuration.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/factions.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/verbs/ooc.dm
	code/game/verbs/who.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/login.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/paperwork/paper.dm
	config/config.txt
	html/changelog.html
	icons/mob/human.dmi
	icons/mob/human_face.dmi

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

2012-09-26 18:49:18 +10:00

..

admin

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

2012-09-26 18:49:18 +10:00

assembly

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

2012-09-26 18:49:18 +10:00

awaymissions

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

2012-09-22 21:29:04 +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 remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-09-26 18:49:18 +10:00

clothing

various mergefixes

2012-09-22 21:37:42 +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 pull request #1720 from SparklySheep/patch-4

2012-09-24 07:16:35 -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' into bs12_with_tgport

2012-09-22 21:29:04 +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 tgstation13 r4570 into bs12_with_tgport

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

mob

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

2012-09-26 18:49:18 +10:00

paperwork

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

2012-09-26 18:49:18 +10:00

power

Compile fixes.

2012-09-23 21:54:36 +01:00

projectiles

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

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

reagents

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

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

recycling

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

2012-09-26 18:49:18 +10:00

research

anomaly lab is finished (with a slight remap). some minor remaining todos (sprites), TODO: ?

2012-09-23 23:54: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

…