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

..

grenades

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

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

implants

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

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

melee

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

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

storage

Merge pull request #15098 from KazeEspada/BLOWINGSAFE

2016-02-03 21:58:03 -03:00

tanks

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

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

AI_modules.dm

Merge Conflict Fix

2016-01-20 14:07:14 +02:00

airlock_painter.dm

…

cards_ids.dm

Changes relatives paths into absolute paths and makes some if()'s better

2016-01-17 01:36:56 +02:00

chrono_eraser.dm

associative list

2015-12-29 13:33:12 -06:00

cigs_lighters.dm

…

clown_items.dm

- you now only see turfs when inside gas pipes.

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

cosmetics.dm

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

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

courtroom.dm

…

defib.dm

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

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

dice.dm

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

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

dna_injector.dm

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

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

explosives.dm

Storage items now drop loot upon destruction.

2016-01-31 13:01:36 -07:00

extinguisher.dm

Buffs Dihydrogen monoxide

2016-01-01 15:17:29 +01:00

flamethrower.dm

Merge conflict fix

2016-01-17 19:15:30 +02:00

gift_wrappaper.dm

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

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

handcuffs.dm

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

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

janisigns.dm

…

kitchen.dm

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

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

manuals.dm

…

mop.dm

…

paint.dm

…

paiwire.dm

…

pneumaticCannon.dm

removes a bunch of unneeded spawns

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

RCD.dm

…

RPD.dm

Merge Conflict Fix

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

RSF.dm

…

scrolls.dm

…

shields.dm

crying

2015-12-26 23:19:19 -06:00

signs.dm

…

singularityhammer.dm

removes a bunch of unneeded spawns

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

stunbaton.dm

Some assembly requaired

2016-01-26 02:43:08 +03:00

teleportation.dm

Merge conflict fix

2016-01-17 19:15:30 +02:00

teleprod.dm

…

tools.dm

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

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

twohanded.dm

Changes relatives paths into absolute paths and makes some if()'s better

2016-01-17 01:36:56 +02:00

vending_items.dm

…

weaponry.dm

Some assembly requaired

2016-01-26 02:43:08 +03:00