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

Conflicts:
	code/modules/clothing/clothing.dm

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

@@ -48,14 +48,15 @@
 		/obj/item/clothing/gloves,
 		/obj/item/device/pda,
 		/obj/item/device/megaphone,
-		/obj/item/taperoll/engineering,
+		/obj/item/taperoll,
 		/obj/item/device/radio/headset,
 		/obj/item/device/robotanalyzer,
 		/obj/item/weapon/material/minihoe,
 		/obj/item/weapon/material/hatchet,
 		/obj/item/device/analyzer/plant_analyzer,
 		/obj/item/weapon/extinguisher/mini,
-		/obj/item/device/flashlight/maglight
+		/obj/item/device/flashlight/maglight,
+		/obj/item/weapon/tape_roll,
 		)
 
 
@@ -98,6 +99,7 @@
 		/obj/item/stack/medical,
 		/obj/item/device/radio/headset,
 		/obj/item/device/pda,
+		/obj/item/taperoll,
 		/obj/item/device/megaphone,
 		/obj/item/device/flashlight/pen,
 		/obj/item/clothing/mask/surgical,
@@ -141,7 +143,7 @@
 		/obj/item/weapon/melee,
 		/obj/item/clothing/accessory/badge,
 		/obj/item/weapon/gun/projectile/sec,
-		/obj/item/taperoll/police,
+		/obj/item/taperoll,
 		/obj/item/weapon/gun/projectile/colt/detective
 		)
 
@@ -175,7 +177,7 @@
 		/obj/item/device/megaphone,
 		/obj/item/device/radio/headset,
 		/obj/item/clothing/gloves,
-		/obj/item/taperoll/police,
+		/obj/item/taperoll,
 		/obj/item/weapon/reagent_containers/spray/pepper,
 		/obj/item/weapon/handcuffs,
 		/obj/item/device/flash,
@@ -245,6 +247,7 @@
 		/obj/item/weapon/light/tube,
 		/obj/item/weapon/flame/lighter,
 		/obj/item/device/megaphone,
+		/obj/item/taperoll,
 		/obj/item/weapon/reagent_containers/spray,
 		/obj/item/weapon/soap
 		)

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

@@ -35,13 +35,14 @@
 	return
 
 /obj/item/weapon/melee/baton/proc/deductcharge(var/chrgdeductamt)
-	if(bcell)
-		if(bcell.checked_use(chrgdeductamt))
-			return 1
-		else
-			status = 0
-			update_icon()
-			return 0
+	if(status == 1)		//Only deducts charge when it's on
+		if(bcell)
+			if(bcell.checked_use(chrgdeductamt))
+				return 1
+			else
+				status = 0
+				update_icon()
+				return 0
 	return null
 
 /obj/item/weapon/melee/baton/update_icon()
@@ -109,6 +110,7 @@
 		user.Weaken(30)
 		deductcharge(hitcost)
 		return
+	deductcharge(hitcost)
 	return ..()
 
 /obj/item/weapon/melee/baton/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
@@ -144,8 +146,6 @@
 		target.stun_effect_act(stun, agony, hit_zone, src)
 		msg_admin_attack("[key_name(user)] stunned [key_name(target)] with the [src].")
 
-		deductcharge(hitcost)
-
 		if(ishuman(target))
 			var/mob/living/carbon/human/H = target
 			H.forcesay(hit_appends)