Merge pull request #2976 from Anewbe/vox_more_vox

Further tweaks to Vox and their toys

code/modules/clothing/spacesuits/alien.dm

@@ -34,6 +34,7 @@
 	item_flags = STOPPRESSUREDAMAGE | THICKMATERIAL | PHORONGUARD
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank)
 	phoronproof = 1
+	slowdown = 2
 	armor = list(melee = 60, bullet = 50, laser = 40,energy = 15, bomb = 30, bio = 30, rad = 30)
 	siemens_coefficient = 0.2
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS

code/modules/clothing/spacesuits/rig/suits/alien.dm

@@ -49,6 +49,9 @@
 	item_flags = THICKMATERIAL
 	siemens_coefficient = 0.2
 	phoronproof = 1
+	offline_slowdown = 5
+	slowdown = 2
+	allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit)
 
 	air_type = /obj/item/weapon/tank/vox
 
@@ -108,7 +111,6 @@
 	icon_state = "voxstealth_rig"
 	armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 100)
 	emp_protection = 40 //change this to 30 if too high.
-	slowdown = 0
 	phoronproof = 1
 
 	req_access = list(access_syndicate)

code/modules/clothing/under/xenos/vox.dm

@@ -25,7 +25,7 @@
 	icon_state = "webbing-vox"
 	slot = "vox"
 
-	slots = 5
+	slots = 3
 
 /obj/item/clothing/accessory/storage/vox/New()
 	..()

code/modules/power/apc.dm

@@ -701,6 +701,7 @@
 		var/mob/living/carbon/human/H = user
 
 		if(H.species.can_shred(H))
+			user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 			user.visible_message("<span call='warning'>[user.name] slashes at the [src.name]!</span>", "<span class='notice'>You slash at the [src.name]!</span>")
 			playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1)
 

code/modules/power/lighting.dm

@@ -527,6 +527,7 @@
 	if(istype(user,/mob/living/carbon/human))
 		var/mob/living/carbon/human/H = user
 		if(H.species.can_shred(H))
+			user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 			for(var/mob/M in viewers(src))
 				M.show_message("\red [user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2)
 			broken()

code/modules/projectiles/guns/vox.dm

@@ -57,6 +57,7 @@
 	icon_state = "darkcannon"
 	item_state = "darkcannon"
 	fire_sound = 'sound/weapons/eLuger.ogg'
+	w_class = ITEMSIZE_HUGE
 	charge_cost = 600
 	projectile_type = /obj/item/projectile/beam/darkmatter
 	self_recharge = 1
@@ -102,6 +103,7 @@
 	icon_state = "noise"
 	item_state = "noise"
 	fire_sound = 'sound/effects/basscannon.ogg'
+	w_class = ITEMSIZE_HUGE
 	self_recharge = 1
 	charge_cost = 600