PsiOmega ce30b00287 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/setup.dm
	icons/mob/items_righthand.dmi
	maps/exodus-1.dmm
	maps/exodus-5.dmm

2015-03-13 09:23:26 +01:00

..

admin

Changes to aooc

2015-03-09 22:59:52 +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

Adds custom item for Von2531

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

clothing

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

2015-03-13 09:23:26 +01: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

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

…

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

Updates storage costs

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

mob

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

2015-03-13 09:23:26 +01:00

nano

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

2015-03-13 09:23:26 +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

Projectile effects - Part 3

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

projectiles

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

2015-03-13 09:23:26 +01:00

random_map

…

reagents

Updates storage costs

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

recycling

…

research

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

2015-03-13 09:23:26 +01: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