PsiOmega 889f399356 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/area/areas.dm
	code/game/machinery/alarm.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/reagents/Chemistry-Machinery.dm

2015-08-09 13:15:22 +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

Fixes #10314

2015-08-02 00:01:10 -04:00

customitems

…

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

Fixes holodeck runtime.

2015-08-05 09:33:34 +02:00

hydroponics

…

icon generation

…

library

…

lighting

Fixes #10409.

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

liquid

…

maps

…

materials

More material renames

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

mining

Fixes #10314

2015-08-02 00:01:10 -04:00

mob

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

2015-08-09 13:15:22 +02:00

nano

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

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

organs

Initial fixes

2015-08-08 11:10:28 -04:00

overmap

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

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

paperwork

…

power

Changes reinforced glass material name

2015-08-03 23:01:34 -04:00

projectiles

Fixes #10314

2015-08-02 00:01:10 -04:00

random_map

…

reagents

Fixes #10021

2015-08-08 11:38:27 -04:00

recycling

Crematorium Destroy()

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

research

Fixes not being able to insert a complete stack into the protolathe

2015-08-02 00:26:30 -04: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

More material renames

2015-08-07 17:10:35 -04: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