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

# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/species/akula/mask_vr.dmi
#	icons/mob/species/fennec/mask_vr.dmi
#	icons/mob/species/fox/mask_vr.dmi
#	icons/mob/species/nevrean/mask_vr.dmi
#	icons/mob/species/vulpkanin/mask.dmi
#	icons/mob/vore/taurs_vr.dmi

2017-10-03 19:04:51 -04:00

..

admin

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

2017-09-23 11:40:55 -04:00

alarm

…

assembly

…

awaymissions

Some disorganizes changes by Aces

2017-09-21 03:22:20 -04:00

blob

…

busy_space

Some disorganizes changes by Aces

2017-09-21 03:22:20 -04:00

client

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

2017-10-03 19:04:51 -04:00

clothing

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

2017-09-23 11:40:55 -04:00

customitems

…

detectivework

…

economy

Replaces two super not-lore-friendly messages with one stolen from Bay.

2017-09-08 22:02:07 -04:00

error_handler

…

events

Clarifies the grubevent announcement.

2017-10-02 20:49:10 +02:00

examine

Adds plasma research outpost.

2017-09-29 02:28:43 -04:00

ext_scripts

…

flufftext

Adds a bunch of dreams. (#3888)

2017-09-20 13:51:14 -05:00

food

Polaris sync

2017-09-15 21:17:34 -04:00

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

…

holomap

…

hydroponics

HOTFIX

2017-09-21 20:26:48 -04:00

icon generation

…

integrated_electronics

…

interserver shipping

…

library

…

lighting

…

lore_codex

Imperial Military Update

2017-09-02 04:07:25 -04:00

maps

Port's TG's Maploader

2017-09-08 12:49:26 -04:00

materials

Adds riding crop

2017-09-27 23:27:17 -04:00

media

…

metric

…

mining

…

mob

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

2017-10-03 19:04:51 -04:00

multiz

Catwalks and Railings

2017-09-16 00:54:33 -07:00

nano

…

nifsoft

Makes the thermal vision NIF software illegal.

2017-09-12 11:12:44 -04:00

organs

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

2017-09-23 11:40:55 -04:00

overmap

…

paperwork

Polaris sync

2017-09-15 21:17:34 -04:00

planet

…

power

Polaris sync

2017-09-15 21:17:34 -04:00

projectiles

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

2017-10-03 19:04:51 -04:00

random_map

…

reagents

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

2017-10-03 19:04:51 -04:00

recycling

work

2017-09-04 21:52:47 -04:00

research

Adds plasma research outpost.

2017-09-29 02:28:43 -04:00

resleeving

…

rogueminer_vr

…

scripting

…

security levels

Replaces two super not-lore-friendly messages with one stolen from Bay.

2017-09-08 22:02:07 -04:00

shieldgen

…

shuttles

…

spells

…

supermatter

…

surgery

HOTFIX

2017-09-21 20:26:48 -04:00

tables

HOTFIX

2017-09-21 20:26:48 -04:00

telesci

…

turbolift

…

vehicles

…

ventcrawl

work

2017-09-04 21:52:47 -04:00

virus2

…

vore

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

2017-10-03 19:04:51 -04:00

xenoarcheaology

HOTFIX

2017-09-21 20:26:48 -04:00

xenobio

Removes some world << output, fixes a few bugs.

2017-09-05 22:52:46 -04:00

xenobio2

Polaris sync

2017-09-15 21:17:34 -04:00

xgm

…