Neerti 1f0bb5891c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_web_shuttles ...

# Conflicts resolved:
#	code/modules/busy_space/organizations.dm

2017-10-10 01:19:53 -04:00

..

admin

Revert "Does more prep for the Event Manager role"

2017-10-04 18:33:34 -05:00

alarm

…

assembly

…

awaymissions

More merging updates

2017-09-19 23:58:40 -04:00

blob

…

busy_space

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_web_shuttles

2017-10-10 01:19:53 -04:00

client

Merge pull request #4025 from Anewbe/prosthetic_organs

2017-10-06 01:18:16 -04:00

clothing

Merge pull request #4016 from Anewbe/snowshoes

2017-10-06 01:12:07 -04:00

customitems

…

detectivework

…

economy

More merging updates

2017-09-19 23:58:40 -04:00

error_handler

…

events

Adds the Lost Drone

2017-09-22 01:17:53 -04:00

examine

Food fluff (#4008)

2017-10-02 19:59:00 -05:00

ext_scripts

…

flufftext

Adds a bunch of dreams. (#3888)

2017-09-20 13:51:14 -05:00

food

More merging updates

2017-09-19 23:58:40 -04:00

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

…

hydroponics

Adds Farm PoI

2017-09-26 01:44:06 -04:00

icon generation

…

integrated_electronics

Shifts around a few Tech Levels.

2017-09-23 12:54:04 -05:00

library

…

lighting

Fixes the Sun/Weather and Ports Vore's Lighting SS

2017-09-22 12:16:21 -04:00

lore_codex

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_web_shuttles

2017-10-10 01:19:53 -04:00

maps

Adds Farm PoI

2017-09-26 01:44:06 -04:00

materials

Merge pull request #3971 from Neerti/9/28/2017_stack_asthetics

2017-09-29 16:07:04 -05:00

metric

…

mining

…

mob

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

2017-10-06 00:18:50 -05:00

multiz

More merging updates

2017-09-19 23:58:40 -04:00

nano

…

organs

Merge pull request #3918 from Anewbe/liver_alcohol

2017-09-26 07:01:15 -04:00

overmap

…

paperwork

Makes a bunch of things fit in holsters

2017-10-07 17:24:18 -05:00

planet

Read github PR for details.

2017-10-10 00:48:27 -04:00

power

Merge pull request #3933 from Anewbe/batteries

2017-09-25 21:32:41 -04:00

projectiles

Makes a bunch of things fit in holsters

2017-10-07 17:24:18 -05:00

random_map

…

reagents

Food fluff (#4008)

2017-10-02 19:59:00 -05:00

recycling

More merging updates

2017-09-19 23:58:40 -04:00

research

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

2017-09-25 20:35:19 -05:00

scripting

…

security levels

More merging updates

2017-09-19 23:58:40 -04:00

shieldgen

Directional Shield Tweaks

2017-09-30 00:25:49 -04:00

shuttles

Read github PR for details.

2017-10-10 00:48:27 -04:00

spells

…

surgery

Merge pull request #3961 from MisterLayne/9/26/2017_CableSurgeryFix

2017-09-27 19:46:29 -05:00

tables

More merging updates

2017-09-19 23:58:40 -04:00

turbolift

…

vehicles

…

ventcrawl

More merging updates

2017-09-19 23:58:40 -04:00

virus2

…

xenoarcheaology

Simple Animal Tweaks

2017-09-24 23:43:14 -04:00

xenobio

Makes it possible to get slimejelly

2017-09-25 18:41:08 -05:00

xenobio2

Adds the Lost Drone

2017-09-22 01:17:53 -04:00

xgm

…