Merge remote-tracking branch 'upstream/master' into cash

code/game/objects/items/devices/flashlight.dm

@@ -93,6 +93,20 @@
 	brightness_on = 2
 	w_class = 1
 
+/obj/item/device/flashlight/maglight
+	name = "maglight"
+	desc = "A very, very heavy duty flashlight."
+	icon_state = "maglight"
+	item_state = "maglight"
+	force = 10
+	flags = CONDUCT
+	brightness_on = 4
+	slot_flags = SLOT_BELT
+	w_class = 2
+	attack_verb = list ("smacked", "thwacked", "thunked")
+	matter = list(DEFAULT_WALL_MATERIAL = 200,"glass" = 50)
+	hitsound = "swing_hit"
+
 /obj/item/device/flashlight/drone
 	name = "low-power flashlight"
 	desc = "A miniature lamp, that might be used by small robots."

code/game/objects/items/weapons/cigs_lighters.dm

@@ -195,6 +195,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		text = replacetext(text, "FLAME", "[W.name]")
 		light(text)
 
+/obj/item/clothing/mask/smokable/attack(var/mob/living/M, var/mob/living/user, def_zone)
+	if(istype(M) && M.on_fire)
+		user.do_attack_animation(M)
+		light("<span class='notice'>[user] coldly lights the [name] with the burning body of [M].</span>")
+		return 1
+	else
+		return ..()
+
 /obj/item/clothing/mask/smokable/cigarette
 	name = "cigarette"
 	desc = "A roll of tobacco and nicotine."

code/game/objects/items/weapons/storage/belt.dm

@@ -53,7 +53,8 @@
 		/obj/item/weapon/material/minihoe,
 		/obj/item/weapon/material/hatchet,
 		/obj/item/device/analyzer/plant_analyzer,
-		/obj/item/weapon/extinguisher/mini
+		/obj/item/weapon/extinguisher/mini,
+		/obj/item/device/flashlight/maglight
 		)