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

# Conflicts:
#	code/game/objects/items/weapons/tools.dm
#	code/modules/mob/dead/observer/say.dm
#	config/custom_items.txt
#	vorestation.dme

2017-04-13 19:43:56 -04:00

..

asteroid.dm

Added vore capabilies to the new simple_animal system.

2017-03-22 19:32:19 -04:00

controller.dm

Added vore capabilies to the new simple_animal system.

2017-03-22 19:32:19 -04:00

debug.dm

…

landmarks.dm

Nearing playtest time

2017-02-13 20:24:54 -05:00

wrappers.dm

Console percentage and sizing fixed but not button

2017-02-14 01:02:07 -05:00

zone_console.dm

humvee sprite bug edit, fixed z, added rewards to mining reward, changed voting sound

2017-02-19 12:10:27 -05:00

zonemaster.dm

Rogueminer Improvements

2017-04-04 15:20:45 -04:00