Leshana 3c3dac7102 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19 ...

# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme

2018-01-19 17:52:25 -05:00

..

ashtray.dm

…

bats.dm

Material weapon rework

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

chainsaw.dm

Chainsaw fix and cleanup (#4538)

2018-01-15 01:31:04 -06:00

foam.dm

…

gravemarker.dm

Finishing touches on gravemarkers

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

kitchen.dm

Makes knives all knives.

2018-01-12 18:02:07 -08:00

knives.dm

Fixes Tacknife oversight. Fixes comments regarding knives.

2018-01-18 14:20:55 -08:00

material_armor.dm

Adds wooden buckets, craftable with botany.

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

material_weapons.dm

Adds snowballs. (#4414)

2017-12-07 17:51:36 -06:00

misc.dm

Fixes Tacknife oversight. Fixes comments regarding knives.

2018-01-18 14:20:55 -08:00

shards.dm

Adds Skeletons for background use

2017-10-06 20:40:12 -05:00

swords.dm

item_state cleanup

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

thrown.dm

…

twohanded.dm

Drops the spear damage modifier from 0.75 to 0.5.

2018-01-17 13:41:05 -08:00

whetstone.dm

Adds the whetstone

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