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

# Conflicts:
#	maps/RandomZLevels/labyrinth.dmm

2017-04-18 19:25:46 -04:00

..

admin

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

2017-04-18 19:25:46 -04:00

alarm

…

assembly

…

awaymissions

Various updates and small fixes

2017-04-09 17:54:09 -04:00

blob

…

busy_space

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

2017-04-10 20:41:18 -04:00

client

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

2017-04-18 19:25:46 -04:00

clothing

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

2017-04-18 19:25:46 -04:00

customitems

…

detectivework

…

economy

Adds in an Unathi-made jerky snack

2017-04-07 23:36:22 -05:00

error_handler

…

events

…

examine

…

ext_scripts

…

flufftext

…

food

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

2017-04-01 19:19:42 -04:00

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

…

hydroponics

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

2017-04-01 19:19:42 -04:00

icon generation

…

integrated_electronics

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

2017-04-01 19:19:42 -04:00

interserver shipping

…

library

…

lighting

…

lore_codex

Implements the new Codex.

2017-04-08 12:08:08 -04:00

maps

…

materials

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

2017-04-01 19:19:42 -04:00

media

…

metric

…

mining

…

mob

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

2017-04-18 19:25:46 -04:00

multiz

…

nano

…

organs

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

2017-04-18 19:25:46 -04:00

overmap

…

paperwork

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

2017-04-01 19:19:42 -04:00

planet

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

2017-04-01 19:19:42 -04:00

power

Make cells show correct icon when they spawn

2017-04-02 19:28:11 -04:00

projectiles

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

2017-04-18 19:25:46 -04:00

random_map

…

reagents

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

2017-04-18 19:25:46 -04:00

recycling

…

research

Merge pull request #1372 from VOREStation/aro-synthtails

2017-04-10 20:29:21 -04:00

resleeving

Save weight when resleeving while here

2017-04-10 18:19:02 -04:00

rogueminer_vr

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

2017-04-13 19:43:56 -04:00

scripting

…

security levels

…

shieldgen

…

shuttles

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

2017-04-10 20:41:18 -04:00

spells

…

supermatter

…

surgery

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

2017-04-01 19:19:42 -04:00

tables

…

telesci

Vore mobs were supposed to spit you out when they die.

2017-04-08 13:10:05 -04:00

turbolift

…

vehicles

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

2017-04-09 09:56:44 -04:00

ventcrawl

…

virus2

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

2017-04-01 19:19:42 -04:00

vore

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

2017-04-18 19:25:46 -04:00

xenoarcheaology

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

2017-04-10 20:41:18 -04:00

xenobio2

…

xgm

…