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

# Conflicts:
#	config/custom_items.txt
#	vorestation.dme

2017-06-12 12:39:07 -04:00

..

admin

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

2017-06-12 12:39:07 -04:00

alarm

Fixes Runtime in atmosphere_alarm.dm,24: list index out of bounds

2017-05-23 01:14:55 -04:00

assembly

…

awaymissions

Updated VOREStation specific files for the ammo path reorganization.

2017-06-02 12:18:13 -04:00

blob

…

busy_space

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26

2017-05-26 15:29:46 -04:00

client

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

2017-06-12 12:39:07 -04:00

clothing

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

2017-06-12 12:39:07 -04:00

customitems

…

detectivework

Update rag.dm

2017-06-04 18:26:28 -04:00

economy

…

error_handler

…

events

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

2017-06-01 17:27:00 -04:00

examine

…

ext_scripts

…

flufftext

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

2017-06-01 17:27:00 -04:00

food

Egg laying implant, yo!

2017-06-03 15:59:45 +02:00

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

…

holomap

Switch Tether over to use the map_z_level datum.

2017-05-26 18:57:07 -04:00

hydroponics

…

icon generation

…

integrated_electronics

…

interserver shipping

…

library

…

lighting

…

lore_codex

…

maps

…

materials

…

media

…

metric

…

mining

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

2017-06-12 12:39:07 -04:00

mob

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

2017-06-12 12:39:07 -04:00

multiz

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

2017-06-12 12:39:07 -04:00

nano

Finishing Up NIFs

2017-06-06 19:34:41 -04:00

nifsoft

Leshana-suggested changes

2017-06-06 21:11:25 -04:00

organs

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

2017-06-12 12:39:07 -04:00

overmap

…

paperwork

…

planet

…

power

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

2017-06-01 17:27:00 -04:00

projectiles

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

2017-06-12 12:39:07 -04:00

random_map

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

2017-06-01 17:27:00 -04:00

reagents

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

2017-06-12 12:39:07 -04:00

recycling

…

research

Finishing Up NIFs

2017-06-06 19:34:41 -04:00

resleeving

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

2017-06-12 12:39:07 -04:00

rogueminer_vr

…

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

…

supermatter

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

2017-06-01 17:27:00 -04:00

surgery

Polaris-able surgery fix

2017-06-06 01:00:45 -04:00

tables

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

2017-06-01 17:27:00 -04:00

telesci

…

turbolift

Adds "firefighter mode" to turbolifts

2017-05-26 14:45:00 -04:00

vehicles

…

ventcrawl

…

virus2

…

vore

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

2017-06-12 12:39:07 -04:00

xenoarcheaology

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

2017-06-01 17:27:00 -04:00

xenobio2

…

xgm

…