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

..

SDQL2

Removes comment that is no longer needed

2016-01-02 20:04:54 -08:00

adminhelp.dm

Hotfix for SStimer lag

2015-12-02 21:23:45 -05:00

adminjump.dm

R&D and Misc Fixes/Tweaks

2015-11-14 13:35:05 -03:00

adminpm.dm

…

adminsay.dm

Changes asay and dsay logging so they are seperate logging types.

2015-11-03 20:07:55 -08:00

atmosdebug.dm

Removes in world

2015-10-09 22:37:53 -05:00

bluespacearty.dm

…

BrokenInhands.dm

…

buildmode.dm

Adds subtypesof(). It's shorthand for typesof(path) - path.

2015-11-16 18:55:57 -05:00

cinematic.dm

…

deadsay.dm

Changes asay and dsay logging so they are seperate logging types.

2015-11-03 20:07:55 -08:00

debug.dm

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

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

diagnostics.dm

fixes associative list; adds gas_overlay to "datum gases"

2015-12-29 22:50:09 -06:00

fps.dm

Refactor mob movement delay calculation

2015-10-29 05:15:41 -07:00

getlogs.dm

makes .getruntimelog point to correct dir

2015-08-28 22:20:14 +10:00

machine_upgrade.dm

…

manipulate_organs.dm

Adds subtypesof(). It's shorthand for typesof(path) - path.

2015-11-16 18:55:57 -05:00

map_template_loadverb.dm

smarter extension detection

2015-12-23 20:34:31 +00:00

mapping.dm

Line ending apocalypse

2015-12-17 14:12:37 +13:00

maprotation.dm

choosen -> chosen

2015-10-06 21:50:19 -07:00

massmodvar.dm

optimization

2015-12-04 15:54:29 +11:00

modifyvariables.dm

adds on_varedit proc

2015-11-27 17:43:43 +11:00

one_click_antag.dm

Fixes create revolutionares bugs

2015-12-31 04:19:32 -03:00

onlyone.dm

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

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

panicbunker.dm

…

playsound.dm

Saving the data collecting

2015-09-25 22:52:30 +03:00

possess.dm

…

pray.dm

…

randomverbs.dm

Merge pull request #13800 from KorPhaeron/voices

2015-12-21 03:16:31 -03:00

reestablish_db_connection.dm

…

tripAI.dm

…