Erthilo 5a75e606a6 Merge branch 'bs12_with_tgport' of git://github.com/caelaislinn/Baystation12 into TGUpdates ...

Conflicts:
	baystation12.dme

2012-08-24 16:35:18 +01:00

..

implants

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

2012-08-24 21:55:58 +10:00

AI_modules.dm

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

cameras.dm

…

cards_ids.dm

…

cigs_lighters.dm

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

2012-08-24 16:35:18 +01:00

clown_items.dm

…

dna_injector.dm

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

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

explosives.dm

…

flamethrower.dm

…

game_kit.dm

…

hydroponics.dm

…

kitchen.dm

…

manuals.dm

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

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

medical.dm

…

mop.dm

…

mousetraps.dm

Another small chunk of reorganizing objects.

2012-08-22 21:55:46 +00:00

paint.dm

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

paiwire.dm

…

plant_bag.dm

…

RCD.dm

…

RSF.dm

…

spray.dm

…

stunbaton.dm

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

stungloves.dm

…

surgery_limbattachment.dm

…

surgery_tools.dm

…

swords_axes_etc.dm

Another small chunk of reorganizing objects.

2012-08-22 21:55:46 +00:00

syndie.dm

…

table_rack_parts.dm

…

teleportation.dm

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

2012-08-22 04:21:53 +10:00

tiles_wires.dm

…

tools.dm

…

twohanded.dm

…

wrappingpaper.dm

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