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

# Conflicts:
#	code/global.dm
#	config/custom_items.txt
#	icons/mob/human_races/r_xenochimera.dmi
#	vorestation.dme

2017-03-03 19:17:04 -05:00

..

arms_vr.dm

Lots of changes and Fluff fixes

2017-01-26 11:48:22 -03:00

arms.dm

Added 357 stun to auto lathe and nudity permit coverage fix

2016-12-21 17:16:17 +01:00

autolathe.dm

Rehauls some autolathe code

2016-07-24 22:02:58 +01:00

devices.dm

Rehauls some autolathe code

2016-07-24 22:02:58 +01:00

engineering.dm

Enhances the Paper Shredder

2017-02-21 19:21:32 -05:00

general.dm

Rehauls some autolathe code

2016-07-24 22:02:58 +01:00

medical.dm

Make implanters able to be created

2017-02-28 16:25:55 -05:00

tools.dm

Rehauls some autolathe code

2016-07-24 22:02:58 +01:00