Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum

# Conflicts:
#	icons/mob/clothing/suit.dmi
#	icons/obj/clothing/suits.dmi

code/game/objects/items/implants/implant_misc.dm

@@ -44,7 +44,7 @@
 	icon_state = "warp"
 	uses = -1
 	var/total_delay = 10 SECONDS
-	var/cooldown = 10 SECONDS
+	var/cooldown = 30 SECONDS
 	var/last_use = 0
 	var/list/positions = list()
 	var/next_prune = 0

code/game/objects/items/weaponry.dm

@@ -302,7 +302,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	damtype = STAMINA
 	attack_verb = list("whacked", "smacked", "struck")
 	total_mass = TOTAL_MASS_MEDIEVAL_WEAPON
-	hitsound = 'sound/weapons/grenadelaunch.ogg' // no good wood thunk sounds
+	hitsound = 'sound/weapons/woodbonk.ogg'
 	var/harm = FALSE // TRUE = brute, FALSE = stam
 	var/reinforced = FALSE
 	var/burnt = FALSE