Merge branch 'master' of https://github.com/PolarisSS13/Polaris into parachute

# Conflicts:
#	icons/mob/back.dmi
#	icons/obj/storage.dmi

code/game/objects/items/weapons/grenades/flashbang.dm

@@ -16,10 +16,11 @@
 		for(var/mob/living/carbon/M in hear(7, get_turf(src)))
 			bang(get_turf(src), M)
 
-		for(var/obj/effect/blob/B in hear(8,get_turf(src)))       		//Blob damage here
+		for(var/obj/structure/blob/B in hear(8,get_turf(src)))       		//Blob damage here
 			var/damage = round(30/(get_dist(B,get_turf(src))+1))
-			B.health -= damage
-			B.update_icon()
+			if(B.overmind)
+				damage *= B.overmind.blob_type.burn_multiplier
+			B.adjust_integrity(-damage)
 
 		new/obj/effect/effect/sparks(src.loc)
 		new/obj/effect/effect/smoke/illumination(src.loc, 5, range=30, power=30, color="#FFFFFF")

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

@@ -81,7 +81,7 @@
 	msg_admin_attack("[key_name(user)] attempted to handcuff [key_name(H)]")
 	feedback_add_details("handcuffs","H")
 
-	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+	user.setClickCooldown(user.get_attack_speed(src))
 	user.do_attack_animation(H)
 
 	user.visible_message("<span class='danger'>\The [user] has put [cuff_type] on \the [H]!</span>")
@@ -286,7 +286,7 @@ var/last_chew = 0
 	msg_admin_attack("[key_name(user)] attempted to legcuff [key_name(H)]")
 	feedback_add_details("legcuffs","H")
 
-	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+	user.setClickCooldown(user.get_attack_speed(src))
 	user.do_attack_animation(H)
 
 	user.visible_message("<span class='danger'>\The [user] has put [cuff_type] on \the [H]!</span>")

code/game/objects/items/weapons/material/chainsaw.dm

@@ -0,0 +1,112 @@
+obj/item/weapon/chainsaw
+	name = "Chainsaw"
+	desc = "Vroom vroom."
+	icon_state = "chainsaw0"
+	var/on = 0
+	var/max_fuel = 20
+	w_class = ITEMSIZE_LARGE
+	slot_flags = SLOT_BACK
+	w_class = ITEMSIZE_LARGE
+	slot_flags = SLOT_BACK
+
+obj/item/weapon/chainsaw/New()
+	var/datum/reagents/R = new/datum/reagents(max_fuel)
+	reagents = R
+	R.my_atom = src
+	R.add_reagent("fuel", max_fuel)
+	..()
+
+obj/item/weapon/chainsaw/proc/turnOn()
+	if(on) return
+
+	visible_message("You start pulling the string on \the [src].", "[usr] starts pulling the string on the [src].")
+
+	if(max_fuel <= 0)
+		if(do_after(usr, 15))
+			to_chat(usr, "\The [src] won't start!")
+		else
+			to_chat(usr, "You fumble with the string.")
+	else
+		if(do_after(usr, 15))
+			visible_message("You start \the [src] up with a loud grinding!", "[usr] starts \the [src] up with a loud grinding!")
+			attack_verb = list("shreds", "rips", "tears")
+			playsound(src, 'sound/weapons/chainsaw_startup.ogg',40,1)
+			force = 55
+			edge = 1
+			sharp = 1
+			on = 1
+			update_icon()
+		else
+			to_chat(usr, "You fumble with the string.")
+
+obj/item/weapon/chainsaw/proc/turnOff()
+	if(!on) return
+	to_chat(usr, "You switch the gas nozzle on the chainsaw, turning it off.")
+	attack_verb = list("bluntly hit", "beat", "knocked")
+	playsound(src, 'sound/weapons/chainsaw_turnoff.ogg',40,1)
+	force = 10
+	edge = 0
+	sharp = 0
+	on = 0
+	update_icon()
+
+obj/item/weapon/chainsaw/attack_self(mob/user as mob)
+	if(!on)
+		turnOn()
+	else
+		turnOff()
+
+obj/item/weapon/chainsaw/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity)
+	if(!proximity) return
+	..()
+	if(on)
+		playsound(src, 'sound/weapons/chainsaw_attack.ogg',40,1)
+	if(A && on)
+		if(istype(A,/obj/structure/window))
+			var/obj/structure/window/W = A
+			W.shatter()
+		else if(istype(A,/obj/structure/grille))
+			new /obj/structure/grille/broken(A.loc)
+			new /obj/item/stack/rods(A.loc)
+			qdel(A)
+		else if(istype(A,/obj/effect/plant))
+			var/obj/effect/plant/P = A
+			qdel(P) //Plant isn't surviving that. At all
+	if (istype(A, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,A) <= 1)
+		to_chat(user, "<span class='notice'>You begin filling the tank on the chainsaw.</span>")
+		if(do_after(usr, 15))
+			A.reagents.trans_to_obj(src, max_fuel)
+			playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
+			to_chat(user, "<span class='notice'>Chainsaw succesfully refueled.</span>")
+		else
+			to_chat(user, "<span class='notice'>Don't move while you're refilling the chainsaw.</span>")
+
+obj/item/weapon/chainsaw/process()
+	if(!on) return
+
+	if(on)
+		if(get_fuel() > 0)
+			reagents.remove_reagent("fuel", 1)
+		if(get_fuel() <= 0)
+			to_chat(usr, "\The [src] sputters to a stop!")
+			on = !on
+
+obj/item/weapon/chainsaw/proc/get_fuel()
+	reagents.get_reagent_amount("fuel")
+
+obj/item/weapon/chainsaw/examine(mob/user)
+	if(..(user,0))
+		if(max_fuel)
+			to_chat(usr, "<span class = 'notice'>The [src] feels like it contains roughtly [get_fuel()] units of fuel left.</span>")
+
+obj/item/weapon/chainsaw/suicide_act(mob/user)
+	to_chat(viewers(user), "<span class='danger'>[user] is lying down and pulling the chainsaw into \him, it looks like \he's trying to commit suicide!</span>")
+	return(BRUTELOSS)
+
+obj/item/weapon/chainsaw/update_icon()
+	if(on)
+		icon_state = "chainsaw1"
+		item_state = "chainsaw1"
+	else
+		icon_state = "chainsaw0"
+		icon_state = "chainsaw0"

