Chinsky 7f62dfc5b1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	code/_onclick/hud/alien.dm
	code/_onclick/hud/alien_larva.dm
	code/_onclick/hud/human.dm
	code/_onclick/hud/monkey.dm
	code/_onclick/hud/robot.dm
	code/setup.dm

2013-10-10 14:30:34 +04:00

..

closets

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

effects

Merge branch 'master' into dev

2013-10-08 15:16:57 +04:00

items

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

2013-10-10 14:30: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

Merge pull request #3727 from fauxki/dev

2013-10-08 21:23:42 -07: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

- 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

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

items.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

objs.dm

Airlock and APC changes.

2013-05-23 16:43:29 +02: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