Leshana 7a4dc4bf79 Merge remote-tracking branch 'polaris/master' into polaris-sync ...

# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/zresearchlabs.dmm

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

..

admin

Merge pull request #3271 from VOREStation/aro-pol-panic

2017-04-11 21:55:59 -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

Fix 'if' statement on Panic Bunker

2017-04-11 00:13:54 -04:00

clothing

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

2017-04-15 23:14:32 -05: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 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

library

…

lighting

Allow set_opacity() to work for turfs too.

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

lore_codex

Implements the new Codex.

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

maps

…

materials

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

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

media

…

metric

…

mining

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

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

mob

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

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

multiz

…

nano

…

organs

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

2017-04-15 23:14:32 -05: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 remote-tracking branch 'polaris/master' into polaris-sync

2017-04-15 23:14:32 -05: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 remote-tracking branch 'polaris/master' into polaris-sync

2017-04-15 23:14:32 -05: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

Rogueminer Improvements

2017-04-04 15:20:45 -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

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

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

tables

Fixes: #3268

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

telesci

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

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

turbolift

…

vehicles

…

ventcrawl

…

virus2

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

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

vore

adds horse, cow, fantail and wagtail tails, and colorable antennae "ears"

2017-04-14 19:02:34 +01:00

xenoarcheaology

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

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

xenobio2

…

xgm

…