code/game/objects/items/weapons/material/twohanded.dm

@@ -83,6 +83,7 @@
 	base_icon = "fireaxe"
 	name = "fire axe"
 	desc = "Truly, the weapon of a madman. Who would think to fight fire with an axe?"
+	description_info = "This weapon can cleave, striking nearby lesser, hostile enemies close to the primary target.  It must be held in both hands to do this."
 	unwielded_force_divisor = 0.25
 	force_divisor = 0.7 // 10/42 with hardness 60 (steel) and 0.25 unwielded divisor
 	dulled_divisor = 0.75	//Still metal on a stick
@@ -123,6 +124,12 @@
 			var/obj/effect/plant/P = A
 			P.die_off()
 
+// This cannot go into afterattack since some mobs delete themselves upon dying.
+/obj/item/weapon/material/twohanded/fireaxe/pre_attack(var/mob/living/target, var/mob/living/user)
+	if(istype(target))
+		cleave(user, target)
+	..()
+
 /obj/item/weapon/material/twohanded/fireaxe/scythe
 	icon_state = "scythe0"
 	base_icon = "scythe"

code/game/objects/items/weapons/melee/energy.dm

@@ -217,7 +217,7 @@
 		var/obj/O = AM
 		O.emp_act(3) // A weaker severity is used because this has infinite uses.
 		playsound(get_turf(O), 'sound/effects/EMPulse.ogg', 100, 1)
-		user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) // A lot of objects don't set click delay.
+		user.setClickCooldown(user.get_attack_speed(src)) // A lot of objects don't set click delay.
 	return ..()
 
 /obj/item/weapon/melee/energy/sword/ionic_rapier/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)

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

@@ -379,6 +379,17 @@
 	new /obj/item/weapon/implanter(src)
 	new /obj/item/weapon/implantpad(src)
 
+/obj/item/weapon/storage/box/camerabug
+	name = "mobile camera pod box"
+	desc = "A box containing some mobile camera pods."
+	icon_state = "pda"
+
+/obj/item/weapon/storage/box/camerabug/New()
+	..()
+	for(var/i = 1 to 6)
+		new /obj/item/device/camerabug(src)
+	new /obj/item/device/bug_monitor(src)
+
 /obj/item/weapon/storage/box/rxglasses
 	name = "box of prescription glasses"
 	desc = "This box contains nerd glasses."

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

@@ -159,13 +159,13 @@
 
 /obj/item/weapon/storage/box/syndie_kit/spy/New()
 	..()
-	new /obj/item/device/spy_bug(src)
-	new /obj/item/device/spy_bug(src)
-	new /obj/item/device/spy_bug(src)
-	new /obj/item/device/spy_bug(src)
-	new /obj/item/device/spy_bug(src)
-	new /obj/item/device/spy_bug(src)
-	new /obj/item/device/spy_monitor(src)
+	new /obj/item/device/camerabug/spy(src)
+	new /obj/item/device/camerabug/spy(src)
+	new /obj/item/device/camerabug/spy(src)
+	new /obj/item/device/camerabug/spy(src)
+	new /obj/item/device/camerabug/spy(src)
+	new /obj/item/device/camerabug/spy(src)
+	new /obj/item/device/bug_monitor/spy(src)
 
 /obj/item/weapon/storage/box/syndie_kit/g9mm
 	name = "\improper Smooth operator"

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

@@ -17,7 +17,7 @@
 	var/max_carry = 10
 
 /obj/item/weapon/tray/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
-	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+	user.setClickCooldown(user.get_attack_speed(src))
 	// Drop all the things. All of them.
 	overlays.Cut()
 	for(var/obj/item/I in carrying)

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

@@ -21,7 +21,7 @@
 
 	msg_admin_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 
-	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+	user.setClickCooldown(user.get_attack_speed(src))
 	user.do_attack_animation(M)
 
 	if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
@@ -134,7 +134,7 @@
 			qdel(src)
 
 /obj/effect/energy_net/user_unbuckle_mob(mob/user)
-	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+	user.setClickCooldown(user.get_attack_speed())
 	visible_message("<span class='danger'>[user] begins to tear at \the [src]!</span>")
 	if(do_after(usr, escape_time, src, incapacitation_flags = INCAPACITATION_DEFAULT & ~(INCAPACITATION_RESTRAINED | INCAPACITATION_BUCKLED_FULLY)))
 		if(!buckled_mob)