Zuhayr b5419a1673 Merge pull request #8443 from Baystation12/master ...

Master into dev-freeze.

2015-03-11 19:37:19 +10:30

..

admin

Master into dev-freeze.

2015-03-07 11:33:39 +10:30

alarm

Fixes camera network changes not always being reflected in camera consoles.

2015-02-25 19:50:07 +01:00

assembly

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

awaymissions

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-03-05 08:05:44 +01:00

client

Adds custom item for Von2531

2015-03-09 16:57:10 -04:00

clothing

Merge pull request #8419 from mwerezak/blazer

2015-03-10 07:11:18 +01:00

customitems

Merge remote-tracking branch 'upstream/dev' into runtime

2015-02-22 21:13:20 -05:00

detectivework

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

economy

…

events

Master into dev-freeze.

2015-03-07 11:33:39 +10:30

examine

I shouldn't proofread when sleep deprived.

2015-03-10 10:55:14 -04:00

ext_scripts

…

flufftext

Fixes captain's laser gun

2015-02-25 23:35:20 -05:00

food

Removing unused and now uncompilable distillery code.

2015-02-21 22:37:53 +10:30

games

…

genetics

…

holodeck

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

hydroponics

Fixes hydroponics update_icon() runtime.

2015-03-10 08:16:20 +01:00

icon generation

…

library

…

liquid

…

maps

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-03-05 08:05:44 +01:00

mining

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

mob

Merge pull request #8443 from Baystation12/master

2015-03-11 19:37:19 +10:30

nano

Station alert monitor should now only react to major alarms.

2015-03-08 17:58:48 +01:00

organs

Master into dev-freeze.

2015-03-07 11:33:39 +10:30

overmap

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-02-27 09:06:48 +01:00

paperwork

Fixes photocopier runtime

2015-03-09 12:12:31 -04:00

power

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-02-27 09:06:48 +01:00

projectiles

Robot code clean up and fixes.

2015-03-10 13:37:20 +01:00

random_map

…

reagents

Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze

2015-02-28 17:04:22 +10:30

recycling

Merge master into dev.

2015-02-12 23:01:08 +10:30

research

Fixes xenoarch runtime

2015-03-09 12:20:08 -04:00

scripting

…

security levels

…

shieldgen

…

shuttles

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

supermatter

Changed supermatter engine manual for thermoelectric engine.

2015-02-15 22:16:36 +08:00

surgery

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-03-05 08:05:44 +01:00

vehicles

New bullet types, projectile rewrite

2015-02-06 20:09:32 -05:00

virus2

Master into dev-freeze.

2015-03-07 11:33:39 +10:30