Anewbe dffb3a6fef Merge branch 'master' of https://github.com/PolarisSS13/Polaris into scythe ...

# Conflicts:
#	icons/obj/weapons.dmi

2017-09-28 16:07:45 -05:00

..

ashtray.dm

…

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

gravemarker.dm

Finishing touches on gravemarkers

2017-09-27 18:59:26 -05:00

kitchen.dm

Fixes improperly formatted tech_origins for hatchet, scythe, reinforced glass, mechanical trap, kitchen utensils and kitchen knife.

2017-04-17 19:31:01 +01:00

knives.dm

Fixes improperly formatted tech_origins for hatchet, scythe, reinforced glass, mechanical trap, kitchen utensils and kitchen knife.

2017-04-17 19:31:01 +01:00

material_armor.dm

Adds wooden buckets, craftable with botany.

2017-09-09 17:16:34 -04:00

material_weapons.dm

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

2017-06-05 22:10:06 -04:00

misc.dm

Makes the scythe a child of fireaxes, adds it to the weed control crate

2017-09-26 22:15:33 -05: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

Makes the scythe a child of fireaxes, adds it to the weed control crate

2017-09-26 22:15:33 -05:00

twohanded.dm.orig

…

whetstone.dm

Adds the whetstone

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