Arokha Sieyes 925b1b4a3e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync ...

# Conflicts:
#	code/game/mecha/mech_fabricator.dm

2016-05-31 18:17:58 -04:00

..

admin

Merge pull request #245 from VOREStation/sink

2016-05-31 01:35:04 -04:00

alarm

…

assembly

…

awaymissions

…

blob

…

client

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

2016-05-31 18:17:58 -04:00

clothing

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

2016-05-31 18:17:58 -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

…

ext_scripts

…

flufftext

Changes some fluffy bits to be more accurate

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

food

…

games

…

genetics

…

ghosttrap

…

holodeck

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

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

hydroponics

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

2016-05-31 18:17:58 -04:00

icon generation

…

library

…

lighting

…

maps

…

materials

Small update to double beds. (#1828)

2016-05-31 15:08:57 +01:00

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 sync

2016-05-31 18:17:58 -04:00

multiz

…

nano

…

organs

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

2016-05-31 18:17:58 -04:00

overmap

…

paperwork

…

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

…

research

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

2016-05-31 18:17:58 -04:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

Removes Horsehead and Mindswap from Wizard spellbooks

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

supermatter

…

surgery

Make FBPs Constructable

2016-05-30 02:13:55 -04:00

tables

…

vehicles

…

virus2

…

vore

Merge pull request #245 from VOREStation/sink

2016-05-31 01:35:04 -04:00

xenobio2

Xenobio2 Update #3 (#1832)

2016-05-31 18:30:52 +01:00

xgm

…