PsiOmegaDelta 6b01a67c50 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/nano/interaction/default.dm

2015-08-05 09:16:50 +02:00

..

admin

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

2015-08-05 09:16:50 +02:00

alarm

…

assembly

…

awaymissions

…

client

revert chargen rendering rework

2015-08-01 11:35:53 +01:00

clothing

Merge pull request #10388 from mwerezak/light-suit

2015-08-02 01:13:46 +09:30

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

Fixes #10409.

2015-08-03 10:15:24 +02:00

liquid

…

maps

…

materials

Fixes #9740

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

mining

fixes #10141

2015-07-27 10:49:51 +01:00

mob

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

2015-08-05 09:16:50 +02:00

nano

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

2015-08-05 09:16:50 +02:00

organs

More tweaks to cut wound stages.

2015-07-30 11:46:49 -04:00

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

Fixes projectiles being able to hit humans in organs they do not have.

2015-07-28 20:23:26 -04:00

random_map

…

reagents

Compilation fixes.

2015-07-30 10:41:01 +02:00

recycling

Fix for invisible tagger pipes

2015-07-30 12:37:10 +03: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