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

..

beds_chairs

Makes burn_state use defines

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

crates_lockers

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

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

transit_tubes

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

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

ai_core.dm

Adds AI card tgui

2016-01-24 12:52:31 +01:00

artstuff.dm

Makes burn_state use defines

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

barsigns.dm

…

bedsheet_bin.dm

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

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

displaycase.dm

…

door_assembly.dm

Line ending apocalypse

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

dresser.dm

…

electricchair.dm

removes argument that did not need to be specified

2015-12-30 09:34:42 +01:00

extinguisher.dm

…

false_walls.dm

Icon states for false walls

2015-12-25 06:19:24 +00:00

fireaxe.dm

…

flora.dm

Volcanic rocks

2015-12-15 23:31:14 -06:00

girders.dm

Added passflag checking for A*.

2016-01-30 13:51:52 +01:00

grille.dm

Added passflag checking for A*.

2016-01-30 13:51:52 +01:00

guncase.dm

…

hivebot.dm

…

janicart.dm

Can put mop in janicart when dry

2016-01-07 11:02:06 -05:00

kitchen_spike.dm

Meat spike

2015-12-31 12:50:05 -06:00

ladders.dm

…

lattice.dm

…

mineral_doors.dm

Makes burn_state use defines

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

mirror.dm

Maybe now it'll compile?

2016-01-10 01:58:44 -05:00

mop_bucket.dm

…

morgue.dm

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

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

musician.dm

Get the code running on 510

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

noticeboard.dm

…

plasticflaps.dm

* Generalized AStar check for objects preventing passability

2016-01-16 15:27:31 +01:00

reflector.dm

Corrected syntax error

2016-01-16 18:19:06 -05:00

safe.dm

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

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

showcase.dm

…

signs.dm

Makes burn_state use defines

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

spirit_board.dm

…

statues.dm

i did things

2015-12-15 16:46:24 -05:00

table_frames.dm

Makes burn_state use defines

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

tables_racks.dm

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

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

tank_dispenser.dm

Rename get_ui_data -> ui_data, remove useless shuffle from wires

2016-02-05 17:09:40 -06:00

target_stake.dm

…

watercloset.dm

- you now only see turfs when inside gas pipes.

2016-02-04 00:33:16 +01:00

windoor_assembly.dm

…

window.dm

Merge pull request #14669 from xxalpha/shingles

2016-01-17 17:30:57 -03:00