Chinsky 6d830af37c Merge branch 'master' into surgery ...

Conflicts:
	code/WorkInProgress/surgery.dm
	code/modules/mob/living/carbon/carbon_defines.dm

2013-01-15 13:42:13 +04:00

..

closets

…

effects

remove some unused files, tick barsigns.dm and removed duplicate definition

2013-01-14 21:23:47 +10:00

items

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

2013-01-14 22:14:46 +10:00

storage

Ported coats pockets

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

structures

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

2013-01-14 22:14:46 +10:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

Update code/game/objects/explosion.dm

2012-12-22 14:58:01 -08:00

items.dm

Merge branch 'master' into surgery

2013-01-15 13:42:13 +04: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

…

weapons.dm

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

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