PsiOmegaDelta 0bf3c39095 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

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

2015-07-28 07:59:49 +02:00

..

admin

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

2015-07-28 07:59:49 +02:00

alarm

…

assembly

…

awaymissions

…

client

Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze.

2015-07-14 05:19:01 +09:30

clothing

Fixes #9326

2015-07-26 14:57:49 -04:00

customitems

Merge pull request #10046 from mwerezak/custom-item-icons

2015-07-09 20:52:38 +03:00

detectivework

…

economy

…

events

Removed the last few references to MODE, fixed some oversights with player_is_antag().

2015-07-14 05:19:00 +09:30

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

…

hydroponics

Fixes #10054, fixes some mushroom issues.

2015-07-09 04:25:36 +09:30

icon generation

…

library

…

lighting

make lighting falloff a macro and optimize turfs-in-view

2015-07-22 16:22:28 +01:00

liquid

…

maps

…

materials

Fixes #9740

2015-07-09 03:40:26 +09:30

mining

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

2015-07-14 08:11:11 +02:00

mob

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

2015-07-28 07:59:49 +02:00

nano

Fixes #10267.

2015-07-25 13:30:25 +02:00

organs

Readds config option to disable organ decay.

2015-07-27 15:30:38 +09:30

overmap

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

2015-07-28 07:59:49 +02:00

paperwork

…

power

Merge pull request #10239 from mwerezak/lighting-fix

2015-07-19 20:13:55 +09:30

projectiles

Merge pull request #10187 from Baystation12/master

2015-07-15 16:10:13 +09:30

random_map

…

reagents

More #10285 fixes.

2015-07-26 10:46:58 +02:00

recycling

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

2015-07-11 09:51:24 +02:00

research

Fixes #10170.

2015-07-18 22:51:20 +02:00

scripting

…

security levels

…

shieldgen

…

shuttles

Adds lights to ERT shuttle, ERT ready light

2015-07-12 18:41:24 -04:00

spells

Revert "get rid of mob.see_in_dark and species.darksight"

2015-07-22 15:14:40 +01:00

supermatter

…

surgery

…

tables

Fixes #8161

2015-07-15 16:34:05 +03:00

vehicles

Cargo train vs projectiles

2015-07-11 02:16:17 +12:00

virus2

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

2015-07-10 12:57:46 +02:00