Polaris sync

code/modules/organs/blood.dm

@@ -143,6 +143,9 @@ var/const/CE_STABLE_THRESHOLD = 0.5
 		var/blood_max = 0
 		var/blood_loss_divisor = 30	//lower factor = more blood loss
 
+		// Some species bleed out differently
+		blood_loss_divisor /= species.bloodloss_rate
+
 		// Some modifiers can make bleeding better or worse.  Higher multiplers = more bleeding.
 		var/blood_loss_modifier_multiplier = 1.0
 		for(var/datum/modifier/M in modifiers)

code/modules/organs/internal/lungs.dm

@@ -19,7 +19,7 @@
 			owner.drip(10)
 		if(prob(8))
 			spawn owner.emote("me", 1, "gasps for air!")
-			owner.losebreath += 15
+			owner.AdjustLosebreath(15)
 
 /obj/item/organ/internal/lungs/proc/rupture()
 	var/obj/item/organ/external/parent = owner.get_organ(parent_organ)

code/modules/organs/organ_external.dm

@@ -413,7 +413,7 @@
 			user << "<span class='warning'>You can't reach your [src.name] while holding [tool] in your [owner.get_bodypart_name(grasp)].</span>"
 			return 0
 
-	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+	user.setClickCooldown(user.get_attack_speed(tool))
 	if(!do_mob(user, owner, 10))
 		user << "<span class='warning'>You must stand still to do that.</span>"
 		return 0

code/modules/organs/robolimbs.dm

@@ -94,12 +94,18 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	icon = 'icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_main.dmi'
 	unavailable_to_build = 1
 
-/datum/robolimb/cybersolutions_alt1
+/datum/robolimb/cybersolutions_alt2
 	company = "Cyber Solutions - Array"
 	desc = "This limb is simple and functional; array of sensors on a featureless case."
-	icon = 'icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_alt1.dmi'
+	icon = 'icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_alt2.dmi'
 	unavailable_to_build = 1
 	parts = list(BP_HEAD)
+	
+/datum/robolimb/cybersolutions_alt1
+	company = "Cyber Solutions - Wight"
+	desc = "This limb has cheap plastic panels mounted on grey metal."
+	icon = 'icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_alt1.dmi'
+	unavailable_to_build = 1
 
 /datum/robolimb/grayson
 	company = "Grayson"

code/modules/organs/subtypes/standard.dm

@@ -279,6 +279,8 @@
 		spawn(1)
 			owner.update_hair()
 	get_icon()
+	if(vital)	//This is just in case we ever add something that both a) Doesn't need a head to live, and b) Can be defibbed
+		owner.can_defib = 0
 	..()
 
 /obj/item/organ/external/head/take_damage(brute, burn, sharp, edge, used_weapon = null, list/forbidden_limbs = list())