PsiOmega 659b07415d Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/machinery/rechargestation.dm
	code/game/mecha/equipment/tools/medical_tools.dm
 	maps/exodus-1.dmm

2015-07-26 10:00:12 +02:00

..

admin

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

2015-07-26 10:00:12 +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

Merge pull request #10259 from mwerezak/rig-module-fix

2015-07-22 10:45:21 +09:30

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

Updated ashtrays and mineral doors.

2015-05-17 03:02:03 +09:30

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

New tables, code section. Changelog entry soon.

2015-05-13 19:08:39 +01:00

hydroponics

Fixes #10054, fixes some mushroom issues.

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

icon generation

…

library

Renamed knives.

2015-05-16 20:54:34 +09:30

lighting

Lighting: The sanicing

2015-07-21 15:58:39 +02: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 pull request #10135 from Kelenius/ofBorgsAndShakers

2015-07-23 21:41:48 +03:00

nano

Fixes #10267.

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

organs

Tweak/refactor external organ droplimb mechanics

2015-07-10 00:14:35 -04:00

overmap

…

paperwork

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

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

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

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

2015-07-26 10:00:12 +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

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

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

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

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