MisterLayne dde6d7d00a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/26/2017_Synthetic_Syring_Fix

2017-09-26 17:30:30 -04:00

..

admin

Adds more channels to intercom msg

2017-09-24 02:00:58 -05:00

alarm

…

assembly

…

awaymissions

More merging updates

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

blob

…

busy_space

More merging updates

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

client

More merging updates

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

clothing

Fixes HoS's berets.

2017-09-24 11:33:55 -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

Corrects pipe examine info.

2017-09-25 00:57:16 -04: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

More merging updates

2017-09-19 23:58:40 -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

…

maps

More merging updates

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

materials

Merge pull request #3806 from ghost/woodbuck

2017-09-22 12:20:29 -05:00

metric

…

mining

…

mob

Merge pull request #3949 from Atermonera/AI_langs

2017-09-26 15:05:58 -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

More merging updates

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

planet

Fixes the Gravity Failure Event

2017-09-24 14:03:43 -05:00

power

Merge pull request #3933 from Anewbe/batteries

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

projectiles

Merge pull request #3757 from SpadesNeil/Ace-infuriates-Anewbe-with-another-vintage-weapon

2017-09-26 01:09:46 -05:00

random_map

Fixed the only few instances this gun appears

2017-08-07 23:53:23 -04:00

reagents

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

2017-09-26 17:30:30 -04:00

recycling

More merging updates

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

research

Merge pull request #3919 from Anewbe/tech_shifting

2017-09-24 00:09:02 -04:00

scripting

…

security levels

More merging updates

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

shieldgen

Hull shields and emergency shields check for outdoor turfs and drops

2017-09-22 23:56:38 +01:00

shuttles

…

spells

…

surgery

Better borg tools, improves Electric Welder

2017-09-20 21:48:15 -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

Shifts around a few Tech Levels.

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

xenobio2

Adds the Lost Drone

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

xgm

…