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

Conflicts:
	icons/mob/inhands/guns_lefthand.dmi
	icons/mob/inhands/guns_righthand.dmi
	icons/obj/guns/energy.dmi

2015-02-25 11:44:27 +08:00

..

effects

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

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

items

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

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

structures

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

2015-02-25 11:44:27 +08: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

…

structures.dm

…

weapons.dm

…