Markolie 90f722d752 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom ...

Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
	icons/mob/back.dmi

2015-09-15 04:18:27 +02:00

..

admin

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom

2015-09-15 04:18:27 +02:00

alarm

…

assembly

Health Assembly

2015-09-06 02:19:44 -04:00

atmos_automation

…

awaymissions

…

client

Fix Vox socks

2015-09-11 20:10:10 +02:00

clothing

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom

2015-09-15 04:18:27 +02:00

computer3

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

crafting

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

customitems

Fixes Derp Fox

2015-09-01 22:46:33 -04:00

destilery

…

DetectiveWork

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

economy

Accounts database fixes

2015-09-14 02:04:07 +02:00

events

Radiation damage fix

2015-09-12 18:51:24 +02:00

ext_scripts

…

fish

Replace magic intent words with defines, grab fixes

2015-09-07 11:51:00 -07:00

flufftext

…

food

Unknown Language Fix, Shrimp Recipe Tweak

2015-09-06 00:01:27 -04:00

games

…

garbage collection

…

genetics2

…

holiday

…

hydroponics

Botany Fixes

2015-09-14 04:27:58 -04:00

icon generation

…

jungle

Guns update

2015-09-14 04:05:20 +02:00

karma

…

library

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

lighting

Fixes light sources getting destroyed after their colour changes (no updates in between) leaving artifacts.

2015-09-12 22:51:10 +02:00

liquid

…

media

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

mining

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom

2015-09-15 04:18:27 +02:00

mob

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom

2015-09-15 04:18:27 +02:00

nano

Fix skin tone/color selection in CMA

2015-09-14 00:32:18 +02:00

ninja

In hand sprite overhaul

2015-09-13 22:44:18 +02:00

organs

Replace magic intent words with defines, grab fixes

2015-09-07 11:51:00 -07:00

paperwork

In hand sprite overhaul

2015-09-13 22:44:18 +02:00

pooling

…

power

Powernet Datum Destroying

2015-09-14 21:54:21 -04:00

procedural mapping

…

projectiles

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom

2015-09-15 04:18:27 +02:00

reagents

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom

2015-09-15 04:18:27 +02:00

recycling

sprite-revert

2015-09-07 16:55:40 -04:00

research

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom

2015-09-15 04:18:27 +02:00

scripting

Port Bay's intercom overhaul

2015-09-03 21:21:20 +02:00

security levels

…

shieldgen

Pass II

2015-09-04 16:32:18 -04:00

shuttles

R&D Update and Fix & Cargo Tweaks

2015-09-07 20:03:06 -04:00

store

…

surgery

Replace magic intent words with defines, grab fixes

2015-09-07 11:51:00 -07:00

telesci

…

tram

…

vehicle

…

virus2

…