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

# Conflicts:
#	code/game/machinery/vending.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	icons/obj/mining.dmi

2018-02-24 22:51:59 -05:00

..

admin

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

2018-02-24 22:51:59 -05:00

alarm

…

assembly

…

awaymissions

…

blob

…

blob2

Slimes should no longer /list you.

2018-02-20 01:58:49 -06:00

busy_space

…

client

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

2018-02-24 22:51:59 -05:00

clothing

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

2018-02-24 22:51:59 -05:00

customitems

…

detectivework

…

economy

…

entopics_vr

…

error_handler

…

events

…

examine

…

ext_scripts

…

flufftext

…

food

…

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

…

holomap

…

hydroponics

…

icon generation

…

integrated_electronics

…

interserver shipping

…

library

…

lighting

…

lore_codex

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-24

2018-02-24 13:19:10 -05:00

maps

…

materials

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23

2018-02-23 21:55:42 -05:00

media

…

metric

…

mining

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

2018-02-24 22:51:59 -05:00

mob

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

2018-02-24 22:51:59 -05:00

multiz

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

2018-02-24 22:51:59 -05:00

nano

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23

2018-02-23 21:55:42 -05:00

nifsoft

Fix commlink runtime

2018-02-24 17:19:49 -05:00

organs

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

2018-02-24 22:51:59 -05:00

overmap

…

paperwork

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23

2018-02-23 21:55:42 -05:00

Phorochemistry

…

planet

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

2018-02-24 22:51:59 -05:00

power

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

2018-02-24 22:51:59 -05:00

projectiles

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

2018-02-24 22:51:59 -05:00

random_map

…

reagents

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

2018-02-24 22:51:59 -05:00

recycling

…

research

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23

2018-02-23 21:55:42 -05:00

resleeving

VS: Fix a destroy by creating a subsystem

2018-02-20 00:23:37 -05:00

rogueminer_vr

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

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

scripting

…

security levels

…

shieldgen

Should squash two runtimes (#4868)

2018-02-18 11:46:50 -08:00

shuttles

…

spells

…

surgery

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23

2018-02-23 21:55:42 -05:00

tables

…

telesci

…

tension

…

turbolift

…

vehicles

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

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

ventcrawl

Fix HUD creation and ventcrawling

2018-02-21 17:47:19 -05:00

virus2

…

vore

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

2018-02-24 22:51:59 -05:00

xenoarcheaology

…

xenobio

…

xenobio2

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23

2018-02-23 21:55:42 -05:00

xgm

…