Anewbe 53b1b6dbc1 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into weapon_dulling ...

# Conflicts:
#	icons/obj/weapons.dmi

2017-03-28 22:57:00 -05:00

..

ashtray.dm

Reverts the second mob clean up because of incomplete implementation.

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

bats.dm

Material weapon rework

2017-02-24 18:51:44 -06:00

foam.dm

Foam axes don't shatter windows

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

kitchen.dm

Material weapon rework

2017-02-24 18:51:44 -06:00

knives.dm

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

2017-03-28 22:57:00 -05:00

material_weapons.dm

Adds the whetstone

2017-03-20 23:32:52 -05:00

misc.dm

Material weapon rework

2017-02-24 18:51:44 -06:00

shards.dm

Fixes a thing.

2017-03-27 22:32:02 -05:00

swords.dm

item_state cleanup

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

thrown.dm

…

twohanded.dm

Material weapon rework

2017-02-24 18:51:44 -06:00

twohanded.dm.orig

Merge with dev.

2015-05-20 13:39:31 +09:30

whetstone.dm

Adds the whetstone

2017-03-20 23:32:52 -05:00