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

Conflicts:
	code/_onclick/hud/alien.dm
	code/_onclick/hud/alien_larva.dm
	code/_onclick/hud/hud.dm
	code/_onclick/hud/human.dm
	code/_onclick/hud/monkey.dm
	code/_onclick/hud/other_mobs.dm
	code/_onclick/hud/robot.dm
	code/game/machinery/Sleeper.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/ai/login.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_defines.dm

2016-02-06 15:42:13 +01:00

..

SDQL2

Removes comment that is no longer needed

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

adminhelp.dm

Get the code running on 510

2016-02-04 17:19:40 -06:00

adminjump.dm

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

2016-02-04 14:34:45 +01:00

adminpm.dm

Fixes emoji issues to do with adminPM and OOC formatting

2016-01-31 12:57:43 -05:00

adminsay.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

atmosdebug.dm

Removes in world

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

bluespacearty.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

BrokenInhands.dm

…

buildmode.dm

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

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

cinematic.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

deadsay.dm

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

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

debug.dm

Get the code running on 510

2016-02-04 17:19:40 -06:00

diagnostics.dm

Merge Conflict Fix

2016-01-27 13:29:38 +02:00

fps.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

getlogs.dm

removes unnecessary file()

2016-01-27 22:18:38 +11: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

Fixes shuttles loading improperly in templates

2016-01-29 20:51:12 +01:00

mapping.dm

Makes "Show debug verbs" toggleable

2016-02-02 01:34:53 -02:00

maprotation.dm

choosen -> chosen

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

massmodvar.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

modifyvariables.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02: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

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

possess.dm

…

pray.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

randomverbs.dm

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

2016-02-04 14:34:45 +01:00

reestablish_db_connection.dm

…

tripAI.dm

…