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

# Conflicts:
#	code/game/machinery/vending.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	icons/obj/mining.dmi

2018-02-24 22:51:59 -05:00

..

ashtray.dm

…

bats.dm

…

chainsaw.dm

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -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

Machetes now fit on belts (#4725)

2018-02-05 22:29:37 -06: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

THE MINI FIST-PUNCH UPDATE (#4804)

2018-02-12 23:17:35 -08:00

shards.dm

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06:00

swords.dm

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06:00

thrown.dm

…

twohanded.dm

Gun changes (#4185)

2018-02-12 23:12:14 -08:00

whetstone.dm

…