volas e4e8ef3392 Merge remote-tracking branch 'upstream/dev' into admin_stuff ...

Conflicts:
	code/modules/admin/admin_verbs.dm

2015-03-09 18:11:10 +03:00

..

admin

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

2015-03-09 18:11:10 +03:00

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

Master into dev-freeze.

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

clothing

Updates storage costs

2015-03-05 10:40:25 -05:00

customitems

…

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

Refactors some job variables from the Economy file (what the fuck) and swaps created types for lists in bot access assignment.

2015-02-28 20:20:19 +10:30

events

Merge pull request #8374 from Baystation12/dev-freeze

2015-03-07 12:05:32 +10:30

examine

Fixes some misc examine bugs.

2015-02-24 07:42:06 -05:00

ext_scripts

…

flufftext

Fixes captain's laser gun

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

food

…

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 and adjustments

2015-03-04 11:18:40 -05:00

icon generation

…

library

…

liquid

…

maps

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

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

mining

Updates storage costs

2015-03-05 10:40:25 -05:00

mob

Merge pull request #8387 from PsiOmegaDelta/ChangeAppearance

2015-03-09 13:42:19 +03:00

nano

Merge pull request #8387 from PsiOmegaDelta/ChangeAppearance

2015-03-09 13:42:19 +03: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 #8322.

2015-03-01 15:21:15 +01:00

power

Projectile effects - Part 3

2015-03-09 22:17:34 +13:00

projectiles

Projectile effects - Part 3

2015-03-09 22:17:34 +13:00

random_map

…

reagents

Updates storage costs

2015-03-05 10:40:25 -05:00

recycling

…

research

Updates storage costs

2015-03-05 10:40:25 -05:00

scripting

…

security levels

…

shieldgen

…

shuttles

Cleans up access handling.

2015-03-02 18:55:03 +01:00

supermatter

…

surgery

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

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

vehicles

…

virus2

Master into dev-freeze.

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