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

..

admin

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

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

alarm

…

assembly

…

awaymissions

…

blob

…

blob2

…

busy_space

…

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-29 09:58:53 -04:00

customitems

…

detectivework

…

DMAPI

…

economy

…

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

…

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

…

lore_codex

…

maps

Blueshield tweaks and map_template.dm typo fix

2018-06-28 00:23:41 -04:00

materials

…

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-29 09:58:53 -04:00

multiz

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

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

nano

…

nifsoft

Commenting for clarity

2018-06-23 19:52:01 +01: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

Compile fix

2018-06-22 20:23:05 +01: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-29 09:58:53 -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/Repede/YawnWiderStation into self

2018-06-23 17:58:41 -04:00

recycling

…

research

Adding the Bioadaptive NIF to designs_vr.dm

2018-06-19 14:59:23 +02:00

resleeving

Biomass change compensation

2018-06-24 15:25:36 -04:00

rogueminer_vr

…

scripting

…

security levels

…

shieldgen

Recharger refactor

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

shuttles

…

spells

…

surgery

Merge pull request #5314 from VOREStation/pol-encasedfracture

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

tables

…

telesci

…

tension

…

tooltip

…

turbolift

…

vehicles

…

ventcrawl

…

virus2

…

vore

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

2018-06-29 09:58:53 -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

…