Leshana e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink ...

# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme

2016-05-29 16:22:07 -04:00

..

admin

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

2016-05-29 16:22:07 -04:00

alarm

Camera fixes and performance tweaks.

2016-03-21 17:30:52 -04:00

assembly

Issue #4 - Porting resize (micro/macro) systems.

2016-05-08 23:11:03 -04:00

awaymissions

Issue #23 - Ported the carpfarm and listeningpost away mission maps (#96)

2016-05-17 20:35:28 -04:00

blob

…

client

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

2016-05-29 16:22:07 -04:00

clothing

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

2016-05-29 16:22:07 -04:00

customitems

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

detectivework

Adjusts molotovs to be able to use alcohol to set the rag alight

2016-05-27 15:39:35 +01:00

economy

Removes pay bugfix

2016-05-23 14:06:06 -04:00

events

IAN STORM

2016-05-27 13:30:33 -04:00

examine

Generic Station & System Name

2016-05-16 16:21:17 -04:00

ext_scripts

…

flufftext

Changes some fluffy bits to be more accurate

2016-05-21 18:00:54 -05:00

food

…

games

Generic Station & System Name

2016-05-16 16:21:17 -04:00

genetics

…

ghosttrap

Changes types of ghosts and eyes

2016-02-20 15:36:05 +03:00

holodeck

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

2016-05-28 20:22:09 +01:00

hydroponics

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

2016-05-29 16:22:07 -04:00

icon generation

…

library

Fixes missing cooldowns, missing cult blade sound.

2016-04-22 04:58:25 -04:00

lighting

…

maps

Fixes issues travis found

2016-03-11 11:59:51 +03:00

materials

Reinforced Walls

2016-04-15 16:41:33 +02:00

mining

Merge branch 'sync' of https://github.com/VOREStation/Polaris into 05192016_sync

2016-05-19 23:52:00 -04:00

mob

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

2016-05-29 16:22:07 -04:00

multiz

…

nano

HTML5 and CSS3 (#1677)

2016-05-19 14:28:38 -04:00

organs

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

2016-05-29 16:22:07 -04:00

overmap

…

paperwork

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

power

Ports Bay's Robolimb Changes (#1779)

2016-05-28 14:12:19 +01:00

projectiles

Merge pull request #1787 from EmperorJon/28_May_Port_setup_changes

2016-05-28 22:59:56 -04:00

random_map

Merge pull request #1027 from Kelenius/mobCleanup

2016-03-18 13:50:47 -04:00

reagents

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

2016-05-29 16:22:07 -04:00

recycling

Buildables v1.2 (#1517)

2016-05-03 22:18:12 +01:00

research

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

2016-05-29 16:22:07 -04:00

scripting

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

security levels

Construction Update

2016-03-25 16:02:36 -04:00

shieldgen

…

shuttles

Removed the Vox Pox.

2016-02-20 11:24:19 +10:30

spells

Removes Horsehead and Mindswap from Wizard spellbooks

2016-05-22 11:38:09 -05:00

supermatter

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

surgery

The Terminator Update

2016-05-29 02:37:13 -04:00

tables

…

vehicles

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

virus2

Fixes #1171

2016-03-21 14:22:44 +03:00

vore

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

2016-05-29 16:22:07 -04:00

xenobio2

Merge pull request #1788 from Datraen/Xenobio2_Tweaks

2016-05-29 03:56:39 +01:00

xgm

…