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

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/datums/supplypacks/contraband.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/reagents/reagent_containers/food/snacks.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme

2018-01-24 19:52:12 -05:00

..

ashtray.dm

…

bats.dm

…

chainsaw.dm

Tweaks chainsaws. Again.

2018-01-19 21:11:48 -08: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

…

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

…