Revert 58ef59734f

code/modules/organs/organ.dm

@@ -240,9 +240,6 @@ var/list/organ_cache = list()
 			if(parent && !silent)
 				owner.custom_pain("Something inside your [parent.name] hurts a lot.", 1)
 
-/obj/item/organ/proc/bruise()
-	damage = max(damage, min_bruised_damage)
-
 /obj/item/organ/proc/robotize() //Being used to make robutt hearts, etc
 	robotic = 2
 	src.status &= ~ORGAN_BROKEN

code/modules/organs/organ_external.dm

@@ -807,46 +807,15 @@ Note that amputating the affected organ does in fact remove the infection from t
 			"\The [holder.legcuffed.name] falls off you.")
 		holder.drop_from_inventory(holder.legcuffed)
 
-// checks if all wounds on the organ are bandaged
-/obj/item/organ/external/proc/is_bandaged()
-	for(var/datum/wound/W in wounds)
-		if(W.internal) continue
-		if(!W.bandaged)
-			return 0
-	return 1
-
-// checks if all wounds on the organ are salved
-/obj/item/organ/external/proc/is_salved()
-	for(var/datum/wound/W in wounds)
-		if(W.internal) continue
-		if(!W.salved)
-			return 0
-	return 1
-
-// checks if all wounds on the organ are disinfected
-/obj/item/organ/external/proc/is_disinfected()
-	for(var/datum/wound/W in wounds)
-		if(W.internal) continue
-		if(!W.disinfected)
-			return 0
-	return 1
-
 /obj/item/organ/external/proc/bandage()
 	var/rval = 0
-	status &= ~ORGAN_BLEEDING
+	src.status &= ~ORGAN_BLEEDING
 	for(var/datum/wound/W in wounds)
 		if(W.internal) continue
 		rval |= !W.bandaged
 		W.bandaged = 1
 	return rval
 
-/obj/item/organ/external/proc/salve()
-	var/rval = 0
-	for(var/datum/wound/W in wounds)
-		rval |= !W.salved
-		W.salved = 1
-	return rval
-
 /obj/item/organ/external/proc/disinfect()
 	var/rval = 0
 	for(var/datum/wound/W in wounds)
@@ -865,6 +834,13 @@ Note that amputating the affected organ does in fact remove the infection from t
 		W.clamped = 1
 	return rval
 
+/obj/item/organ/external/proc/salve()
+	var/rval = 0
+	for(var/datum/wound/W in wounds)
+		rval |= !W.salved
+		W.salved = 1
+	return rval
+
 /obj/item/organ/external/proc/fracture()
 	if(status & ORGAN_ROBOT)
 		return	//ORGAN_BROKEN doesn't have the same meaning for robot limbs
@@ -963,14 +939,11 @@ Note that amputating the affected organ does in fact remove the infection from t
 /obj/item/organ/external/proc/is_malfunctioning()
 	return ((status & ORGAN_ROBOT) && (brute_dam + burn_dam) >= 10 && prob(brute_dam + burn_dam))
 
-/obj/item/organ/external/proc/embed(var/obj/item/weapon/W, var/silent = 0, var/supplied_message)
+/obj/item/organ/external/proc/embed(var/obj/item/weapon/W, var/silent = 0)
 	if(!owner || loc != owner)
 		return
 	if(!silent)
-		if(supplied_message)
-			owner.visible_message("<span class='danger'>[supplied_message]</span>")
-		else
-			owner.visible_message("<span class='danger'>\The [W] sticks in the wound!</span>")
+		owner.visible_message("<span class='danger'>\The [W] sticks in the wound!</span>")
 	implants += W
 	owner.embedded_flag = 1
 	owner.verbs += /mob/proc/yank_out_object

code/modules/organs/subtypes/xenos.dm

@@ -38,32 +38,15 @@
 	icon_state = "xgibtorso"
 	organ_tag = "acid gland"
 
-/obj/item/organ/xenos/resinspinner
-	name = "resin spinner"
-	parent_organ = "head"
-	icon_state = "xgibmid2"
-	organ_tag = "resin spinner"
-
 /obj/item/organ/xenos/hivenode
 	name = "hive node"
 	parent_organ = "chest"
 	icon_state = "xgibmid2"
 	organ_tag = "hive node"
 
-/obj/item/organ/xenos/hivenode/removed(var/mob/living/user)
-	if(owner && ishuman(owner))
-		var/mob/living/carbon/human/H = owner
-		H << "<span class='alium'>You feel your connection to the hivemind fray and fade away...</span>"
-		H.remove_language("Hivemind")
-		if(H.mind && H.species.get_bodytype() != "Xenomorph")
-			xenomorphs.remove_antagonist(H.mind)
-	..(user)
+/obj/item/organ/xenos/resinspinner
+	name = "resin spinner"
+	parent_organ = "head"
+	icon_state = "xgibmid2"
+	organ_tag = "resin spinner"
 
-/obj/item/organ/xenos/hivenode/replaced(var/mob/living/carbon/human/target,var/obj/item/organ/external/affected)
-	..(target, affected)
-	if(owner && ishuman(owner))
-		var/mob/living/carbon/human/H = owner
-		H.add_language("Hivemind")
-		if(H.mind && H.species.get_bodytype() != "Xenomorph")
-			H << "<span class='alium'>You feel a sense of pressure as a vast intelligence meshes with your thoughts...</span>"
-			xenomorphs.add_antagonist_mind(H.mind,1, xenomorphs.faction_role_text, xenomorphs.faction_welcome)

code/modules/organs/wound.dm

@@ -140,15 +140,6 @@
 
 		return 0
 
-	proc/bandage()
-		bandaged = 1
-
-	proc/salve()
-		salved = 1
-
-	proc/disinfect()
-		disinfected = 1
-
 	// heal the given amount of damage, and if the given amount of damage was more
 	// than what needed to be healed, return how much heal was left
 	// set @heals_internal to also heal internal organ damage
@@ -327,15 +318,15 @@ datum/wound/cut/massive
 /datum/wound/lost_limb/New(var/obj/item/organ/external/lost_limb, var/losstype, var/clean)
 	var/damage_amt = lost_limb.max_damage
 	if(clean) damage_amt /= 2
-
+	
 	switch(losstype)
 		if(DROPLIMB_EDGE, DROPLIMB_BLUNT)
 			damage_type = CUT
 			max_bleeding_stage = 3 //clotted stump and above can bleed.
 			stages = list(
 				"ripped stump" = damage_amt*1.3,
-				"bloody stump" = damage_amt,
-				"clotted stump" = damage_amt*0.5,
+				"bloody stump" = damage_amt, 
+				"clotted stump" = damage_amt*0.5, 
 				"scarred stump" = 0
 				)
 		if(DROPLIMB_BURN)
@@ -346,7 +337,7 @@ datum/wound/cut/massive
 				"scarred stump" = damage_amt*0.5,
 				"scarred stump" = 0
 				)
-
+	
 	..(damage_amt)
 
 /datum/wound/lost_limb/can_merge(var/datum/wound/other)