PsiOmega 3a08e2884a Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/structures/crates_lockers/largecrate.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/circuitprinter.dm

2015-08-15 10:52:17 +02:00

..

admin

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

2015-08-15 10:52:17 +02:00

alarm

…

assembly

…

awaymissions

…

client

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

2015-08-12 21:18:18 +02:00

clothing

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

2015-08-14 08:34:42 +02:00

customitems

Small tweaks to get rolldowns to work properly.

2015-08-09 17:01:07 +09:30

detectivework

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

2015-08-15 10:52:17 +02:00

economy

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

2015-08-11 08:34:46 +02:00

events

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

2015-08-11 18:47:05 +01:00

examine

Updates chameleon gun help text

2015-06-06 23:26:56 -04:00

ext_scripts

(probably) fixes an issue where the server hangs at roundstart if the IRC bot doesn't respond properly

2015-06-28 11:43:53 +01:00

flufftext

…

food

…

games

…

genetics

Fix gender issues, some typos from various files

2015-08-11 13:41:40 +03:00

ghosttrap

Fixes <span class='class>, makes Travis check it

2015-07-18 21:13:32 +01:00

holodeck

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

2015-08-12 21:18:18 +02:00

hydroponics

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

2015-08-12 21:18:18 +02:00

icon generation

…

library

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

2015-08-11 18:47:05 +01:00

lighting

Fixes #10409.

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

liquid

…

maps

…

materials

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

2015-08-13 09:01:10 +02:00

mining

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

2015-08-08 15:34:51 +02:00

mob

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

2015-08-15 10:52:17 +02:00

nano

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

2015-08-12 21:18:18 +02:00

organs

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

2015-08-13 09:01:10 +02:00

overmap

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

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

paperwork

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

2015-08-12 21:18:18 +02:00

power

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

2015-08-12 21:18:18 +02:00

projectiles

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

2015-08-11 18:47:05 +01:00

random_map

Refactored random map generator system and added several terrain generators.

2015-06-03 04:36:19 +09:30

reagents

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

2015-08-15 10:52:17 +02:00

recycling

Crematorium Destroy()

2015-08-06 08:39:24 +02:00

research

Fixes #10637

2015-08-14 23:34:24 -04:00

scripting

…

security levels

…

shieldgen

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

2015-07-06 18:33:09 +02:00

shuttles

Merge with dev.

2015-07-15 16:20:39 +09:30

spells

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

2015-08-14 08:34:42 +02:00

supermatter

Merge with dev-freeze.

2015-07-02 19:04:01 +09:30

surgery

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

2015-06-26 20:28:47 +02:00

tables

More material renames

2015-08-07 17:10:35 -04:00

vehicles

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

2015-07-11 10:58:49 +02:00

virus2

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

2015-08-14 08:34:42 +02:00

xgm

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

2015-06-26 20:28:47 +02:00