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

..

shuttles

Fixes cult teleport centcom exploit.

2016-01-06 11:41:07 -08:00

air.dm

Fixes gas overlays using turf color

2016-01-02 16:16:42 +01:00

assets.dm

Subsystem display tweaks

2015-12-05 10:13:59 -06:00

diseases.dm

Replaces the Cut() usage in the processing lists from the different controllers for a Remove()

2015-08-18 06:52:57 -03:00

events.dm

Changes event fire rate from 5-15 minutes to 3-10 minutes

2015-11-25 13:56:45 -08:00

garbage.dm

Adds qdel() debug logging for testing

2015-12-22 21:33:49 -03:00

jobs.dm

Replaces malf with traitor AI

2015-12-18 00:05:30 -06:00

lighting.dm

Subsystem display tweaks

2015-12-05 10:13:59 -06:00

machines.dm

Subsystem display tweaks

2015-12-05 10:13:59 -06:00

minimap.dm

Away Missions

2015-12-21 07:12:30 -06:00

mobs.dm

Subsystem display tweaks

2015-12-05 10:13:59 -06:00

npcpool.dm

Subsystem display tweaks

2015-12-05 10:13:59 -06:00

objects.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

pai.dm

Ghost popup part 2: The didn't do much-a-ning

2015-12-31 01:54:15 -08:00

radio.dm

radio_controller -> SSradio, SSbp -> SSnpc

2015-12-04 22:25:24 -06:00

server_maintenance.dm

radio_controller -> SSradio, SSbp -> SSnpc

2015-12-04 22:25:24 -06:00

shuttles.dm

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

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

sun.dm

…

tgui.dm

Clean some old comments

2016-01-04 12:22:22 -06:00

ticker.dm

Removes a bunch of sleep(-1) and spawn(-1) from the code

2016-01-04 15:17:12 -08:00

timer.dm

removes a bunch of unneeded spawns

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

voting.dm

Merge pull request #11155 from Niknakflak/Restart_votes_Restriction

2015-08-19 19:07:38 +10:00