PsiOmega 173f0527eb Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/nano/nanomanager.dm
	code/modules/surgery/surgery.dm

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

..

admin

Increased check_rights flexibility.

2015-03-01 15:29:17 +01: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 pull request #8179 from comma/undies

2015-02-20 17:01:25 +10:30

clothing

Hardsuit tweaks

2015-02-28 14:04:53 -05: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

Merge with dev.

2015-02-05 20:24:06 +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

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

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 remote-tracking branch 'upstream/master' into dev-freeze

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

nano

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

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

organs

Alternative fix for golem damage.

2015-02-28 17:08:30 +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

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

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

projectiles

Hardsuit tweaks

2015-02-28 14:04:53 -05:00

random_map

Merge with dev.

2015-02-05 20:24:06 +10:30

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

Merge pull request #8288 from mwerezak/topicfix

2015-02-26 16:28:56 +10:30

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

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

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