Pete Goodfellow 0345f66d37 Merge branch 'master' of github.com:tgstation/-tg-station into assemblyfun ...

Conflicts:
	code/game/objects/items/weapons/grenades/chem_grenade.dm
	html/changelog.html

2013-05-28 17:34:01 +01:00

..

effects

Fixes #609 - decal/point is now unclickable.

2013-05-21 08:41:50 +01:00

items

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

2013-05-28 17:34:01 +01:00

structures

Merge pull request #645 from Tenebrosity/miscissuefixes

2013-05-27 12:08:53 -07: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_recursive.dm

- Replaced MAX_EXPLOSION_RANGE with MAX_EX_DEVASTATION_RANGE _HEAVY_ _LIGHT_ and _FLASH_.

2013-01-24 17:38:20 +00:00

explosion.dm

- Replaced MAX_EXPLOSION_RANGE with MAX_EX_DEVASTATION_RANGE _HEAVY_ _LIGHT_ and _FLASH_.

2013-01-24 17:38:20 +00:00

items.dm

update_icons.dm changes for humans. This ties in with the dna changes and the changes to skin_tone and hair colours

2013-05-10 18:41:08 +01:00

objs.dm

Moved the defines of damtype from /obj/items and /obj/mecha to only /obj.

2013-01-03 10:24:36 +00:00

structures.dm

More file structure stuff.

2012-08-26 01:20:02 +00:00

weapons.dm

Another whack at the defines folder:

2013-01-01 01:25:02 +00:00