Lohikar a13f3d9f7d Merge master into map-development

2017-03-21 18:28:39 -05:00

..

acting

…

admin

Wizard blade, loadout and general dev tweaks (#1905)

2017-03-19 00:05:25 +02:00

alarm

…

antag_contest

Event locker fixes (#1851)

2017-03-01 23:15:18 +02:00

assembly

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

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

awaymissions

Merge with development

2017-03-04 15:58:56 -06:00

blob

Nar-Nar and Blob Fixes (#1569)

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

cargo

Wizard blade, loadout and general dev tweaks (#1905)

2017-03-19 00:05:25 +02:00

cciaa

Fix the ccia headset having the wrong key (#1759)

2017-02-12 19:07:46 +02:00

client

Merge master into map-development

2017-03-21 18:28:39 -05:00

clothing

Merge master into map-development

2017-03-21 18:28:39 -05:00

customitems

Custom items 15/03 (#1925)

2017-03-18 00:33:24 +02:00

detectivework

Fixes (#1943)

2017-03-20 08:13:17 +02:00

economy

Code Cleanup: Destroy() fixes part 1 + Misc Fixes (#1933)

2017-03-18 23:06:24 +02:00

effects

do_after progress bars (#1857)

2017-03-05 22:03:59 +02:00

events

Merge master into map-development

2017-03-21 18:28:39 -05:00

examine

…

ext_scripts

…

flufftext

Computer tweaks (#1285)

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

food

Cooking and Reagent Fixes(#1953)

2017-03-21 06:50:40 +02:00

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

Simpler lighting process, bug fixes, & modular computer tweaks (#1809)

2017-02-24 20:24:31 +02:00

http

Swap memos to be Discord pins instead (#1382)

2017-03-19 21:07:29 +02:00

hydroponics

Mining chargers, fruit slices, windoors (#1897)

2017-03-18 20:04:13 +02:00

intern

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00

law

Porting Apollo Infractions Computer (#1033)

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

library

Fix two SQL errors (#1424)

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

lighting

Lighting fixes (#1952)

2017-03-21 06:51:21 +02:00

liquid

…

maps

Lighting Overhaul & General process improvements (#1612)

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

materials

Merge master into map-development

2017-03-21 18:28:39 -05:00

mining

Merge master into map-development

2017-03-21 18:28:39 -05:00

mob

Merge master into map-development

2017-03-21 18:28:39 -05:00

modular_computers

Computer dark visibility tweaks (#1829)

2017-03-05 22:28:11 +02:00

multiz

Bugfix Bonanza + Z-code and stuff. (#1819)

2017-02-22 14:42:49 -05:00

nano

Nuke 17 useless files (#1653)

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

organs

Merge branch 'master' into development

2017-03-19 21:08:28 +02:00

overmap

Machinery performance tweaks (#1744)

2017-02-15 22:07:47 +02:00

paperwork

RnD & Cat fixes (#1913)

2017-03-12 12:18:58 +02:00

power

Merge master into map-development

2017-03-21 18:28:39 -05:00

projectiles

Additional Pylons (#1870)

2017-03-19 00:06:36 +02:00

random_map

Improve asteroid generation performance

2017-03-04 15:45:01 -06:00

reagents

Cooking and Reagent Fixes(#1953)

2017-03-21 06:50:40 +02:00

recycling

Gripper overhaul + New borg sprites (#1518)

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

research

Wizard blade, loadout and general dev tweaks (#1905)

2017-03-19 00:05:25 +02:00

scripting

…

security levels

Nightmode Fixes (#1293)

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

shieldgen

Spark Fixes (#1764)

2017-02-14 14:37:16 +02:00

shuttles

Spawning at the Odin (#1762)

2017-02-14 11:52:48 +02:00

spells

Animal Sleeping and Familiars (#1881)

2017-03-19 00:24:38 +02:00

supermatter

Code Cleanup: Destroy() fixes part 1 + Misc Fixes (#1933)

2017-03-18 23:06:24 +02:00

surgery

Tech Fixes: (#1888)

2017-03-12 11:52:33 +02:00

tables

Spark Fixes (#1764)

2017-02-14 14:37:16 +02:00

telesci

RnD & Cat fixes (#1913)

2017-03-12 12:18:58 +02:00

vehicles

Spark Fixes (#1764)

2017-02-14 14:37:16 +02:00

ventcrawl

Bayport - welded scrubbers (#1160)

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

virus2

Machinery performance tweaks (#1744)

2017-02-15 22:07:47 +02:00

web_interface

Porting Apollo Infractions Computer (#1033)

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

wireless

…

xgm

…