Markolie d4e5149389 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fluff ...

Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone.dm

2015-09-26 05:12:52 +02:00

..

admin

Merge pull request #2147 from tigercat2000/reformat

2015-09-24 14:17:47 -04:00

alarm

Display case update, some forceMove updates

2015-09-14 20:21:56 +02:00

assembly

Implement remove_item_from_storage properly, syndi toolbox tool color update

2015-09-16 01:54:34 +02:00

atmos_automation

Pipenet overhaul

2015-09-21 02:11:54 +02:00

awaymissions

…

client

Instrument toggle fix

2015-09-24 18:19:15 +02:00

clothing

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

2015-09-26 05:12:52 +02:00

computer3

Used apply_effect for all radiation effects

2015-09-24 16:08:59 -07:00

crafting

…

customitems

More fluff item updates, add Stobarico's fluff item

2015-09-25 05:05:14 +02:00

destilery

…

DetectiveWork

…

economy

Missing variable

2015-09-22 01:51:28 +02:00

events

Pipenet overhaul

2015-09-21 02:11:54 +02:00

examine

Bayxamine: WEAPONS\!

2015-09-15 09:10:17 -07:00

ext_scripts

…

fish

Bay12 examine overhaul.

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

flufftext

Pass III

2015-09-18 21:15:08 -04:00

food

Bay12 examine overhaul.

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

games

Bay12 examine overhaul.

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

garbage collection

gcDestroyed fixes

2015-09-21 02:33:53 +02:00

genetics2

…

holiday

…

hydroponics

Fix compile

2015-09-24 16:03:55 -07:00

icon generation

…

jungle

…

karma

SQL update

2015-09-23 06:13:42 +02:00

library

Fixes

2015-09-23 06:22:00 +02:00

lighting

…

liquid

…

media

Used apply_effect for all radiation effects

2015-09-24 16:08:59 -07:00

mining

Merge pull request #2091 from Fox-McCloud/destroy-them-all

2015-09-18 22:30:49 -04:00

mob

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

2015-09-26 05:12:52 +02:00

nano

Merge pull request #2049 from Markolie/display

2015-09-15 16:02:43 -04:00

ninja

Saber SMG update, add armour piercing variable

2015-09-21 22:50:07 +02:00

organs

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

2015-09-23 07:07:17 +02:00

paperwork

More fluff item fixes

2015-09-25 04:43:48 +02:00

pooling

…

power

-tg- SpaceMove update

2015-09-25 15:53:59 -07:00

procedural mapping

…

projectiles

-tg- SpaceMove update

2015-09-25 15:53:59 -07:00

reagents

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

2015-09-26 05:12:52 +02:00

recycling

…

research

-tg- SpaceMove update

2015-09-25 15:53:59 -07:00

scripting

…

security levels

…

shieldgen

…

shuttles

-tg- SpaceMove update

2015-09-25 15:53:59 -07:00

store

…

surgery

Laser Scalpel Damage Nerf

2015-09-23 07:45:13 -04:00

telesci

Tweaks

2015-09-21 00:25:27 -04:00

tram

…

vehicle

Fix vehicles being able to drive in space

2015-09-25 10:15:44 -07:00

virus2

fix for symptom

2015-09-21 21:10:20 -04:00