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

# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm

2018-06-23 17:53:13 -04:00

..

bot

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

carbon

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

2018-06-23 17:53:13 -04:00

silicon

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

2018-06-23 17:53:13 -04:00

simple_animal

Couple VS edit fixes.

2018-06-15 10:24:39 +03:00

voice

…

autohiss.dm

…

damage_procs.dm

…

death.dm

…

default_language.dm

…

inventory.dm

…

life.dm

…

living_defense.dm

…

living_defines_vr.dm

…

living_defines.dm

…

living_powers.dm

…

living.dm

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

login.dm

…

logout.dm

…

say.dm

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00