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

Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
	code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm

2015-03-08 14:26:52 -07:00

..

effects

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

2015-03-08 14:26:52 -07:00

items

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

2015-03-08 14:26:52 -07:00

structures

Merge pull request #8102 from Mandurrrh/tableclimbnerf

2015-03-07 21:39:37 +00:00

buckling.dm

On screen alert system

2015-03-01 17:31:26 -08: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-03-13 00:08:20 -03:00

explosion.dm

Moved item throwing code to after the explosion effect on turfs, meaning shards and such can get thrown.

2015-02-19 18:24:11 +00:00

items.dm

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

2015-02-24 22:16:53 +00:00

objs.dm

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

2015-01-04 01:52:14 +00:00

structures.dm

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

2014-12-05 22:02:01 +01:00

weapons.dm

Attack sounds for all melee weapons

2014-01-28 22:46:41 +13:00