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

# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	config/custom_items.txt

2018-02-21 22:19:24 -05:00

..

generic.dm

Changes Tradeband syllables. (#3879)

2017-09-20 12:57:11 -05:00

language.dm

…

monkey.dm

…

outsider.dm

Brings back the aliens as they were when removed, minus huggers (until we can get a suitable replacement), for admins to use.

2017-09-03 01:46:08 -07:00

station_vr.dm

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

2018-02-21 22:19:24 -05:00

station.dm

strips special characters from Skrellian

2017-10-01 19:12:44 -07:00

synthetic.dm

…