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

# Conflicts:
#	code/modules/admin/admin_verbs.dm

2017-02-07 21:00:23 +02:00

..

acting

…

admin

Merge branch 'master' into development

2017-02-07 21:00:23 +02:00

alarm

…

antag_contest

Fixing Airlocks (#1546)

2017-01-13 23:39:22 +02:00

assembly

Processor-driven effects system & Minor Lighting Performance Tweaks (#1697)

2017-02-04 03:34:13 +02:00

awaymissions

…

blob

Nar-Nar and Blob Fixes (#1569)

2017-01-15 20:50:01 +02:00

cargo

More delay issues, magboots, knive-boot, marble and ccia (#1586)

2017-01-18 18:56:06 +02:00

cciaa

Fixes #1564, #1330, #1434 and #1210 (#1621)

2017-01-21 22:53:58 +02:00

client

Mandatory gun update (#1685)

2017-02-04 00:11:34 +02:00

clothing

Bay wizard port/rework (#1635)

2017-02-07 18:45:42 +02:00

customitems

Custom items 29/01 (#1664)

2017-01-30 23:38:41 +02:00

detectivework

Lighting Overhaul & General process improvements (#1612)

2017-01-29 01:13:54 +02:00

economy

More delay issues, magboots, knive-boot, marble and ccia (#1586)

2017-01-18 18:56:06 +02:00

effects

Processor-driven effects system & Minor Lighting Performance Tweaks (#1697)

2017-02-04 03:34:13 +02:00

events

Event tweaks, misc changes and fixes pack (#1588)

2017-01-20 19:23:04 +02:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

More delay issues, magboots, knive-boot, marble and ccia (#1586)

2017-01-18 18:56:06 +02:00

genetics

…

ghosttrap

Fix not working fake central command announcement (#1692)

2017-02-04 00:06:30 +02:00

holodeck

Lighting Overhaul & General process improvements (#1612)

2017-01-29 01:13:54 +02:00

http

…

hydroponics

Bay wizard port/rework (#1635)

2017-02-07 18:45:42 +02:00

intern

…

law

…

library

Fix two SQL errors (#1424)

2017-01-07 20:50:06 +02:00

lighting

Miscellaneous Tweaks (#1720)

2017-02-07 18:46:39 +02:00

liquid

…

maps

Lighting Overhaul & General process improvements (#1612)

2017-01-29 01:13:54 +02:00

materials

Bay wizard port/rework (#1635)

2017-02-07 18:45:42 +02:00

mining

Return of the mining loot crates and shuttle issues (#1654)

2017-01-29 14:27:48 +02:00

mob

Merge branch 'master' into development

2017-02-07 21:00:23 +02:00

modular_computers

Computer manager and more (#1406)

2017-01-20 21:45:53 +02:00

multiz

…

nano

Nuke 17 useless files (#1653)

2017-01-29 21:45:11 +02:00

organs

Fixes #1591, #1567, and grammar (#1629)

2017-01-23 15:59:39 +02:00

overmap

…

paperwork

Shredder Movement & Law Controller (#1700)

2017-02-04 00:15:49 +02:00

power

Processor-driven effects system & Minor Lighting Performance Tweaks (#1697)

2017-02-04 03:34:13 +02:00

projectiles

Bay wizard port/rework (#1635)

2017-02-07 18:45:42 +02:00

random_map

Lighting Overhaul & General process improvements (#1612)

2017-01-29 01:13:54 +02:00

reagents

Port bay newest loadout system (#1648)

2017-01-29 21:52:09 +02:00

recycling

Gripper overhaul + New borg sprites (#1518)

2017-01-13 00:07:18 +02:00

research

Lighting Overhaul & General process improvements (#1612)

2017-01-29 01:13:54 +02:00

scripting

…

security levels

…

shieldgen

…

shuttles

Lighting Overhaul & General process improvements (#1612)

2017-01-29 01:13:54 +02:00

spells

Bay wizard port/rework (#1635)

2017-02-07 18:45:42 +02:00

supermatter

Supermatter Variable Light (#1727)

2017-02-07 18:48:27 +02:00

surgery

Fixing Airlocks (#1546)

2017-01-13 23:39:22 +02:00

tables

Gripper overhaul + New borg sprites (#1518)

2017-01-13 00:07:18 +02:00

telesci

Processor-driven effects system & Minor Lighting Performance Tweaks (#1697)

2017-02-04 03:34:13 +02:00

vehicles

Lighting Overhaul & General process improvements (#1612)

2017-01-29 01:13:54 +02:00

ventcrawl

…

virus2

Automatic pistol, nutriment and sprites fixes (#1617)

2017-01-21 17:23:11 +02:00

web_interface

…

wireless

…

xgm

…