skull132 efee411ad7 Merge branch 'master' into development ...

# Conflicts:
#	code/modules/modular_computers/computers/modular_computer/damage.dm

2017-05-20 19:18:35 +03:00

..

acting

…

admin

Kill airlocks' process(), SSpower, and misc. performance tweaks (#2175)

2017-05-11 22:19:51 +03:00

alarm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

antag_contest

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

assembly

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

awaymissions

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

blob

Merge branch 'master' into development

2017-05-16 14:46:36 +03:00

cargo

Merge branch 'development' into map-development

2017-05-03 21:04:38 +03:00

cciaa

Merge branch 'master' into development

2017-05-14 20:52:53 +03:00

client

Configable anti-macro protection (#2293)

2017-05-17 21:59:02 +03:00

clothing

Loadout, clothing and accessories update and additions (#2267)

2017-05-17 13:49:47 +03:00

customitems

Custom items 16/05 (#2284)

2017-05-16 09:53:38 +03:00

detectivework

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

economy

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

effects

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

events

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

examine

…

ext_scripts

…

flufftext

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

food

Cooking Fixes Pass 2 (#2024)

2017-04-13 23:31:32 +03:00

games

…

genetics

…

ghosttrap

Ghostrap update and minor fixes (#2019)

2017-04-02 00:10:55 +03:00

holodeck

Merge branch 'master' into development

2017-05-16 14:46:36 +03:00

http

Fix/debug BOREALIS (#2086)

2017-04-14 13:29:21 +03:00

hydroponics

Merge branch 'master' into development

2017-05-16 14:46:36 +03:00

intern

…

law

…

library

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

lighting

Cross-Z Lighting (#2281)

2017-05-20 14:24:04 +03:00

liquid

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

maps

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

materials

lift stuffs (#2126)

2017-04-24 22:54:24 -04:00

mining

Fixing oregen (#2249)

2017-05-14 02:58:59 +03:00

mob

Merge branch 'master' into development

2017-05-20 19:18:35 +03:00

modular_computers

Merge branch 'master' into development

2017-05-20 19:18:35 +03:00

multiz

Cross-Z Lighting (#2281)

2017-05-20 14:24:04 +03:00

nano

Kill airlocks' process(), SSpower, and misc. performance tweaks (#2175)

2017-05-11 22:19:51 +03:00

orbit

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

organs

More discreet shells (#2272)

2017-05-15 22:23:06 +03:00

overmap

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

paperwork

Merge branch 'development' into map-development

2017-05-03 21:04:38 +03:00

power

Merge branch 'master' into development

2017-05-16 14:46:36 +03:00

projectiles

Merge branch 'development' into map-development

2017-05-03 21:04:38 +03:00

random_map

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

reagents

Lifts and more (#2269)

2017-05-15 18:52:39 +03:00

recycling

Merge branch 'master' into development

2017-05-14 20:52:53 +03:00

research

Merge branch 'master' into development

2017-05-16 14:46:36 +03:00

scripting

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

security levels

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

shieldgen

ZAS Performance Improvements (#2308)

2017-05-20 19:00:15 +03:00

shuttles

Shuttle refactor (#2171)

2017-05-05 10:16:53 +03:00

spells

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

supermatter

Merge branch 'master' into development

2017-05-14 20:52:53 +03:00

surgery

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

tables

Queued table icon updates (#2206)

2017-05-13 12:52:13 +03:00

telesci

Telesci fix (#2239)

2017-05-14 03:00:53 +03:00

turbolift

Lifts and more (#2269)

2017-05-15 18:52:39 +03:00

udp

html_encode the log messages (#2079)

2017-04-16 20:15:53 +03:00

vehicles

Merge branch 'master' into development

2017-05-20 19:18:35 +03:00

ventcrawl

Adds the rat king (#2130)

2017-05-03 22:23:43 +03:00

virus2

UDP Logging (#1997)

2017-04-01 23:47:00 +03:00

web_interface

…

wireless

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

xgm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00