comma e45f429e4c Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
	maps/tgstation.2.1.0.0.1.dmm

2013-08-04 01:40:32 +04:00

..

closets

…

effects

Revert #3316 from BEF due to compile errors and (assumed) missing files.

2013-07-20 18:38:00 +01:00

items

And once again, did that the wrong way around. Whoops.

2013-07-20 18:41:50 +01: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 branch 'dev-freeze' of https://github.com/Baystation12/Baystation12

2013-08-04 01:40:32 +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

- 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

Should make unusable limbs treated as such.

2013-06-09 16:51:07 +04: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