duncathan 9066bc7c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos ...

Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract

2016-01-13 20:07:21 -06:00

..

admin

Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos

2016-01-13 20:07:21 -06:00

assembly

Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos

2016-01-13 20:07:21 -06:00

awaymissions

Merge pull request #14513 from KorPhaeron/why

2016-01-09 12:39:23 -03:00

client

Merge pull request #14395 from MrStonedOne/nomoreminus1

2016-01-05 22:16:17 -06:00

clothing

Helmets

2016-01-08 08:15:46 -06:00

crafting

Lizard hats

2015-12-29 13:01:13 -06:00

detectivework

…

emoji

…

events

Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos

2016-01-13 20:07:21 -06:00

flufftext

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00

food&drinks

- Refactor the visible_message() proc to be much faster.

2016-01-04 22:49:27 +01:00

games

- Refactor the visible_message() proc to be much faster.

2016-01-04 22:49:27 +01:00

holiday

Simple animals no longer convert other damage types to brute using the brute damage proc, allowing you to make mobs immune to brute but not all damage types.

2016-01-04 15:29:23 -05:00

holodeck

Merge pull request #13996 from AnturK/fixfixfix

2015-12-26 10:23:21 -03:00

html_interface

Fixed 'in' precedence errors.

2015-12-29 17:16:09 -07:00

hydroponics

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00

json

Revert "Make JSON.stringify encode numbers properly"

2015-12-27 15:45:48 -06:00

library

Sneaks in a new book sprite that's totally white colored, no blue dot.

2015-12-29 16:01:14 -05:00

lighting

Entirely area based

2015-12-24 03:50:27 -06:00

mining

Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos

2016-01-13 20:07:21 -06:00

mob

Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos

2016-01-13 20:07:21 -06:00

ninja

Revert "Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework"

2016-01-07 23:15:35 -03:00

paperwork

Detectives camera is now a subtype. Changed maps to have the subtype instead of the modified regular camera.

2016-01-03 07:36:12 -05:00

power

Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos

2016-01-13 20:07:21 -06:00

procedural mapping

Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos

2016-01-13 20:07:21 -06:00

projectiles

Merge pull request #14501 from KorPhaeron/clips

2016-01-08 18:12:52 -03:00

reagents

Merge pull request #14578 from neersighted/chem_fix

2016-01-12 02:58:41 -06:00

recycling

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00

research

Exploit/Runtime protection

2016-01-11 10:18:00 -06:00

ruins

…

security levels

…

shuttle

Adds a variable to block shuttles from changing destinations midflight for mining shuttle

2016-01-09 17:44:16 +01:00

space transition

…

surgery

Merge pull request #14159 from somnium13/fix-in-prec

2015-12-30 22:38:13 -03:00

telesci

…

tgui

Fix state checks

2016-01-12 21:55:37 -06:00

tooltip

Updates tooltip colors

2016-01-01 05:25:22 -05:00

vehicles

Formalises Path Compatibility

2015-12-28 22:20:33 +00:00