Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull

code/modules/organs/organ.dm

@@ -106,8 +106,8 @@ var/list/organ_cache = list()
 	STOP_PROCESSING(SSobj, src)
 	handle_organ_mod_special(TRUE)
 	if(owner && vital)
-		owner.death()
 		owner.can_defib = 0
+		owner.death()
 
 /obj/item/organ/proc/adjust_germ_level(var/amount)		// Unless you're setting germ level directly to 0, use this proc instead
 	germ_level = CLAMP(germ_level + amount, 0, INFECTION_LEVEL_MAX)
@@ -352,7 +352,7 @@ var/list/organ_cache = list()
 	var/obj/item/organ/external/affected = owner.get_organ(parent_organ)
 	if(affected) affected.internal_organs -= src
 
-	loc = get_turf(owner)
+	forceMove(owner.drop_location())
 	START_PROCESSING(SSobj, src)
 	rejecting = null
 	var/datum/reagent/blood/organ_blood = locate(/datum/reagent/blood) in reagents.reagent_list
@@ -361,9 +361,10 @@ var/list/organ_cache = list()
 
 	if(owner && vital)
 		if(user)
-			add_attack_logs(user,owner,"Removed vital organ [src.name]")
-		owner.death()
-		owner.can_defib = 0
+			add_attack_logs(user, owner, "Removed vital organ [src.name]")
+		if(owner.stat != DEAD)
+			owner.can_defib = 0
+			owner.death()
 
 	handle_organ_mod_special(TRUE)
 

code/modules/organs/organ_external.dm

@@ -1061,7 +1061,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 		if(organ_can_feel_pain() && !isbelly(owner.loc))
 			owner.emote("scream")
 
-	playsound(src.loc, "fracture", 10, 1, -2)
+	playsound(src, "fracture", 10, 1, -2)
 	status |= ORGAN_BROKEN
 	broken_description = pick("broken","fracture","hairline fracture")
 
@@ -1385,5 +1385,5 @@ Note that amputating the affected organ does in fact remove the infection from t
 	. = 0
 	for(var/obj/item/organ/external/L in organs)
 		for(var/obj/item/I in L.implants)
-			if(!istype(I,/obj/item/weapon/implant) && !istype(I,/obj/item/device/nif))
+			if(!istype(I,/obj/item/weapon/implant) && !istype(I,/obj/item/device/nif)) //VOREStation Add - NIFs
 				return 1

code/modules/organs/organ_icon.dm

@@ -131,9 +131,9 @@ var/global/list/limb_icon_cache = list()
 
 /obj/item/organ/external/proc/get_icon(var/skeletal)
 
-	var/gender = "f"
-	if(owner && owner.gender == MALE)
-		gender = "m"
+	var/gender = "m"
+	if(owner && owner.gender == FEMALE)
+		gender = "f"
 
 	icon_cache_key = "[icon_name]_[species ? species.get_bodytype() : SPECIES_HUMAN]" //VOREStation Edit
 

code/modules/organs/robolimbs_yw.dm

@@ -10,7 +10,7 @@
 	parts = list(BP_HEAD)
 	monitor_styles = standard_monitor_styles
 
-/datum/robolimb/S.Ind
+/datum/robolimb/s_Ind
 	company = "S.Ind"
 	desc = "S.Ind brand prosthetic limbs."
 	icon = 'icons/mob/human_races/cyberlimbs/S.Ind/sind_main.dmi' //Sprited by: Generalpantsu
@@ -20,6 +20,11 @@
 	desc = "Hperformance brand prosthetic limbs."
 	icon = 'icons/mob/human_races/cyberlimbs/Hperformance/hperformance_main.dmi' //Sprited by: Generalpantsu
 
+/datum/robolimb/xionalt
+	company = "Xion (alt yw)."
+	desc = "Xion brand prosthetic limbs."
+	icon = 'icons/mob/human_races/cyberlimbs/xion/xion_alt5.dmi' //Sprited by: Generalpantsu
+
 /datum/robolimb/aphrodite_cyberdoe
 	company = "Aphrodite - Cyberdoe"
 	desc = "This limb feels soft and fluffy, realistic in design and squish. By Aphrodite Ltd."

code/modules/organs/subtypes/machine.dm

@@ -5,6 +5,7 @@
 	organ_tag = O_CELL
 	parent_organ = BP_TORSO
 	vital = 1
+	var/defib_timer = 1 // This sits in the brain organ slot, but is not a brain.
 
 /obj/item/organ/internal/cell/New()
 	robotize()
@@ -46,6 +47,10 @@
 	sleep(-1)
 	update_from_mmi()
 
+// This sits in the brain organ slot, but is not a brain. Posibrains and dronecores aren't brains either.
+/obj/item/organ/internal/mmi_holder/proc/tick_defib_timer()
+	return
+
 /obj/item/organ/internal/mmi_holder/proc/update_from_mmi()
 
 	if(!stored_mmi.brainmob)
@@ -89,7 +94,7 @@
 
 /obj/item/organ/internal/mmi_holder/emp_act(severity)
 	// ..() // VOREStation Edit - Don't take damage
-	owner.adjustToxLoss(rand(6/severity, 12/severity))
+	owner?.adjustToxLoss(rand(6/severity, 12/severity))
 
 /obj/item/organ/internal/mmi_holder/posibrain
 	name = "positronic brain interface"