Leshana 4fbfa7ee37 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08 ...

# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme

2017-05-08 21:07:45 -04:00

..

admin

Replace 'magic' messages with Facility PA

2017-04-25 15:15:45 -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 polaris-sync-2017-05-08

2017-05-08 21:07:45 -04:00

client

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

2017-05-08 21:07:45 -04:00

clothing

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

2017-05-08 21:07:45 -04:00

customitems

…

detectivework

…

economy

Adds in an Unathi-made jerky snack

2017-04-07 23:36:22 -05:00

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

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

2017-05-08 21:07:45 -04:00

genetics

Adds Modifier System, Changes Some Ling Stuff

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

ghosttrap

…

holodeck

Allows more than one holodeck

2017-04-30 16:53:55 -04:00

hydroponics

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

2017-05-08 21:07:45 -04:00

icon generation

…

integrated_electronics

Fixes Logic Circuits

2017-05-06 16:35:06 -04:00

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/PolarisSS13/Polaris into aro-sync

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

mob

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

2017-05-08 21:07:45 -04:00

multiz

Fix zpipes losing color in-game.

2017-04-26 20:07:00 -04:00

nano

…

organs

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

2017-05-08 21:07:45 -04:00

overmap

…

paperwork

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

2017-05-08 21:07:45 -04:00

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/PolarisSS13/Polaris into polaris-sync-2017-05-08

2017-05-08 21:07:45 -04:00

random_map

Removes the datum pool, as it is not performant.

2017-05-04 01:58:33 -04:00

reagents

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

2017-05-08 21:07:45 -04:00

recycling

…

research

Merge pull request #1372 from VOREStation/aro-synthtails

2017-04-10 20:29:21 -04:00

resleeving

Un-scale HUDs for micros and macros.

2017-04-19 23:59:16 -04:00

rogueminer_vr

Rogueminer Improvements

2017-04-04 15:20:45 -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 polaris-sync-2017-05-08

2017-05-08 21:07:45 -04:00

supermatter

…

surgery

…

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

Allow turbolift specific-floor delays

2017-04-24 16:10:03 -04:00

vehicles

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

2017-05-08 21:07:45 -04:00

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

Add's Tempest's custom implant item (#1461)

2017-05-03 22:09:07 -04:00

xenoarcheaology

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

2017-05-08 21:07:45 -04:00

xenobio2

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

2017-05-08 21:07:45 -04:00

xgm

…