skull132 b20032ea25 Merge branch 'master' into development

2017-01-23 15:52:13 -05:00

..

acting

…

admin

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

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

alarm

…

antag_contest

Fixing Airlocks (#1546)

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

assembly

Mousetrap, mouse and spawning fixes (#1497)

2017-01-11 22:40:30 +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

Fixes no client passed to delete_character_sql() (#1570)

2017-01-14 20:57:28 +02:00

clothing

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

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

customitems

Fix a ligger's broken cane (#1584)

2017-01-15 23:51:35 +02:00

detectivework

Printing Fixes (#1476)

2017-01-09 00:44:42 +02:00

economy

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

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

events

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

2017-01-20 19:23:04 +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

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

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

genetics

…

ghosttrap

Mousetrap, mouse and spawning fixes (#1497)

2017-01-11 22:40:30 +02:00

holodeck

Miscellaneous bugfixes (#1385)

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

http

BOREALIS 2 Implementation (#938)

2016-09-18 23:28:01 +03:00

hydroponics

Nar-Nar and Blob Fixes (#1569)

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

icon generation

Travis: Indentation / list fixes (#1254)

2016-12-19 16:40:52 +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

Reduce server freezes during large explosions (#1326)

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

liquid

…

maps

…

materials

Merge branch 'master' into development

2017-01-23 15:52:13 -05:00

mining

Fixes blobs and other stuff (#1513)

2017-01-11 22:24:39 +02:00

mob

Merge branch 'master' into development

2017-01-23 15:52:13 -05:00

modular_computers

Computer manager and more (#1406)

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

multiz

Merge branch 'development-2' into development

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

nano

Minor Nightmode Fixes (#1305)

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

organs

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

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

overmap

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

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

paperwork

Tray, paper bin and bottle fixes (#1631)

2017-01-23 23:41:33 +02:00

power

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

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

projectiles

Merge branch 'master' into development

2017-01-23 15:52:13 -05:00

random_map

Compile errors round 2 by Alberyk (#3)

2016-10-15 21:53:09 +03:00

reagents

Tray, paper bin and bottle fixes (#1631)

2017-01-23 23:41:33 +02:00

recycling

Gripper overhaul + New borg sprites (#1518)

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

research

Gripper overhaul + New borg sprites (#1518)

2017-01-13 00:07:18 +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

Nar-Nar and Blob Fixes (#1569)

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

supermatter

Reduce server freezes during large explosions (#1326)

2016-12-28 01:16:30 +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

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

Automatic pistol, nutriment and sprites fixes (#1617)

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

web_interface

Porting Apollo Infractions Computer (#1033)

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

wireless

…

xgm

…