bgobandit a2241e0f6f Merge branch 'master' of https://github.com/tgstation/-tg-station into lizcannotwag ...

Conflicts:
	code/modules/client/preferences.dm
	icons/mob/head.dmi
	tgstation.dme

2015-12-17 20:12:32 -05:00

..

effects

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

items

Merge branch 'master' of https://github.com/tgstation/-tg-station into lizcannotwag

2015-12-17 20:12:32 -05:00

structures

Line ending apocalypse

2015-12-17 14:12:37 +13:00

buckling.dm

Fixes

2015-12-14 16:40:00 -06:00

empulse.dm

Pooling is good for the soul.

2015-11-17 11:27:26 -05:00

explosion.dm

Fixes doppler arrays

2015-12-09 20:06:14 +01:00

items.dm

Merge pull request #13585 from KorPhaeron/reactive_expansion

2015-12-17 17:05:53 -06:00

objs.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

radiation.dm

Removes rad pulse admin notice

2015-12-10 04:26:56 -06:00

structures.dm

The blob eats nondense things in all cases.

2015-11-20 21:03:43 -05:00

weapons.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00