SinTwo 4bff201f8b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state ...

Conflicts:
	code/game/objects/items/devices/telecrystal.dm
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi

2016-07-22 23:39:19 -04:00

..

ashtray.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

bats.dm

item_state cleanup

2016-07-11 22:31:32 -04:00

foam.dm

Foam axes don't shatter windows

2016-07-09 00:37:36 -05:00

kitchen.dm

item_state cleanup

2016-07-11 22:31:32 -04:00

knives.dm

item_state cleanup

2016-07-11 22:31:32 -04:00

material_weapons.dm

item_state cleanup

2016-07-11 22:31:32 -04:00

misc.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state

2016-07-22 23:39:19 -04:00

shards.dm

Ports Bay's Robolimb Changes (#1779)

2016-05-28 14:12:19 +01:00

swords.dm

item_state cleanup

2016-07-11 22:31:32 -04:00

thrown.dm

…

twohanded.dm

Adds a pry var to objects, which checks if the obj can open doors

2016-07-09 00:24:12 -05:00

twohanded.dm.orig

…