Leshana eae29b9d69 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sink

2016-05-30 22:43:05 -04:00

..

admin

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

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

alarm

…

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 branch 'master' of https://github.com/PolarisSS13/Polaris into sink

2016-05-30 22:43:05 -04:00

clothing

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

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

customitems

…

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

…

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

…

lighting

…

maps

…

materials

…

mining

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

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

mob

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

2016-05-30 22:43:05 -04:00

multiz

…

nano

HTML5 and CSS3 (#1677)

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

organs

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

2016-05-30 22:43:05 -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

…

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

…

security levels

…

shieldgen

…

shuttles

…

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

…

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

…