Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697

code/modules/organs/internal/augment.dm

@@ -31,10 +31,8 @@
 	var/last_activate = null
 
 /obj/item/organ/internal/augment/Initialize()
-	..()
-
+	. ..()
 	setup_radial_icon()
-
 	if(integrated_object_type)
 		integrated_object = new integrated_object_type(src)
 		integrated_object.canremove = FALSE

code/modules/organs/internal/augment/armmounted.dm

@@ -189,7 +189,7 @@
 		)
 
 /obj/item/organ/internal/augment/armmounted/shoulder/multiple/Initialize()
-	..()
+	. = ..()
 
 	if(integrated_object)
 		integrated_tools[integrated_object_type] = integrated_object

code/modules/organs/internal/brain.dm

@@ -33,7 +33,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
 	if(!owner || owner.stat == DEAD)
 		defib_timer = max(--defib_timer, 0)
 	else
-		defib_timer = min(++defib_timer, (config.defib_timer MINUTES) / 2)
+		defib_timer = min(++defib_timer, (config.defib_timer MINUTES) / 20)		// Time vars measure things in ticks. Life tick happens every ~2 seconds, therefore dividing by 20
 
 /obj/item/organ/internal/brain/proc/can_assist()
 	return can_assist
@@ -81,7 +81,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
 /obj/item/organ/internal/brain/New()
 	..()
 	health = config.default_brain_health
-	defib_timer = (config.defib_timer MINUTES) / 2
+	defib_timer = (config.defib_timer MINUTES) / 20				// Time vars measure things in ticks. Life tick happens every ~2 seconds, therefore dividing by 20
 	spawn(5)
 		if(brainmob)
 			butcherable = FALSE
@@ -103,7 +103,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
 		if(istype(H))
 			brainmob.dna = H.dna.Clone()
 			brainmob.timeofhostdeath = H.timeofdeath
-			brainmob.ooc_notes = H.ooc_notes //VOREStation Edit 
+			brainmob.ooc_notes = H.ooc_notes //VOREStation Edit
 
 		// Copy modifiers.
 		for(var/datum/modifier/M in H.modifiers)
@@ -137,7 +137,8 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
 
 	var/obj/item/organ/internal/brain/B = src
 	if(istype(B) && owner)
-		B.transfer_identity(owner)
+		if(istype(owner, /mob/living/carbon))
+			B.transfer_identity(owner)
 
 	..()
 

code/modules/organs/internal/spleen.dm

@@ -73,7 +73,7 @@
 	spleen_efficiency = 0.5
 
 /obj/item/organ/internal/spleen/skrell/Initialize()
-	..()
+	. = ..()
 	adjust_scale(0.8,0.7)
 
 /obj/item/organ/internal/spleen/minor
@@ -83,5 +83,5 @@
 	spleen_tick = 15
 
 /obj/item/organ/internal/spleen/minor/Initialize()
-	..()
+	. = ..()
 	adjust_scale(0.7)

code/modules/organs/internal/stomach.dm

@@ -12,8 +12,7 @@
 	var/deadly_hold = TRUE	// Does the stomach do damage to mobs eaten by its owner? Xenos should probably have this FALSE.
 
 /obj/item/organ/internal/stomach/Initialize()
-	..()
-
+	. = ..()
 	if(reagents)
 		reagents.maximum_volume = 30
 	else

code/modules/organs/organ.dm

@@ -115,8 +115,7 @@ var/list/organ_cache = list()
 	handle_organ_mod_special()
 
 /obj/item/organ/Initialize()
-	..()
-
+	. = ..()
 	if(owner)
 		if(!meat_type)
 			if(owner.isSynthetic())

code/modules/organs/organ_external.dm

@@ -857,6 +857,8 @@ Note that amputating the affected organ does in fact remove the infection from t
 	else if(disintegrate == DROPLIMB_EDGE && nonsolid) //VOREStation Add End
 		disintegrate = DROPLIMB_BLUNT //splut
 
