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

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

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

detectivework

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00

economy

Fixes #9847

2015-06-20 22:15:38 +09:30

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

(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

…

holodeck

Fixes holodeck runtime.

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

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

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

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

2015-06-26 19:22:31 +02:00

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

Clean server start.

2015-04-18 15:32:25 +02:00

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

A deleted shield generator no longer runtime every tick until force-deleted.

2015-07-05 17:33:55 +02:00

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

Merge pull request #9992 from Baystation12/master

2015-07-02 19:00:00 +09:30

surgery

Fixes #9933

2015-06-25 23:59:12 +03:00

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