Mloc 5faabba7fb Merge branch 'master' into bleeding-edge-freeze ...

Conflicts:
	html/changelog.html

Signed-off-by: Mloc <colmohici@gmail.com>

2013-05-16 12:21:55 +01:00

..

closets

Cleaned up walllocker code.

2012-10-31 02:00:39 +04:00

effects

Fixes lighting, backpacks getting contaminated, and bombs not working.

2013-04-18 09:58:37 -07:00

items

Merged master into BEF.

2013-05-06 15:43:50 +01:00

storage

Ported coats pockets

2013-01-04 05:31:14 +04:00

structures

Merge branch 'master' into bleeding-edge-freeze

2013-05-16 12:21:55 +01:00

empulse.dm

some tweaks to artifacts, new xenoarch analysis machines, made empulse give a cool whoosh to everyone in range

2012-12-27 01:35:13 +10: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

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00

objs.dm

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

2013-01-11 22:12:31 +10: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