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

# Conflicts:
#	code/modules/multiz/basic.dm
#	config/custom_items.txt

2017-04-29 10:13:45 -04:00

..

admin

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

2017-04-29 10:13:45 -04:00

alarm

…

assembly

…

awaymissions

…

blob

…

busy_space

Update Codex to have our lore

2017-04-25 18:59:05 -04:00

client

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

2017-04-29 10:13:45 -04:00

clothing

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

2017-04-29 10:13:45 -04:00

customitems

…

detectivework

…

economy

…

error_handler

…

events

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

2017-04-25 15:04:54 -04:00

examine

…

ext_scripts

…

flufftext

…

food

…

gamemaster

…

games

…

genetics

Adds Modifier System, Changes Some Ling Stuff

2017-04-18 21:23:59 -04:00

ghosttrap

…

holodeck

…

hydroponics

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

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

icon generation

…

integrated_electronics

Fixes Circuit Bugs & QoL chances

2017-04-23 09:51:53 -04:00

interserver shipping

…

library

…

lighting

Allow set_opacity() to work for turfs too.

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

lore_codex

Merge pull request #1430 from VOREStation/aro-announcer

2017-04-25 19:08:43 -04:00

maps

…

materials

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

2017-04-25 15:04:54 -04:00

media

…

metric

…

mining

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

2017-04-29 10:13:45 -04:00

mob

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

2017-04-29 10:13:45 -04:00

multiz

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

2017-04-29 10:13:45 -04:00

nano

…

organs

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

2017-04-29 10:13:45 -04:00

overmap

…

paperwork

…

planet

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

2017-04-25 15:04:54 -04:00

power

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

2017-04-25 15:04:54 -04:00

projectiles

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

2017-04-29 10:13:45 -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-29 10:13:45 -04:00

recycling

…

research

…

resleeving

Un-scale HUDs for micros and macros.

2017-04-19 23:59:16 -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

Adds Modifier System, Changes Some Ling Stuff

2017-04-18 21:23:59 -04:00

shuttles

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

2017-04-25 15:04:54 -04:00

spells

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

2017-04-25 15:04:54 -04:00

supermatter

…

surgery

…

tables

Fixes: #3268

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

telesci

…

turbolift

Fix crash in turbolifts built on any z-level other than "1"

2017-04-17 13:13:39 -04:00

vehicles

…

ventcrawl

Splits item check back into mob-specific procs.

2017-04-19 10:10:56 -07:00

virus2

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

2017-04-25 15:04:54 -04:00

vore

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

2017-04-29 10:13:45 -04:00

xenoarcheaology

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

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

xenobio2

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

2017-04-25 15:04:54 -04:00

xgm

…