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

code/modules/surgery/bodyparts/robot_bodyparts.dm

@@ -20,8 +20,8 @@
 	icon_state = "borg_l_arm"
 	status = BODYPART_ROBOTIC
 	
-	brute_reduction = 5
-	burn_reduction = 4
+	brute_reduction = 2
+	burn_reduction = 1
 
 	light_brute_msg = ROBOTIC_LIGHT_BRUTE_MSG
 	medium_brute_msg = ROBOTIC_MEDIUM_BRUTE_MSG
@@ -41,8 +41,8 @@
 	icon_state = "borg_r_arm"
 	status = BODYPART_ROBOTIC
 	
-	brute_reduction = 5
-	burn_reduction = 4
+	brute_reduction = 2
+	burn_reduction = 1
 
 	light_brute_msg = ROBOTIC_LIGHT_BRUTE_MSG
 	medium_brute_msg = ROBOTIC_MEDIUM_BRUTE_MSG
@@ -62,8 +62,8 @@
 	icon_state = "borg_l_leg"
 	status = BODYPART_ROBOTIC
 	
-	brute_reduction = 5
-	burn_reduction = 4
+	brute_reduction = 2
+	burn_reduction = 1
 
 	light_brute_msg = ROBOTIC_LIGHT_BRUTE_MSG
 	medium_brute_msg = ROBOTIC_MEDIUM_BRUTE_MSG
@@ -83,8 +83,8 @@
 	icon_state = "borg_r_leg"
 	status = BODYPART_ROBOTIC
 	
-	brute_reduction = 5
-	burn_reduction = 4
+	brute_reduction = 2
+	burn_reduction = 1
 
 	light_brute_msg = ROBOTIC_LIGHT_BRUTE_MSG
 	medium_brute_msg = ROBOTIC_MEDIUM_BRUTE_MSG
@@ -103,8 +103,8 @@
 	icon_state = "borg_chest"
 	status = BODYPART_ROBOTIC
 	
-	brute_reduction = 5
-	burn_reduction = 4
+	brute_reduction = 2
+	burn_reduction = 1
 
 	light_brute_msg = ROBOTIC_LIGHT_BRUTE_MSG
 	medium_brute_msg = ROBOTIC_MEDIUM_BRUTE_MSG
@@ -268,38 +268,38 @@
 	burn_reduction = 0
 	max_damage = 20
 
-// Upgraded Surplus lims
+// Upgraded Surplus lims - Better then robotic lims
 /obj/item/bodypart/l_arm/robot/surplus_upgraded
 	name = "reinforced surplus prosthetic left arm"
-	desc = "A skeletal, robotic limb. This one is reinforced to provide better protection."
+	desc = "A skeletal, robotic limb. This one is reinforced to provide better protection, and is made of stronger parts."
 	icon = 'icons/mob/augmentation/surplus_augments.dmi'
-	brute_reduction = 1
-	burn_reduction = 1
-	max_damage = 30
+	brute_reduction = 3
+	burn_reduction = 2
+	max_damage = 55
 
 /obj/item/bodypart/r_arm/robot/surplus_upgraded
 	name = "reinforced surplus prosthetic right arm"
-	desc = "A skeletal, robotic limb. This one is reinforced to provide better protection."
+	desc = "A skeletal, robotic limb. This one is reinforced to provide better protection, and is made of stronger parts."
 	icon = 'icons/mob/augmentation/surplus_augments.dmi'
-	brute_reduction = 1
-	burn_reduction = 1
-	max_damage = 30
+	brute_reduction = 3
+	burn_reduction = 2
+	max_damage = 55
 
 /obj/item/bodypart/l_leg/robot/surplus_upgraded
 	name = "reinforced surplus prosthetic left leg"
-	desc = "A skeletal, robotic limb. This one is reinforced to provide better protection."
+	desc = "A skeletal, robotic limb. This one is reinforced to provide better protection, and is made of stronger parts."
 	icon = 'icons/mob/augmentation/surplus_augments.dmi'
-	brute_reduction = 1
-	burn_reduction = 1
-	max_damage = 30
+	brute_reduction = 3
+	burn_reduction = 2
+	max_damage = 55
 
 /obj/item/bodypart/r_leg/robot/surplus_upgraded
 	name = "reinforced surplus prosthetic right leg"
