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

# Conflicts:
#	code/game/jobs/job/science.dm
#	code/modules/mob/living/carbon/human/species/station/human_subspecies.dm
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt

2017-10-29 18:14:56 -04:00

..

ashtray.dm

…

bats.dm

Material weapon rework

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

foam.dm

fixes

2017-01-04 19:57:57 +01: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-10 22:41:51 -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

Adds Skeletons for background use

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

swords.dm

…

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

whetstone.dm

Adds the whetstone

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