Repede d4bb48b2f6 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self ...

# Resolved Conflicts:
#	code/game/machinery/cloning.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm

2018-06-29 09:58:53 -04:00

..

generic.dm

Typo

2018-06-02 18:32:42 +02:00

language.dm

Fixes Runtime in logging.dm,61

2018-03-29 21:05:53 -04:00

monkey.dm

…

outsider.dm

Box of Things for Events and the Future MK1 (#5281)

2018-05-25 16:26:31 -07:00

station_vr.dm

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

2018-06-29 09:58:53 -04:00

station.dm

Adds Tajaran Akhani language. (#5032)

2018-03-11 16:55:08 -05:00

synthetic.dm

…