skull132 22c7748336 Merge branch 'master' into development ...

# Conflicts:
#	code/game/machinery/computer/shuttle.dm
#	code/game/machinery/doors/firedoor.dm
#	code/game/objects/items/weapons/weaponry.dm
#	code/modules/admin/admin_attack_log.dm
#	code/modules/admin/admin_verbs.dm

2017-05-27 20:11:54 +03:00

..

acting

…

admin

Merge branch 'master' into development

2017-05-27 20:11:54 +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

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

awaymissions

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03: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

Job subsystem & Player Spawn Tweaks (#2403)

2017-05-23 12:10:30 +03:00

client

Loadout, clothing fixes and additions (#2467)

2017-05-27 12:41:10 +03:00

clothing

Loadout, clothing fixes and additions (#2467)

2017-05-27 12:41:10 +03:00

customitems

Custom items 16/05 (#2284)

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

detectivework

Merge SSnanoui & Nanomanager (#2427)

2017-05-23 16:33:00 +03:00

economy

Merge SSnanoui & Nanomanager (#2427)

2017-05-23 16:33:00 +03:00

effects

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

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

events

Various Bugfixes (#2463)

2017-05-27 12:40:18 +03:00

examine

…

ext_scripts

…

flufftext

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

food

Cooking Fixes Pass 2 (#2024)

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

games

…

genetics

…

ghosttrap

Miningedits (#2363)

2017-05-21 22:12:06 +03:00

holodeck

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

http

Fix/debug BOREALIS (#2086)

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

hydroponics

Makes removable labels a thing (#2440)

2017-05-24 20:50:11 +03:00

intern

…

law

…

library

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

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

lighting

Fix some lighting bugs (#2383)

2017-05-22 01:57:39 +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

Diagonal smoothing fixes & Shuttle Smoothing Tweaks (#2466)

2017-05-27 12:14:01 +03:00

mob

Merge branch 'master' into development

2017-05-27 20:11:54 +03:00

modular_computers

Merge SSnanoui & Nanomanager (#2427)

2017-05-23 16:33:00 +03:00

multiz

Diagonal smoothing fixes & Shuttle Smoothing Tweaks (#2466)

2017-05-27 12:14:01 +03:00

nano

Merge SSnanoui & Nanomanager (#2427)

2017-05-23 16:33:00 +03:00

orbit

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

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

organs

Merge SSnanoui & Nanomanager (#2427)

2017-05-23 16:33:00 +03:00

overmap

Merge SSnanoui & Nanomanager (#2427)

2017-05-23 16:33:00 +03:00

paperwork

Implement signatures (#2098)

2017-05-27 12:39:22 +03:00

power

Merge branch 'master' into development

2017-05-27 20:11:54 +03:00

projectiles

Merge branch 'master' into development

2017-05-27 20:11:54 +03:00

random_map

Merge branch 'master' into development

2017-05-27 20:11:54 +03:00

reagents

Merge branch 'master' into development

2017-05-27 20:11:54 +03:00

recycling

Merge branch 'master' into development

2017-05-27 20:11:54 +03:00

research

Merge branch 'master' into development

2017-05-27 20:11:54 +03:00

scripting

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

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

security levels

Merge branch 'master' into development

2017-05-27 20:11:54 +03:00

shieldgen

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

shuttles

Merge SSnanoui & Nanomanager (#2427)

2017-05-23 16:33:00 +03:00

spells

Enables dionae structures (#2471)

2017-05-27 12:41:40 +03:00

supermatter

Merge SSnanoui & Nanomanager (#2427)

2017-05-23 16:33:00 +03:00

surgery

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03: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

New Map Bugfixes (#2424)

2017-05-23 03:21:51 +03:00

udp

html_encode the log messages (#2079)

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

vehicles

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

ventcrawl

Adds the rat king (#2130)

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

virus2

Unnecessary File Roundup (#2315)

2017-05-24 02:55:30 +03:00

web_interface

…

wireless

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

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

xgm

Make some ZAS lists lazy (#2339)

2017-05-24 02:51:49 +03:00