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

# Conflicts:
#	code/modules/projectiles/gun.dm

code/modules/projectiles/gun.dm

@@ -247,7 +247,7 @@
 	admin_attack_log(usr, attacker_message="Fired [src]", admin_message="fired a gun ([src]) (MODE: [src.mode_name]) [reflex ? "by reflex" : "manually"].")
 
 	//update timing
-	user.setClickCooldown(4)
+	user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)
 	user.setMoveCooldown(move_delay)
 	next_fire_time = world.time + fire_delay
 

code/modules/projectiles/guns/energy/stun.dm

@@ -15,7 +15,7 @@
 /obj/item/weapon/gun/energy/taser/mounted/cyborg
 	name = "taser gun"
 	max_shots = 6
-	recharge_time = 10 //Time it takes for shots to recharge (in ticks)
+	recharge_time = 7 //Time it takes for shots to recharge (in ticks)
 
 
 /obj/item/weapon/gun/energy/stunrevolver

code/modules/projectiles/projectile/change.dm

@@ -78,7 +78,7 @@
 				H.set_species(randomize)
 				H.universal_speak = 1
 				var/datum/preferences/A = new() //Randomize appearance for the human
-				A.randomize_appearance_for(H)
+				A.randomize_appearance_and_body_for(H)
 
 		if(new_mob)
 			for (var/spell/S in M.spell_list)

code/modules/projectiles/targeting/targeting_overlay.dm

@@ -23,7 +23,6 @@
 	owner = newowner
 	loc = null
 	verbs.Cut()
-	toggle_permission(TARGET_CAN_RADIO)
 
 /obj/aiming_overlay/proc/toggle_permission(var/perm)