Markolie f5e2d82953 (Plasma decal already fixed) - Merge branch 'master' of https://github.com/ParadiseSS13/Paradise ...

Conflicts:
	code/game/machinery/atmoalter/canister.dm

2015-02-17 02:12:22 +01:00

..

admin

(Plasma decal already fixed) - Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

2015-02-17 02:12:22 +01:00

assembly

Moved bomb logging from adminlog to attacklog

2015-02-12 02:04:32 -05:00

awaymissions

Announcement system overhaul, crew monitor system overhaul, add portable crew monitor

2015-02-16 19:03:29 +01:00

client

Comma fix

2015-02-17 01:04:38 +01:00

clothing

Merge remote-tracking branch 'upstream/master' into Cargo

2015-02-14 22:02:39 -05:00

computer3

Z-level check refactor

2015-02-16 20:33:28 +01:00

customitems

Accessory overhaul

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

destilery

…

DetectiveWork

…

economy

Announcement system overhaul, crew monitor system overhaul, add portable crew monitor

2015-02-16 19:03:29 +01:00

events

Move mass hallucination event to moderate, change weight of cargo bonus

2015-02-16 23:05:25 +01:00

ext_scripts

…

flufftext

Crossbow Rework

2015-02-03 23:35:09 -05:00

food

Kitchen Food Processor Nerfs

2015-01-10 20:14:07 -05:00

games

…

genetics

…

genetics2

…

hydroponics

Botany Reagents/Recipes Revert

2015-01-29 19:59:37 -05:00

icon generation

…

jungle

Defib update, cell path update

2015-02-09 16:12:01 +01:00

karma

Additional karma check to prevent potential exploit?

2015-02-16 06:14:06 -05:00

library

Emag refactor

2015-02-13 16:59:20 +01:00

liquid

…

media

Remove jukebox debug

2015-01-31 15:38:16 +01:00

mining

Z-level check refactor

2015-02-16 20:33:28 +01:00

mob

(Plasma decal already fixed) - Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

2015-02-17 02:12:22 +01:00

nano

Announcement system overhaul, crew monitor system overhaul, add portable crew monitor

2015-02-16 19:03:29 +01:00

organs

Camera code update, fix runtime

2015-02-10 15:42:47 +01:00

paperwork

Fax reply fix

2015-02-14 18:48:20 +01:00

power

Solar update, convert solar to NanoUI

2015-02-16 21:35:34 +01:00

projectiles

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

2015-02-09 16:15:00 +01:00

reagents

(Plasma decal already fixed) - Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

2015-02-17 02:12:22 +01:00

recycling

Major atmos overhaul: scrubbers and pipes can now co-exist

2015-01-18 02:24:24 +01:00

research

Z-level check refactor

2015-02-16 20:33:28 +01:00

scripting

…

security levels

Z-level check refactor

2015-02-16 20:33:28 +01:00

shieldgen

Blob event fixes, toggle preferences age check, jobban check

2015-02-01 14:19:11 +01:00

shuttles

Announcement system overhaul, crew monitor system overhaul, add portable crew monitor

2015-02-16 19:03:29 +01:00

store

Z-level check refactor

2015-02-16 20:33:28 +01:00

supermatter

…

surgery

Merge surgical borgs and crisis borgs

2015-02-16 22:47:55 +01:00

telesci

Emag refactor

2015-02-13 16:59:20 +01:00

vehicles

Emag refactor

2015-02-13 16:59:20 +01:00

virus2

Adds Injection Only type viruses

2015-01-27 06:19:05 +00:00