Markolie be92097e3f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cargonia ...

Conflicts:
	code/game/supplyshuttle.dm

2015-08-25 00:46:32 +02:00

..

admin

Merge pull request #1813 from TheDZD/muhcheens

2015-08-23 00:35:18 -04:00

alarm

…

assembly

isNonCrewAntag() checks, key_name fixes

2015-08-20 17:25:55 +02:00

atmos_automation

…

awaymissions

Merge pull request #1830 from Markolie/spookyscareobservers

2015-08-24 16:54:50 -04:00

client

Merge pull request #1807 from Markolie/globalassetcache

2015-08-22 16:06:04 -04:00

clothing

Pants Fix

2015-08-24 03:20:10 -04:00

computer3

changes disabilty to crimes

2015-08-21 20:08:32 -04:00

crafting

…

customitems

…

destilery

…

DetectiveWork

Detective Scanner Protolathe Production

2015-08-19 18:16:52 -04:00

economy

…

events

Making TullyBBurnalot happy (AKA the dumbest grammar PR ever.)

2015-08-20 16:17:38 -05:00

ext_scripts

…

fish

Sushi Update

2015-08-23 00:22:31 -04:00

flufftext

…

food

Sushi Update

2015-08-23 00:22:31 -04:00

games

…

garbage collection

Merge pull request #1781 from Markolie/adminbus

2015-08-18 20:19:55 -04:00

genetics2

…

holiday

…

hydroponics

isNonCrewAntag() checks, key_name fixes

2015-08-20 17:25:55 +02:00

icon generation

…

jungle

…

karma

isNonCrewAntag() checks, key_name fixes

2015-08-20 17:25:55 +02:00

library

Admin teleport update, further admin message fixes

2015-08-18 00:54:25 +02:00

lighting

…

liquid

…

media

…

mining

Consolidate ?/FLW links under key_name_admin

2015-08-17 00:13:53 +02:00

mob

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

2015-08-25 00:46:32 +02:00

nano

…

ninja

Implement /vg/'s global asset cache

2015-08-21 18:47:00 +02:00

organs

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

2015-08-18 18:38:59 +02:00

paperwork

Implement /vg/'s global asset cache

2015-08-21 18:47:00 +02:00

pooling

…

power

Merge pull request #1813 from TheDZD/muhcheens

2015-08-23 00:35:18 -04:00

procedural mapping

…

projectiles

Fix merge conflicts

2015-08-21 18:38:42 -04:00

reagents

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

2015-08-25 00:46:32 +02:00

recycling

isNonCrewAntag() checks, key_name fixes

2015-08-20 17:25:55 +02:00

research

Merge pull request #1833 from Markolie/T34-IPC

2015-08-24 16:55:05 -04:00

scripting

Merge pull request #1766 from Markolie/adminbus

2015-08-17 18:10:38 -04:00

security levels

Remove double follow link

2015-08-22 01:14:10 +02:00

shieldgen

…

shuttles

…

store

…

surgery

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

2015-08-18 18:38:59 +02:00

telesci

…

tram

…

vehicle

isNonCrewAntag() checks, key_name fixes

2015-08-20 17:25:55 +02:00

virus2

IPC overhaul

2015-08-15 23:52:26 +02:00