comma ae2a9c56ad Merge branch 'master' into bleeding-edge-freeze ...

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm

2013-07-09 12:48:34 +04:00

..

closets

…

effects

Whoa, 2 barsign.dm's? WTF?

2013-07-08 23:25:13 +04:00

items

Merge branch 'master' into bleeding-edge-freeze

2013-07-09 12:48:34 +04: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

Whoa, 2 barsign.dm's? WTF?

2013-07-08 23:25:13 +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.dm

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

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

items.dm

Showed that huge proc in /atom what polymorphism' is.

2013-06-01 12:24:43 +04:00

objs.dm

Airlock and APC changes.

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

structures.dm

…

weapons.dm

…