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

Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm

2013-06-12 23:11:28 +04:00

..

closets

…

effects

Merge conflict resolution, using BEF.

2013-06-05 14:22:04 +09:30

items

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

2013-06-12 11:41:08 -07:00

random

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

2013-06-11 00:52:32 -04: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 newstuff

2013-06-12 23:11:28 +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

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

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

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