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

2017-04-18 19:29:23 -04:00

..

admin

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

2017-04-18 19:29:23 -04:00

alarm

…

assembly

…

awaymissions

…

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:29:23 -04:00

customitems

…

detectivework

…

economy

…

error_handler

…

events

…

examine

…

ext_scripts

…

flufftext

…

food

…

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

…

hydroponics

Merge remote-tracking branch 'polaris/master' into polaris-sync

2017-04-15 23:14:32 -05:00

icon generation

…

integrated_electronics

Merge remote-tracking branch 'polaris/master' into polaris-sync

2017-04-15 23:14:32 -05:00

interserver shipping

…

library

…

lighting

Allow set_opacity() to work for turfs too.

2017-04-15 10:37:35 -05:00

lore_codex

…

maps

…

materials

Merge remote-tracking branch 'polaris/master' into polaris-sync

2017-04-15 23:14:32 -05:00

media

…

metric

…

mining

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

2017-04-18 19:29:23 -04:00

mob

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

2017-04-18 19:29:23 -04:00

multiz

…

nano

…

organs

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

2017-04-18 19:29:23 -04:00

overmap

…

paperwork

…

planet

Merge branch 'master' of ../Polaris into polaris-sync

2017-04-16 20:58:40 -04:00

power

…

projectiles

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

2017-04-18 19:29:23 -04:00

random_map

Replace opacity = X with set_opacity(X) so that the lighting system can update propertly.

2017-04-11 22:36:48 -04:00

reagents

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

2017-04-18 19:29:23 -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

Merge pull request #3286 from VOREStation/smooth-lighting

2017-04-15 22:52:42 -05:00

shuttles

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

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

spells

…

supermatter

…

surgery

…

tables

Fixes: #3268

2017-04-10 23:32:38 -04:00

telesci

…

turbolift

…

vehicles

…

ventcrawl

…

virus2

…

vore

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

2017-04-18 19:29:23 -04:00

xenoarcheaology

Merge remote-tracking branch 'polaris/master' into polaris-sync

2017-04-15 23:14:32 -05:00

xenobio2

…

xgm

…