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

# Conflicts:
#	code/global.dm
#	config/custom_items.txt
#	icons/mob/human_races/r_xenochimera.dmi
#	vorestation.dme

2017-03-03 19:17:04 -05:00

..

admin

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

2017-03-03 19:17:04 -05:00

alarm

…

assembly

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

2017-02-14 20:29:57 -05:00

awaymissions

Merge large polaris changes

2017-03-02 22:44:17 -05:00

blob

…

busy_space

Space Chatter

2017-03-01 15:32:43 -05:00

client

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

2017-03-03 19:17:04 -05:00

clothing

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

2017-03-03 19:17:04 -05:00

customitems

…

detectivework

…

economy

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

error_handler

…

events

Initial commit of new map system for Virgo

2017-03-02 23:34:43 -05:00

examine

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

ext_scripts

…

flufftext

…

food

…

gamemaster

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

games

Merge large polaris changes

2017-03-02 22:44:17 -05:00

genetics

…

ghosttrap

…

holodeck

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

hydroponics

…

icon generation

…

integrated_electronics

Gives not equal gate the correct icon_state

2017-02-27 18:11:38 -05:00

interserver shipping

Interserver shipping update and other changes

2017-03-03 19:13:06 -05:00

library

…

lighting

…

maps

…

materials

Merge large polaris changes

2017-03-02 22:44:17 -05:00

metric

…

mining

Interserver shipping update and other changes

2017-03-03 19:13:06 -05:00

mob

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

2017-03-03 19:17:04 -05:00

multiz

…

nano

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

organs

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

2017-03-03 19:17:04 -05:00

overmap

…

paperwork

Merge large polaris changes

2017-03-02 22:44:17 -05:00

planet

Comment out noisy message

2017-03-03 00:43:35 -05:00

power

Merge large polaris changes

2017-03-02 22:44:17 -05:00

projectiles

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

2017-03-03 19:17:04 -05:00

random_map

…

reagents

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

2017-03-03 19:17:04 -05:00

recycling

…

research

Merge large polaris changes

2017-03-02 22:44:17 -05:00

resleeving

Initial commit of new map system for Virgo

2017-03-02 23:34:43 -05:00

rogueminer_vr

humvee sprite bug edit, fixed z, added rewards to mining reward, changed voting sound

2017-02-19 12:10:27 -05:00

scripting

…

security levels

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

shieldgen

…

shuttles

Merge large polaris changes

2017-03-02 22:44:17 -05:00

spells

Merge large polaris changes

2017-03-02 22:44:17 -05:00

supermatter

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

surgery

More tweaks

2017-02-28 01:13:29 -05:00

tables

…

telesci

Initial commit of new map system for Virgo

2017-03-02 23:34:43 -05:00

vehicles

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

2017-03-03 19:17:04 -05:00

ventcrawl

Allows maint drones to ventcrawl

2017-02-23 13:44:06 -05:00

virus2

…

vore

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

2017-03-03 19:17:04 -05:00

xenoarcheaology

Merge large polaris changes

2017-03-02 22:44:17 -05:00

xenobio2

Merge large polaris changes

2017-03-02 22:44:17 -05:00

xgm

…