Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor

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

@@ -111,7 +111,6 @@
 	gender = NEUTER
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "bolas"
-	siemens_coefficient = 1
 	slot_flags = SLOT_BELT
 	throwforce = 2
 	w_class = 2

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

@@ -27,3 +27,13 @@
 	throwforce = 10
 	w_class = 2
 	attack_verb = list("stabbed", "jabbed", "iced,")
+
+/obj/item/weapon/melee/candy_sword
+	name = "candy cane sword"
+	desc = "A large candy cane with a sharpened point. Definitely too dangerous for schoolchildren."
+	icon_state = "candy_sword"
+	item_state = "candy_sword"
+	force = 10
+	throwforce = 7
+	w_class = 3
+	attack_verb = list("slashed", "stabbed", "sliced", "caned")