Chinsky e74cd95fec Merge branch 'master' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/game/turfs/turf.dm
	code/modules/clothing/spacesuits/rig.dm

2013-02-02 23:10:12 +04:00

..

closets

Cleaned up walllocker code.

2012-10-31 02:00:39 +04:00

effects

Can order contraband crates.

2013-01-28 18:07:34 +04:00

items

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2013-02-02 23:10:12 +04:00

storage

Ported coats pockets

2013-01-04 05:31:14 +04:00

structures

Fixed issue with magical wooden table disassembling.

2013-01-30 01:31:06 +04:00

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

explosion_recursive.dm

- Recursive explosions are not available in a config option. I want to do some live testing. Once live testing is done, if they prove to be better, they can go live. Once that happens, the config option can be removed.

2013-01-15 08:19:35 +00:00

explosion.dm

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

items.dm

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2013-01-23 00:48:07 +10:00

objs.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

structures.dm

More file structure stuff.

2012-08-26 01:20:02 +00:00

weapons.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00