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

..

camera

…

dead

Merge conflic fix

2016-01-03 14:51:14 -08:00

living

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

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

new_player

Removes gender restrictions from socks.

2015-12-30 20:53:40 -05:00

death.dm

…

interactive.dm

removes a bunch of unneeded spawns

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

inventory.dm

Refactor using slot_equipment_priority

2015-12-29 17:59:56 +04:00

login.dm

Patch for byond bug id:1905199

2016-01-01 18:46:17 -08:00

logout.dm

NanoUI is now 'tgui'

2016-01-01 17:47:44 -06:00

mob_cleanup.dm

…

mob_defines.dm

Leap Icon

2016-01-03 00:47:09 -06:00

mob_grab.dm

…

mob_helpers.dm

Support IE8

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

mob_movement.dm

Merge pull request #14450 from AnturK/mechboots

2016-01-08 07:14:46 -06:00

mob_transformation_simple.dm

…

mob.dm

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

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

say_readme.dm

…

say.dm

…

transform_procs.dm

Replaces malf with traitor AI

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

update_icons.dm

…