cib fb60301594 Revert "Revert's cib's BS12 merge by XSI's orders" ...

This reverts commit a6e7c085ef.

Conflicts:

	baystation12.dme
	code/datums/organs/organ_external.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/hud.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/mob_defines.dm
	code/setup.dm
	icons/mob/dam_human.dmi
	icons/mob/human.dmi

2012-10-11 14:31:31 -07:00

..

admin

tweaks to game start / admins, fixe for adjacent reaching not working

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

chemical

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

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

client

fix for admins not being applied successfully on round startup, added some resource caching i forgot about before

2012-10-09 23:54:31 +10:00

clothing

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

2012-10-09 23:07:41 +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' 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

Revert "Revert's cib's BS12 merge by XSI's orders"

2012-10-11 14:31:31 -07:00

paperwork

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

2012-10-05 22:21:26 +10:00

power

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

2012-10-05 22:21:26 +10:00

projectiles

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

2012-10-05 22:21:26 +10:00

reagents

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

2012-10-09 23:07:41 +10:00

recycling

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

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

…