xxalpha f9ebb2cff7 Merge remote-tracking branch 'upstream/master' into traymesons ...

Conflicts:
	code/modules/research/designs.dm
	icons/mob/eyes.dmi
	icons/obj/clothing/glasses.dmi

2015-02-27 21:15:01 +00:00

..

effects

Merge pull request #7562 from Iamgoofball/drugs

2015-02-25 08:26:21 +03:00

items

Merge remote-tracking branch 'upstream/master' into traymesons

2015-02-27 21:15:01 +00:00

structures

Merge remote-tracking branch 'upstream/master' into traymesons

2015-02-27 21:15:01 +00: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

…