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

# Conflicts:
#	code/modules/mob/living/carbon/human/whisper.dm

Whisper modified locally, and deleted upstream (in a change I made, so I know it's safe to remove).

2016-05-26 09:59:18 -04:00

..

admin

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

2016-05-26 09:59:18 -04:00

alarm

…

assembly

…

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 sync

2016-05-26 09:59:18 -04:00

clothing

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

2016-05-26 09:59:18 -04:00

customitems

…

detectivework

Fixes never being able to light molotovs and makes throwing them less crap

2016-05-21 15:10:49 +01:00

economy

Removes pay bugfix

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

events

Generic Station & System Name

2016-05-16 16:21:17 -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

…

hydroponics

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

2016-05-26 09:59:18 -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 sync

2016-05-26 09:59:18 -04:00

multiz

…

nano

HTML5 and CSS3 (#1677)

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

organs

Fixes synths and sets null post-load prefs

2016-05-18 01:36:14 -04:00

overmap

…

paperwork

…

power

Adjusts and adds more colors of cables

2016-05-19 18:13:12 +01:00

projectiles

Fixes #1655

2016-05-24 12:12:26 -04:00

random_map

…

reagents

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

2016-05-26 09:59:18 -04:00

recycling

…

research

Removes pay bugfix

2016-05-23 14:06:06 -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

Fixes beating people up during surgery

2016-05-18 22:59:05 +01:00

tables

…

vehicles

…

virus2

…

vore

Fixes Issue #146 - Fix wrapping of belly buttons in vore panel if they exceed width of vore panel window.

2016-05-21 20:09:29 -04:00

xgm

…