skull132 9bca1343ae Merge: death and respawn (#1318) ...

Fixes #1314 .
Fixes a runtime error from setting time of deaths.
Fixes #1309 
Fixes #1312

2016-12-26 17:31:23 +02:00

..

acting

…

admin

Computer tweaks (#1285)

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

alarm

…

antag_contest

Antag Contest Update (#1029)

2016-10-02 23:11:53 +03:00

assembly

Merge branch 'development-2' into development

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

awaymissions

…

blob

…

cargo

Compile time safety for cargo stock (#1302)

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

cciaa

Bugfixes: Fax machines, CentCom turrets, Robo-limb emag. New feature for monkey cubes (#1116)

2016-11-06 20:34:29 +02:00

client

More Merge Fixes (#1304)

2016-12-26 02:34:29 +02:00

clothing

Detective gear fixes (#1311)

2016-12-26 01:44:10 +02:00

customitems

Attack Proc fixes (#1259)

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

detectivework

Attack Proc fixes (#1259)

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

economy

Merge branch 'development-2' into development

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

events

Cargo. Event, Holder fixes (#1253)

2016-12-21 21:39:22 +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

Syndicate borg spawner upgrade (#11)

2016-11-19 18:55:21 +02:00

holodeck

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

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

http

BOREALIS 2 Implementation (#938)

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

hydroponics

Vaurca Update Dec2016 (#1289)

2016-12-25 01:11:09 +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

Attack Proc fixes (#1259)

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

lighting

Merge branch 'development-2' into development

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

liquid

…

maps

…

materials

Merge branch 'development-2' into development

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

mining

Merge branch 'development-2' into development

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

mob

Merge: death and respawn (#1318)

2016-12-26 17:31:23 +02:00

modular_computers

Nightmode Fixes (#1293)

2016-12-25 20:10:46 +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

Unathi alt language and more fixes (#1299)

2016-12-25 20:51:15 +02:00

overmap

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

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

paperwork

Computer tweaks (#1285)

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

power

Minor Nightmode Fixes (#1305)

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

projectiles

Unathi alt language and more fixes (#1299)

2016-12-25 20:51:15 +02:00

random_map

Compile errors round 2 by Alberyk (#3)

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

reagents

Vaurca Update Dec2016 (#1289)

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

recycling

Merge branch 'development-2' into development

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

research

Computer tweaks (#1285)

2016-12-25 14:19:50 +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

Merge branch 'development-2' into development

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

supermatter

Mouse Skeletons (#1279)

2016-12-23 20:52:27 +02:00

surgery

Vaurca Update Dec2016 (#1289)

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

tables

Merge branch 'development-2' into development

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

telesci

Some bug fixes (#5)

2016-10-17 11:09:23 +03: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

Porting Apollo Infractions Computer (#1033)

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

web_interface

Porting Apollo Infractions Computer (#1033)

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

wireless

…

xgm

…