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

# Conflicts:
#	code/game/objects/items/weapons/tools.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt
#	vorestation.dme

2017-10-17 08:49:37 -04:00

..

devices

Pol Sync

2017-10-08 17:44:25 -04:00

robot

HOTFIX

2017-09-21 20:26:48 -04:00

stacks

Pol Sync

2017-10-08 17:44:25 -04:00

weapons

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

2017-10-17 08:49:37 -04:00

apc_frame.dm

…

blueprints.dm

…

bodybag.dm

Some more types which need Destroy to return qdel hints!

2017-06-14 01:13:54 -04:00

contraband_vr.dm

LOTS OF FIXES

2017-10-08 18:05:27 -04:00

contraband.dm

…

crayons.dm

…

glassjar.dm

…

latexballoon.dm

…

paintkit.dm

…

shooting_range.dm

…

toys.dm

Katana was defined twice

2017-09-30 17:35:11 -04:00

trash.dm

…