Kelshark ab85a2c376 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	code/modules/resleeving/infocore_records.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/widerobot_vr.dmi
#	vorestation.dme

2017-06-18 15:35:35 -04: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

fixes

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

More and more Destroy() cleanups all across the board - Return qdel hints.

2017-06-10 22:41:51 -04:00

material_weapons.dm

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

2017-06-10 22:41:51 -04: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