PsiOmega 66c56926d0 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/gamemodes/cult/runes.dm

2015-04-08 10:40:38 +02:00

..

admin

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

2015-04-08 10:40:38 +02: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

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

2015-04-08 10:40:38 +02:00

clothing

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

2015-04-05 05:23:14 +03:00

customitems

Adds Andrewmeythaler's custom item.

2015-03-17 22:19:13 -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

EFTPOS scanners now work with IDs in PDAs and wallets

2015-04-07 22:09:11 +10:00

events

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

2015-04-03 09:22:23 +02:00

examine

Fixes #8439.

2015-03-13 23:27:35 +01: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

Makes holo objs slightly transparent

2015-03-27 10:32:41 -04:00

hydroponics

Adds weedkiller smoke checks to hydro trays and spreading plants.

2015-04-01 07:25:09 -07:00

icon generation

…

library

…

liquid

…

maps

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

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

mining

Fixed #8602

2015-03-30 21:59:50 +03:00

mob

Offhand gun doesn't decrease probability of accidental shot now.

2015-04-05 05:29:04 +03:00

nano

Station alert monitor should now only react to major alarms.

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

organs

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

2015-03-16 12:37:43 +01:00

overmap

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

2015-03-13 09:31:03 +01:00

paperwork

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

2015-04-08 10:40:38 +02:00

power

Merge pull request #8469 from mwerezak/robot-emp

2015-03-26 19:00:39 +10:30

projectiles

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

2015-04-05 05:23:14 +03:00

random_map

…

reagents

Adds weedkiller smoke checks to hydro trays and spreading plants.

2015-04-01 07:25:09 -07:00

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

Rebalanced xenoflora sprites, fixed numerous issues.

2015-03-22 16:13:15 +10:30

vehicles

…

virus2

Master into dev-freeze.

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