Cheridan 957f987b5d Merge branch 'master' of https://github.com/tgstation/-tg-station into dragnet ...

Conflicts:
	icons/effects/effects.dmi
	icons/obj/items.dmi

2015-06-22 22:57:53 -05:00

..

effects

fixed the changelog FOR REAL THIS TIME, also fixed bad coding

2015-06-22 21:30:50 -05:00

items

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

2015-06-22 22:57:53 -05:00

structures

Merge pull request #9792 from GunHog/AI_STOLE_MY_BIKE

2015-06-21 00:30:03 +01:00

buckling.dm

Prevents an AI from being buckled.

2015-05-05 17:03:53 +02:00

empulse.dm

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

explosion.dm

Explosions no longer throw anchored items.

2015-06-14 00:46:54 +02:00

items.dm

Pray pray pray

2015-06-18 18:07:57 +01:00

objs.dm

Going through some hOOPs - bit of a overhaul.

2015-06-18 17:40:35 +02:00

structures.dm

Pressure_resistance Tweaks

2015-06-03 23:22:25 -05:00

weapons.dm

Attack sounds for all melee weapons

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