Arokha Sieyes 055c998f82 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync ...

# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml

2017-04-25 15:04:54 -04: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

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

Finished coding makeshift armor.

2017-04-18 03:16:10 -04:00

material_weapons.dm

Tweaks the message given when a weapon dulls

2017-04-12 16:22:17 -05:00

misc.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

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

whetstone.dm

Adds the whetstone

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