skull132 41b616baca Merge branch 'master' into development ...

# Conflicts:
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	html/changelogs/.all_changelog.yml

2017-01-07 13:55:12 +02:00

..

acting

…

admin

Merge branch 'master' into development

2017-01-07 13:55:12 +02:00

alarm

…

antag_contest

Shells and Periphery (#1327)

2016-12-28 02:23:26 +02:00

assembly

…

awaymissions

…

blob

BayMerge DLC Pack (#1355)

2017-01-05 00:06:44 +02:00

cargo

Fixing hides and accessories/custom loadout changes (#1404)

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

cciaa

…

client

Merge branch 'master' into development

2017-01-07 13:55:12 +02:00

clothing

Fixing hides and accessories/custom loadout changes (#1404)

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

customitems

Merge branch 'master' into development

2017-01-07 13:55:12 +02:00

detectivework

Attack Proc fixes (#1259)

2016-12-24 03:34:23 +02:00

economy

Central command fixes and grenade addition to the uplink (#1336)

2016-12-29 02:18:28 +02:00

events

BayMerge DLC Pack (#1355)

2017-01-05 00:06:44 +02:00

examine

…

ext_scripts

…

flufftext

Computer tweaks (#1285)

2016-12-25 14:19:50 +02:00

food

Travis: Indentation / list fixes (#1254)

2016-12-19 16:40:52 +02:00

games

…

genetics

…

ghosttrap

Miscellaneous fixes (#1349)

2016-12-30 13:43:38 +02:00

holodeck

Miscellaneous bugfixes (#1385)

2017-01-04 03:14:07 +02:00

http

…

hydroponics

Beekeeping fixes and tweaks (#1337)

2016-12-30 20:28:53 +02:00

icon generation

Travis: Indentation / list fixes (#1254)

2016-12-19 16:40:52 +02:00

intern

…

law

Porting Apollo Infractions Computer (#1033)

2016-12-23 01:00:04 +02:00

library

Attack Proc fixes (#1259)

2016-12-24 03:34:23 +02:00

lighting

Reduce server freezes during large explosions (#1326)

2016-12-28 01:16:30 +02:00

liquid

…

maps

…

materials

Fixing hides and accessories/custom loadout changes (#1404)

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

mining

Fixing hides and accessories/custom loadout changes (#1404)

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

mob

Merge branch 'master' into development

2017-01-07 13:55:12 +02:00

modular_computers

Computer Console Tweaks (#1395)

2017-01-07 02:17:37 +02:00

multiz

…

nano

Minor Nightmode Fixes (#1305)

2016-12-26 01:42:40 +02:00

organs

Miscellaneous bugfixes (#1385)

2017-01-04 03:14:07 +02:00

overmap

BayMerge Bugfix; Fixing guns, update computers. (#1263)

2016-12-21 21:48:04 +02:00

paperwork

Misc fixes (#1370)

2017-01-03 01:54:30 +02:00

power

More fixes (#1405)

2017-01-07 12:47:56 +02:00

projectiles

More fixes (#1405)

2017-01-07 12:47:56 +02:00

random_map

…

reagents

Merge branch 'master' into development

2017-01-07 13:55:12 +02:00

recycling

…

research

BayMerge DLC Pack (#1355)

2017-01-05 00:06:44 +02:00

scripting

…

security levels

Nightmode Fixes (#1293)

2016-12-25 20:10:46 +02:00

shieldgen

Computer tweaks (#1285)

2016-12-25 14:19:50 +02:00

shuttles

BayMerge Bugfix; Fixing guns, update computers. (#1263)

2016-12-21 21:48:04 +02:00

spells

…

supermatter

Reduce server freezes during large explosions (#1326)

2016-12-28 01:16:30 +02:00

surgery

Vaurca Update Dec2016 (#1289)

2016-12-25 01:11:09 +02:00

tables

Fixing hides and accessories/custom loadout changes (#1404)

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

telesci

More computer sprite fixes and central command map (#1352)

2016-12-31 04:17:28 +02:00

vehicles

Syndicate borg rework and general fixes (#1275)

2016-12-23 20:16:23 +02:00

ventcrawl

Bayport - welded scrubbers (#1160)

2016-12-21 21:46:13 +02:00

virus2

Fix species radiation multipliers (#1325)

2016-12-28 01:15:20 +02:00

web_interface

Porting Apollo Infractions Computer (#1033)

2016-12-23 01:00:04 +02:00

wireless

…

xgm

…