+	GLOB.lost_limbs_shift_roundstat++
+
 	switch(disintegrate)
 		if(DROPLIMB_EDGE)
 			if(!clean)

code/modules/organs/organ_icon.dm

@@ -61,6 +61,8 @@ var/global/list/limb_icon_cache = list()
 	if(!iscarbon(owner) || !owner.species)
 		return
 
+	var/icon/eyecon //VOREStation Edit -- holds eye icon to render over markings later.
+
 	//Eye color/icon
 	var/should_have_eyes = owner.should_have_organ(O_EYES)
 	var/has_eye_color = owner.species.appearance_flags & HAS_EYE_COLOR
@@ -79,8 +81,14 @@ var/global/list/limb_icon_cache = list()
 		//We have weird other-sorts of eyes (as we're not supposed to have eye organ, but we have HAS_EYE_COLOR species)
 		else
 			eyes_icon.Blend(rgb(owner.r_eyes, owner.g_eyes, owner.b_eyes), ICON_ADD)
-		add_overlay(eyes_icon)
-		mob_icon.Blend(eyes_icon, ICON_OVERLAY)
+
+		//VOREStation edit -- allow rendering of eyes over markings.
+		if(eyes_over_markings)
+			eyecon = eyes_icon
+		else
+			add_overlay(eyes_icon)
+			mob_icon.Blend(eyes_icon, ICON_OVERLAY)
+			icon_cache_key += "[eye_icon]"
 
 	//Lip color/icon
 	if(owner.lip_style && (species && (species.appearance_flags & HAS_LIPS)))
@@ -97,6 +105,11 @@ var/global/list/limb_icon_cache = list()
 		mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons
 		icon_cache_key += "[M][markings[M]["color"]]"
 
+	if(eyes_over_markings && eyecon) //VOREStation edit -- toggle to render eyes above markings.
+		add_overlay(eyecon)
+		mob_icon.Blend(eyecon, ICON_OVERLAY)
+		icon_cache_key += "[eye_icon]"
+
 	add_overlay(get_hair_icon())
 
 	return mob_icon

code/modules/organs/robolimbs.dm

@@ -471,7 +471,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	var/species = SPECIES_HUMAN
 
 /obj/item/weapon/disk/species/Initialize()
-	..()
+	. = ..()
 	if(species)
 		name = "[species] [initial(name)]"
 

code/modules/organs/robolimbs_vr.dm

@@ -6,6 +6,7 @@
 //CitRP Port
 var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\
 	default=cyber_default;\
+	eyes=eyes;\
 	static=cyber_static;\
 	alert=cyber_alert;\
 	happy=cyber_happ;\
@@ -64,7 +65,6 @@ var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\
 	icon = 'icons/obj/items_vr.dmi'
 	icon_state = "verkdisk"
 
-
 // tucker0666 : Frost
 /datum/robolimb/zenghu_frost
     company = "Zeng-Hu (Custom)"

code/modules/organs/subtypes/diona.dm

@@ -212,7 +212,7 @@
 	vital = TRUE
 
 /obj/item/organ/internal/brain/cephalon/Initialize()
-	..()
+	. = ..()
 	spawn(30 SECONDS)	// FBP Dionaea need some way to be disassembled through surgery, if absolutely necessary.
 		if(!owner.isSynthetic())
 			vital = FALSE

code/modules/organs/subtypes/slime.dm

@@ -92,7 +92,7 @@
 	var/strain_regen_cooldown = 5 MINUTES
 
 /obj/item/organ/internal/regennetwork/Initialize()
-	..()
+	. = ..()
 	var/mob/living/carbon/human/H = null
 	spawn(15)
 		if(ishuman(owner))

code/modules/organs/subtypes/standard.dm

@@ -271,6 +271,7 @@
 	var/eye_icon = "eyes_s"
 	force = 3
 	throwforce = 7
+	var/eyes_over_markings = FALSE //VOREStation edit
 
 	var/eye_icon_location = 'icons/mob/human_face.dmi'