-	desc = "A skeletal, robotic limb. This one is reinforced to provide better protection."
+	desc = "A skeletal, robotic limb. This one is reinforced to provide better protection, and is made of stronger parts."
 	icon = 'icons/mob/augmentation/surplus_augments.dmi'
-	brute_reduction = 1
-	burn_reduction = 1
-	max_damage = 30
+	brute_reduction = 3
+	burn_reduction = 2
+	max_damage = 55
 
 #undef ROBOTIC_LIGHT_BRUTE_MSG
 #undef ROBOTIC_MEDIUM_BRUTE_MSG

code/modules/surgery/organs/eyes.dm

@@ -169,7 +169,6 @@
 	var/list/obj/effect/abstract/eye_lighting/eye_lighting
 	var/obj/effect/abstract/eye_lighting/on_mob
 	var/image/mob_overlay
-	var/datum/component/mobhook
 
 /obj/item/organ/eyes/robotic/glow/Initialize()
 	. = ..()
@@ -238,26 +237,18 @@
 		return
 	deactivate(silent = TRUE)
 
-/obj/item/organ/eyes/robotic/glow/Insert(mob/living/carbon/M, special = FALSE, drop_if_replaced = FALSE)
-	. = ..()
-	if (mobhook && mobhook.parent != M)
-		QDEL_NULL(mobhook)
-	if (!mobhook)
-		mobhook = M.AddComponent(/datum/component/redirect, list(COMSIG_ATOM_DIR_CHANGE = CALLBACK(src, .proc/update_visuals)))
-
 /obj/item/organ/eyes/robotic/glow/Remove(mob/living/carbon/M)
 	. = ..()
-	QDEL_NULL(mobhook)
-
-/obj/item/organ/eyes/robotic/glow/Destroy()
-	QDEL_NULL(mobhook) // mobhook is not our component
-	return ..()
+	if(active)
+		UnregisterSignal(M, COMSIG_ATOM_DIR_CHANGE)
+		active = FALSE
 
 /obj/item/organ/eyes/robotic/glow/proc/activate(silent = FALSE)
 	start_visuals()
 	if(!silent)
 		to_chat(owner, "<span class='warning'>Your [src] clicks and makes a whining noise, before shooting out a beam of light!</span>")
 	active = TRUE
+	RegisterSignal(owner, COMSIG_ATOM_DIR_CHANGE, .proc/update_visuals)
 	cycle_mob_overlay()
 
 /obj/item/organ/eyes/robotic/glow/proc/deactivate(silent = FALSE)
@@ -265,6 +256,7 @@
 	if(!silent)
 		to_chat(owner, "<span class='warning'>Your [src] shuts off!</span>")
 	active = FALSE
+	UnregisterSignal(owner, COMSIG_ATOM_DIR_CHANGE)
 	remove_mob_overlay()
 
 /obj/item/organ/eyes/robotic/glow/proc/update_visuals(datum/source, olddir, newdir)

code/modules/surgery/organs/lungs.dm

@@ -451,6 +451,6 @@
 
 /obj/item/organ/lungs/slime/check_breath(datum/gas_mixture/breath, mob/living/carbon/human/H)
 	. = ..()
-	if (breath.gases[/datum/gas/plasma])
+	if (breath && breath.gases[/datum/gas/plasma])
 		var/plasma_pp = breath.get_breath_partial_pressure(breath.gases[/datum/gas/plasma])
 		owner.blood_volume += (0.2 * plasma_pp) // 10/s when breathing literally nothing but plasma, which will suffocate you.

code/modules/surgery/organs/vocal_cords.dm

@@ -3,7 +3,7 @@
 #define COOLDOWN_MEME 300
 #define COOLDOWN_NONE 100
 
-/obj/item/organ/vocal_cords //organs that are activated through speech with the :x channel
+/obj/item/organ/vocal_cords //organs that are activated through speech with the :x/MODE_KEY_VOCALCORDS channel
 	name = "vocal cords"
 	icon_state = "appendix"
 	zone = BODY_ZONE_PRECISE_MOUTH