Ccomp5950 98fba3b6b0 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev ...

Conflicts:
	code/modules/mining/machine_processing.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/virus2/helpers.dm

2014-03-18 19:44:19 -05:00

..

closets

Merge pull request #4539 from yashaldie/master

2014-03-09 01:39:30 -06:00

effects

Merge pull request #4483 from Loganbacca/chemsmoke

2014-02-27 03:42:51 -06:00

items

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev

2014-03-18 19:44:19 -05:00

random

- removing yellow and black gloves from the randomized tech storage object

2013-06-11 00:52:32 -04:00

storage

Fixes #3118

2013-06-21 15:07:31 -07:00

structures

Readded welder backpack.

2014-03-11 02:06:30 +04:00

empulse.dm

Made the effects of EMP pulses get garbage collected. Less lag on the singularity (around 20 effect del per 5~10 seconds)

2013-06-04 13:47:26 +04:00

explosion_recursive.dm

Explosion Optimizations

2014-01-08 19:21:47 +00:00

explosion.dm

Mass correction of controler to controller.

2014-01-25 03:15:13 +10:30

items.dm

Removes an unnecessary check

2014-03-08 23:15:53 -05:00

objs.dm

Airlock and APC changes.

2013-05-23 16:43:29 +02:00

structures.dm

…

weapons.dm

…