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

Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
This commit is contained in:
phil235
2016-04-26 21:49:51 +02:00
committed by phil235
85 changed files with 1093 additions and 5082 deletions
@@ -694,4 +694,9 @@
description = "Fluorosulfuric acid is a an extremely corrosive chemical substance."
color = "#8E18A9" // rgb: 142, 24, 169
toxpwr = 2
acidpwr = 20
acidpwr = 42.0
/datum/reagent/toxin/acid/fluacid/on_mob_life(mob/living/M)
M.adjustFireLoss(current_cycle/10, 0) // I rode a tank, held a general's rank
. = 1 // When the blitzkrieg raged and the bodies stank
..() // Pleased to meet you, hope you guess my name