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

..

admin

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

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

alarm

…

assembly

Fixes #5083

2018-05-27 21:40:45 -04:00

awaymissions

Map changes for explorers

2018-05-09 11:36:26 -05:00

blob

…

blob2

…

busy_space

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

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

busy_space_vr

…

client

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

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

clothing

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

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

customitems

…

detectivework

…

DMAPI

…

economy

Fix various syntactic problems

2018-05-16 21:43:18 -07:00

entopics_vr

…

error_handler

…

events

Fix merge conflict, update virgo planet things

2018-06-16 10:43:45 -04:00

examine

…

ext_scripts

…

flufftext

…

food

…

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

…

holomap

VS: The VS excludes for SSAO

2018-05-14 11:54:10 -04:00

hydroponics

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

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

icon generation

…

integrated_electronics

Recharger refactor

2018-06-16 17:15:59 -04:00

interserver shipping

…

library

…

lighting

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

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

lore_codex

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

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

maps

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

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

materials

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

2018-05-27 19:26:12 -04:00

media

…

metric

…

mining

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

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

mob

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

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

multiz

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

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

nano

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

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

nifsoft

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

2018-06-02 18:33:44 -04:00

organs

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

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

overmap

…

paperwork

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

2018-06-02 18:33:44 -04:00

persistence

…

Phorochemistry

blueshield, more clothes/vests, more weapons, phorochem fixes,

2018-06-11 21:27:11 -04:00

planet

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

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

power

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

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

projectiles

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

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

random_map

…

reagents

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

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

recycling

Merge pull request #5304 from VOREStation/vplk-reverse-all_atoms

2018-05-28 15:55:55 -04:00

research

More Phase Guns

2018-06-17 13:35:54 -04:00

resleeving

Fix resleeving UI, make compatible

2018-06-16 14:39:55 -04:00

rogueminer_vr

…

scripting

…

security levels

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

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

shieldgen

Recharger refactor

2018-06-16 17:15:59 -04:00

shuttles

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

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

spells

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

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

surgery

Merge pull request #5314 from VOREStation/pol-encasedfracture

2018-05-31 22:06:59 -04:00

tables

…

telesci

Mostly comment out advanced GPSes

2018-05-17 15:38:07 -04:00

tension

…

tooltip

…

turbolift

…

vehicles

…

ventcrawl

…

virus2

…

vore

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

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

xenoarcheaology

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

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

xenobio

…

xenobio2

…

xgm

…