Merge branch 'master' into abductor-update

code/modules/surgery/organs/augments_internal.dm

@@ -142,22 +142,3 @@
 	if(prob(60/severity))
 		to_chat(owner, "<span class='warning'>Your breathing tube suddenly closes!</span>")
 		owner.losebreath += 2
-
-//BOX O' IMPLANTS
-
-/obj/item/storage/box/cyber_implants
-	name = "boxed cybernetic implants"
-	desc = "A sleek, sturdy box."
-	icon_state = "cyber_implants"
-	var/list/boxed = list(
-		/obj/item/autosurgeon/thermal_eyes,
-		/obj/item/autosurgeon/xray_eyes,
-		/obj/item/autosurgeon/anti_stun,
-		/obj/item/autosurgeon/reviver)
-	var/amount = 5
-
-/obj/item/storage/box/cyber_implants/PopulateContents()
-	var/implant
-	while(contents.len <= amount)
-		implant = pick(boxed)
-		new implant(src)

code/modules/surgery/organs/autosurgeon.dm

@@ -103,6 +103,26 @@
 /obj/item/autosurgeon/anti_drop
 	starting_organ = /obj/item/organ/cyberimp/brain/anti_drop
 
+//BOX O' IMPLANTS
+
+/obj/item/storage/box/cyber_implants
+	name = "boxed cybernetic implants"
+	desc = "A sleek, sturdy box."
+	icon_state = "syndiebox"
+	illustration = "cyber_implants"
+	var/list/boxed = list(
+		/obj/item/autosurgeon/thermal_eyes,
+		/obj/item/autosurgeon/xray_eyes,
+		/obj/item/autosurgeon/anti_stun,
+		/obj/item/autosurgeon/reviver)
+	var/amount = 5
+
+/obj/item/storage/box/cyber_implants/PopulateContents()
+	var/implant
+	while(contents.len <= amount)
+		implant = pick(boxed)
+		new implant(src)
+
 /obj/item/autosurgeon/penis
 	desc = "A single use autosurgeon that contains a penis. A screwdriver can be used to remove it, but implants can't be placed back in."
 	uses = 1

code/modules/surgery/organs/eyes.dm

@@ -227,7 +227,7 @@
 	terminate_effects()
 	. = ..()
 
-/obj/item/organ/eyes/robotic/glow/Remove()
+/obj/item/organ/eyes/robotic/glow/Remove(mob/living/carbon/M, special = FALSE)
 	terminate_effects()
 	. = ..()
 
@@ -338,7 +338,7 @@
 /obj/item/organ/eyes/robotic/glow/proc/start_visuals()
 	if(!islist(eye_lighting))
 		regenerate_light_effects()
-	if((eye_lighting.len < light_beam_distance) || !on_mob)
+	if((LAZYLEN(eye_lighting) < light_beam_distance) || !on_mob)
 		regenerate_light_effects()
 	sync_light_effects()
 	update_visuals()

code/modules/surgery/organs/organ_internal.dm

@@ -31,7 +31,7 @@
 
 /obj/item/organ/proc/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE)
 	if(!iscarbon(M) || owner == M)
-		return
+		return FALSE
 
 	var/obj/item/organ/replaced = M.getorganslot(slot)
 	if(replaced)
@@ -53,6 +53,8 @@
 		A.Grant(M)
 	STOP_PROCESSING(SSobj, src)
 
+	return TRUE
+
 //Special is for instant replacement like autosurgeons
 /obj/item/organ/proc/Remove(mob/living/carbon/M, special = FALSE)
 	owner = null
@@ -67,6 +69,8 @@
 		A.Remove(M)
 	START_PROCESSING(SSobj, src)
 
+	return TRUE
+
 /obj/item/organ/proc/on_find(mob/living/finder)
 	return
 
@@ -184,7 +188,7 @@
 	if(owner)
 		// The special flag is important, because otherwise mobs can die
 		// while undergoing transformation into different mobs.
-		Remove(owner, special=TRUE)
+		Remove(owner, TRUE)
 	return ..()
 
 /obj/item/organ/attack(mob/living/carbon/M, mob/user)