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

Conflicts:
	icons/mob/head.dmi

2015-03-02 13:45:15 +01:00

..

effects

conflict fixing + changelog

2015-02-26 16:48:11 -05:00

items

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

2015-03-02 13:45:15 +01:00

structures

Merge pull request #8055 from xxalpha/xxmas

2015-03-01 20:04:52 -06:00

buckling.dm

Makes slimes unbucklable again.

2015-02-21 15:20:34 +01:00

empulse.dm

…

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

…