Cael_Aislinn dc3f6f2239 Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport (probably broke ZAS again) ...

Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/defines/obj/weapon.dm

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

2012-09-04 22:23:50 +10:00

..

clothing

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

closet.dm

-Metroids will now feed when 'content' (But not as quickly), meaning they will evolve and reproduce properly

2012-08-17 04:22:53 +00:00

costume.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

decal.dm

New lighting, it's essentially just the old DAL system with a queue.

2012-08-25 16:06:57 +00:00

door.dm

Cleaning up files and UltraLight, added some BS12 files, and fixes sprite issues.

2012-08-24 16:20:50 +01:00

hydro.dm

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

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

machinery.dm

New item "camera assembly" that is dispensed from the autolathe. (700 Metal/300 Glass), deleted old grenade camera assembly.

2012-09-02 23:20:40 +00:00

storage.dm

Merged money, ATMs, bible changes, nullrod changes, policetape.

2012-09-03 01:29:53 +01:00

supplypacks.dm

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

2012-09-04 22:19:03 +10:00

toy.dm

Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.

2012-08-18 16:33:40 +00:00

vending.dm

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

2012-09-04 22:19:03 +10:00

weapon.dm

Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport (probably broke ZAS again)

2012-09-04 22:23:50 +10:00

window.dm

-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

2012-07-23 00:48:51 +00:00