Leshana 6eee55c983 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync ...

# Conflicts:
#	code/modules/client/preference_setup/general/03_body.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	html/changelogs/.all_changelog.yml
#	icons/mob/human_races/markings.dmi
#	vorestation.dme

2017-04-01 19:19:42 -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

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

knives.dm

Adds Boxcutters

2017-03-23 15:27:48 -05:00

material_weapons.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

misc.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04: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

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00