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

Browse Source

Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/human/inventory.dm

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

...

This commit is contained in:

Cael_Aislinn

2012-10-30 23:51:03 +10:00

parent 698425a987 10034cdac4

commit 6bda733e37

6 changed files with 2 additions and 1084 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

code/WorkInProgress/Cael_Aislinn/BirdMan/birdman.dmi

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.1 KiB