Prefixed all disability defines with DISABILITY_ to fix a name collision

code/game/objects/items.dm

@@ -539,9 +539,15 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 		M.adjust_blurriness(15)
 		if(M.stat != DEAD)
 			to_chat(M, "<span class='danger'>Your eyes start to bleed profusely!</span>")
+<<<<<<< HEAD
 		if(!(M.disabilities & (NEARSIGHT | BLIND)))
 			if(M.become_nearsighted())
 				to_chat(M, "<span class='danger'>You become nearsighted!</span>")
+=======
+		if(!(M.has_disability(DISABILITY_BLIND) || M.has_disability(DISABILITY_NEARSIGHT)))
+			to_chat(M, "<span class='danger'>You become nearsighted!</span>")
+		M.become_nearsighted(EYE_DAMAGE)
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		if(prob(50))
 			if(M.stat != DEAD)
 				if(M.drop_all_held_items())

code/game/objects/items/defib.dm

@@ -393,7 +393,11 @@
 
 /obj/item/twohanded/shockpaddles/proc/can_defib(mob/living/carbon/human/H)
 	var/obj/item/organ/brain/BR = H.getorgan(/obj/item/organ/brain)
+<<<<<<< HEAD
 	return	(!H.suiciding && !(H.disabilities & NOCLONE) && !H.hellbound && ((world.time - H.timeofdeath) < tlimit) && (H.getBruteLoss() < 180) && (H.getFireLoss() < 180) && H.getorgan(/obj/item/organ/heart) && BR && !BR.damaged_brain)
+=======
+	return	(!H.suiciding && !(H.has_disability(DISABILITY_NOCLONE)) && !H.hellbound && ((world.time - H.timeofdeath) < tlimit) && (H.getBruteLoss() < 180) && (H.getFireLoss() < 180) && H.getorgan(/obj/item/organ/heart) && BR && !BR.damaged_brain)
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 
 /obj/item/twohanded/shockpaddles/proc/shock_touching(dmg, mob/H)
 	if(isliving(H.pulledby))		//CLEAR!
@@ -514,7 +518,11 @@
 				shock_touching(30, H)
 				var/failed
 
+<<<<<<< HEAD
 				if (H.suiciding || (H.disabilities & NOCLONE))
+=======
+				if (H.suiciding || (H.has_disability(DISABILITY_NOCLONE)))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 					failed = "<span class='warning'>[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Recovery of patient impossible. Further attempts futile.</span>"
 				else if (H.hellbound)
 					failed = "<span class='warning'>[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's soul appears to be on another plane of existence.  Further attempts futile.</span>"

code/game/objects/items/devices/flashlight.dm

@@ -48,7 +48,11 @@
 	add_fingerprint(user)
 	if(istype(M) && on && user.zone_selected in list("eyes", "mouth"))
 
+<<<<<<< HEAD
 		if((user.disabilities & (CLUMSY | DUMB)) && prob(50))	//too dumb to use flashlight properly
+=======
+		if((user.has_disability(DISABILITY_CLUMSY) || user.has_disability(DISABILITY_DUMB)) && prob(50))	//too dumb to use flashlight properly
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			return ..()	//just hit them in the head
 
 		if(!user.IsAdvancedToolUser())
@@ -82,7 +86,11 @@
 				else
 					user.visible_message("<span class='warning'>[user] directs [src] to [M]'s eyes.</span>", \
 										 "<span class='danger'>You direct [src] to [M]'s eyes.</span>")
+<<<<<<< HEAD
 					if(M.stat == DEAD || (M.disabilities & BLIND) || !M.flash_act(visual = 1)) //mob is dead or fully blind
+=======
+					if(M.stat == DEAD || (M.has_disability(DISABILITY_BLIND)) || !M.flash_act(visual = 1)) //mob is dead or fully blind
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 						to_chat(user, "<span class='warning'>[M]'s pupils don't react to the light!</span>")
 					else if(M.dna && M.dna.check_mutation(XRAY))	//mob has X-RAY vision
 						to_chat(user, "<span class='danger'>[M]'s pupils give an eerie glow!</span>")

code/game/objects/items/devices/scanners.dm

@@ -85,7 +85,11 @@ GAS ANALYZER
 /obj/item/device/healthanalyzer/attack(mob/living/M, mob/living/carbon/human/user)
 
 	// Clumsiness/brain damage check
+<<<<<<< HEAD
 	if ((user.disabilities & (CLUMSY | DUMB)) && prob(50))
+=======
+	if ((user.has_disability(DISABILITY_CLUMSY) || user.has_disability(DISABILITY_DUMB)) && prob(50))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(user, "<span class='notice'>You stupidly try to analyze the floor's vitals!</span>")
 		user.visible_message("<span class='warning'>[user] has analyzed the floor's vitals!</span>")
 		to_chat(user, "<span class='info'>Analyzing results for The floor:\n\tOverall status: <b>Healthy</b>")
@@ -181,9 +185,18 @@ GAS ANALYZER
 			to_chat(user, "\t<span class='info'><b>==EAR STATUS==</b></span>")
 			if(istype(ears))
 				var/healthy = TRUE
+<<<<<<< HEAD
 				if(C.disabilities & DEAF)
 					healthy = FALSE
 					to_chat(user, "\t<span class='alert'>Subject is genetically deaf.</span>")
+=======
+				if(C.has_disability(DISABILITY_DEAF, GENETIC_MUTATION))
+					healthy = FALSE
+					to_chat(user, "\t<span class='alert'>Subject is genetically deaf.</span>")
+				else if(C.has_disability(DISABILITY_DEAF))
+					healthy = FALSE
+					to_chat(user, "\t<span class='alert'>Subject is deaf.</span>")
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 				else
 					if(ears.ear_damage)
 						to_chat(user, "\t<span class='alert'>Subject has [ears.ear_damage > UNHEALING_EAR_DAMAGE? "permanent ": "temporary "]hearing damage.</span>")
@@ -199,10 +212,17 @@ GAS ANALYZER
 			to_chat(user, "\t<span class='info'><b>==EYE STATUS==</b></span>")
 			if(istype(eyes))
 				var/healthy = TRUE
+<<<<<<< HEAD
 				if(C.disabilities & BLIND)
 					to_chat(user, "\t<span class='alert'>Subject is blind.</span>")
 					healthy = FALSE
 				if(C.disabilities & NEARSIGHT)
+=======
+				if(C.has_disability(DISABILITY_BLIND))
+					to_chat(user, "\t<span class='alert'>Subject is blind.</span>")
+					healthy = FALSE
+				if(C.has_disability(DISABILITY_NEARSIGHT))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 					to_chat(user, "\t<span class='alert'>Subject is nearsighted.</span>")
 					healthy = FALSE
 				if(eyes.eye_damage > 30)

code/game/objects/items/dna_injector.dm

@@ -31,7 +31,11 @@
 /obj/item/dnainjector/proc/inject(mob/living/carbon/M, mob/user)
 	prepare()
 
+<<<<<<< HEAD
 	if(M.has_dna() && !(RADIMMUNE in M.dna.species.species_traits) && !(M.disabilities & NOCLONE))
+=======
+	if(M.has_dna() && !(RADIMMUNE in M.dna.species.species_traits) && !(M.has_disability(DISABILITY_NOCLONE)))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		M.radiation += rand(20/(damage_coeff  ** 2),50/(damage_coeff  ** 2))
 		var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]"
 		for(var/datum/mutation/human/HM in remove_mutations)
@@ -313,7 +317,11 @@
 		to_chat(user, "<span class='notice'>You can't modify [M]'s DNA while [M.p_theyre()] dead.</span>")
 		return FALSE
 
+<<<<<<< HEAD
 	if(M.has_dna() && !(M.disabilities & NOCLONE))
+=======
+	if(M.has_dna() && !(M.has_disability(DISABILITY_NOCLONE)))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		M.radiation += rand(20/(damage_coeff  ** 2),50/(damage_coeff  ** 2))
 		var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]"
 		var/endtime = world.time+duration

code/game/objects/items/grenades/grenade.dm

@@ -24,7 +24,11 @@
 		qdel(src)
 
 /obj/item/grenade/proc/clown_check(mob/living/carbon/human/user)
+<<<<<<< HEAD
 	if(user.disabilities & CLUMSY && prob(50))
+=======
+	if(user.has_disability(DISABILITY_CLUMSY) && prob(50))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(user, "<span class='warning'>Huh? How does this thing work?</span>")
 		preprime(user, 5, FALSE)
 		return FALSE

code/game/objects/items/handcuffs.dm

@@ -26,7 +26,11 @@
 /obj/item/restraints/handcuffs/attack(mob/living/carbon/C, mob/living/carbon/human/user)
 	if(!istype(C))
 		return
+<<<<<<< HEAD
 	if(user.disabilities & CLUMSY && prob(50))
+=======
+	if(user.has_disability(DISABILITY_CLUMSY) && prob(50))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(user, "<span class='warning'>Uh... how do those things work?!</span>")
 		apply_cuffs(user,user)
 		return

code/game/objects/items/kitchen.dm

@@ -44,7 +44,11 @@
 		forkload = null
 
 	else if(user.zone_selected == "eyes")
+<<<<<<< HEAD
 		if(user.disabilities & CLUMSY && prob(50))
+=======
+		if(user.has_disability(DISABILITY_CLUMSY) && prob(50))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			M = user
 		return eyestab(M,user)
 	else
@@ -70,7 +74,11 @@
 
 /obj/item/kitchen/knife/attack(mob/living/carbon/M, mob/living/carbon/user)
 	if(user.zone_selected == "eyes")
+<<<<<<< HEAD
 		if(user.disabilities & CLUMSY && prob(50))
+=======
+		if(user.has_disability(DISABILITY_CLUMSY) && prob(50))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 			M = user
 		return eyestab(M,user)
 	else

code/game/objects/items/melee/misc.dm

@@ -99,7 +99,11 @@
 		return ..()
 
 	add_fingerprint(user)
+<<<<<<< HEAD
 	if((CLUMSY in user.disabilities) && prob(50))
+=======
+	if((user.has_disability(DISABILITY_CLUMSY)) && prob(50))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(user, "<span class ='danger'>You club yourself over the head.</span>")
 		user.Knockdown(60 * force)
 		if(ishuman(user))

code/game/objects/items/melee/transforming.dm

@@ -72,6 +72,10 @@
 		to_chat(user, "<span class='notice'>[src] [active ? "is now active":"can now be concealed"].</span>")
 
 /obj/item/melee/transforming/proc/clumsy_transform_effect(mob/living/user)
+<<<<<<< HEAD
 	if(user.disabilities & CLUMSY && prob(50))
+=======
+	if(user.has_disability(DISABILITY_CLUMSY) && prob(50))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(user, "<span class='warning'>You accidentally cut yourself with [src], like a doofus!</span>")
 		user.take_bodypart_damage(5,5)

code/game/objects/items/pneumaticCannon.dm

@@ -147,9 +147,16 @@
 	if(tank && !tank.air_contents.remove(gasPerThrow * pressureSetting))
 		to_chat(user, "<span class='warning'>\The [src] lets out a weak hiss and doesn't react!</span>")
 		return
+<<<<<<< HEAD
 	if(user.disabilities & CLUMSY && prob(75) && clumsyCheck)
 		user.visible_message("<span class='warning'>[user] loses their grip on [src], causing it to go off!</span>", "<span class='userdanger'>[src] slips out of your hands and goes off!</span>")
 		user.dropItemToGround(src, TRUE)
+=======
+	if(user.has_disability(DISABILITY_CLUMSY) && prob(75) && clumsyCheck && iscarbon(user))
+		var/mob/living/carbon/C = user
+		C.visible_message("<span class='warning'>[C] loses their grip on [src], causing it to go off!</span>", "<span class='userdanger'>[src] slips out of your hands and goes off!</span>")
+		C.dropItemToGround(src, TRUE)
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		if(prob(10))
 			target = get_turf(user)
 		else

code/game/objects/items/shields.dm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /obj/item/shield
 	name = "shield"
 	block_chance = 50
@@ -140,3 +141,147 @@
 		slot_flags = null
 		to_chat(user, "<span class='notice'>[src] can now be concealed.</span>")
 	add_fingerprint(user)
+=======
+/obj/item/shield
+	name = "shield"
+	block_chance = 50
+	armor = list(melee = 50, bullet = 50, laser = 50, energy = 0, bomb = 30, bio = 0, rad = 0, fire = 80, acid = 70)
+
+/obj/item/shield/riot
+	name = "riot shield"
+	desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder."
+	icon = 'icons/obj/items_and_weapons.dmi'
+	icon_state = "riot"
+	lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
+	slot_flags = SLOT_BACK
+	force = 10
+	throwforce = 5
+	throw_speed = 2
+	throw_range = 3
+	w_class = WEIGHT_CLASS_BULKY
+	materials = list(MAT_GLASS=7500, MAT_METAL=1000)
+	attack_verb = list("shoved", "bashed")
+	var/cooldown = 0 //shield bash cooldown. based on world.time
+
+
+/obj/item/shield/riot/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/melee/baton))
+		if(cooldown < world.time - 25)
+			user.visible_message("<span class='warning'>[user] bashes [src] with [W]!</span>")
+			playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1)
+			cooldown = world.time
+	else
+		return ..()
+
+/obj/item/shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+	if(attack_type == THROWN_PROJECTILE_ATTACK)
+		final_block_chance += 30
+	if(attack_type == LEAP_ATTACK)
+		final_block_chance = 100
+	return ..()
+
+/obj/item/shield/riot/roman
+	name = "roman shield"
+	desc = "Bears an inscription on the inside: <i>\"Romanes venio domus\"</i>."
+	icon_state = "roman_shield"
+	item_state = "roman_shield"
+	lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
+
+/obj/item/shield/riot/buckler
+	name = "wooden buckler"
+	desc = "A medieval wooden buckler."
+	icon_state = "buckler"
+	item_state = "buckler"
+	lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
+	materials = list()
+	resistance_flags = FLAMMABLE
+	block_chance = 30
+
+/obj/item/shield/energy
+	name = "energy combat shield"
+	desc = "A shield capable of stopping most melee attacks. Protects user from almost all energy projectiles. It can be retracted, expanded, and stored anywhere."
+	icon = 'icons/obj/items_and_weapons.dmi'
+	icon_state = "eshield0" // eshield1 for expanded
+	lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
+	force = 3
+	throwforce = 3
+	throw_speed = 3
+	throw_range = 5
+	w_class = WEIGHT_CLASS_TINY
+	attack_verb = list("shoved", "bashed")
+	var/active = 0
+
+/obj/item/shield/energy/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+	return 0
+
+/obj/item/shield/energy/IsReflect()
+	return (active)
+
+/obj/item/shield/energy/attack_self(mob/living/carbon/human/user)
+	if(user.has_disability(DISABILITY_CLUMSY) && prob(50))
+		to_chat(user, "<span class='warning'>You beat yourself in the head with [src].</span>")
+		user.take_bodypart_damage(5)
+	active = !active
+	icon_state = "eshield[active]"
+
+	if(active)
+		force = 10
+		throwforce = 8
+		throw_speed = 2
+		w_class = WEIGHT_CLASS_BULKY
+		playsound(user, 'sound/weapons/saberon.ogg', 35, 1)
+		to_chat(user, "<span class='notice'>[src] is now active.</span>")
+	else
+		force = 3
+		throwforce = 3
+		throw_speed = 3
+		w_class = WEIGHT_CLASS_TINY
+		playsound(user, 'sound/weapons/saberoff.ogg', 35, 1)
+		to_chat(user, "<span class='notice'>[src] can now be concealed.</span>")
+	add_fingerprint(user)
+
+/obj/item/shield/riot/tele
+	name = "telescopic shield"
+	desc = "An advanced riot shield made of lightweight materials that collapses for easy storage."
+	icon = 'icons/obj/items_and_weapons.dmi'
+	icon_state = "teleriot0"
+	lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
+	slot_flags = null
+	force = 3
+	throwforce = 3
+	throw_speed = 3
+	throw_range = 4
+	w_class = WEIGHT_CLASS_NORMAL
+	var/active = 0
+
+/obj/item/shield/riot/tele/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+	if(active)
+		return ..()
+	return 0
+
+/obj/item/shield/riot/tele/attack_self(mob/living/user)
+	active = !active
+	icon_state = "teleriot[active]"
+	playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1)
+
+	if(active)
+		force = 8
+		throwforce = 5
+		throw_speed = 2
+		w_class = WEIGHT_CLASS_BULKY
+		slot_flags = SLOT_BACK
+		to_chat(user, "<span class='notice'>You extend \the [src].</span>")
+	else
+		force = 3
+		throwforce = 3
+		throw_speed = 3
+		w_class = WEIGHT_CLASS_NORMAL
+		slot_flags = null
+		to_chat(user, "<span class='notice'>[src] can now be concealed.</span>")
+	add_fingerprint(user)
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind

code/game/objects/items/storage/book.dm

@@ -94,7 +94,11 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
 		to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return
 
+<<<<<<< HEAD
 	if (user.disabilities & CLUMSY && prob(50))
+=======
+	if (user.has_disability(DISABILITY_CLUMSY) && prob(50))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(user, "<span class='danger'>[src] slips out of your hand and hits your head.</span>")
 		user.take_bodypart_damage(10)
 		user.Unconscious(400)

code/game/objects/items/stunbaton.dm

@@ -108,7 +108,11 @@
 	add_fingerprint(user)
 
 /obj/item/melee/baton/attack(mob/M, mob/living/carbon/human/user)
+<<<<<<< HEAD
 	if(status && user.disabilities & CLUMSY && prob(50))
+=======
+	if(status && user.has_disability(DISABILITY_CLUMSY) && prob(50))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		user.visible_message("<span class='danger'>[user] accidentally hits themself with [src]!</span>", \
 							"<span class='userdanger'>You accidentally hit yourself with [src]!</span>")
 		user.Knockdown(stunforce*3)

code/game/objects/items/teleprod.dm

@@ -8,7 +8,11 @@
 
 /obj/item/melee/baton/cattleprod/teleprod/attack(mob/living/carbon/M, mob/living/carbon/user)//handles making things teleport when hit
 	..()
+<<<<<<< HEAD
 	if(status && user.disabilities & CLUMSY && prob(50))
+=======
+	if(status && user.has_disability(DISABILITY_CLUMSY) && prob(50))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		user.visible_message("<span class='danger'>[user] accidentally hits themself with [src]!</span>", \
 							"<span class='userdanger'>You accidentally hit yourself with [src]!</span>")
 		if(do_teleport(user, get_turf(user), 50))//honk honk

code/game/objects/items/tools/screwdriver.dm

@@ -75,7 +75,11 @@
 		return ..()
 	if(user.zone_selected != "eyes" && user.zone_selected != "head")
 		return ..()
+<<<<<<< HEAD
 	if(user.disabilities & CLUMSY && prob(50))
+=======
+	if(user.has_disability(DISABILITY_CLUMSY) && prob(50))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		M = user
 	return eyestab(M,user)
 

code/game/objects/items/twohanded.dm

@@ -302,7 +302,11 @@
 			unwield()
 			return
 	..()
+<<<<<<< HEAD
 	if(user.disabilities & CLUMSY && (wielded) && prob(40))
+=======
+	if(user.has_disability(DISABILITY_CLUMSY) && (wielded) && prob(40))
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		impale(user)
 		return
 	if((wielded) && prob(50))

code/game/objects/structures/petrified_statue.dm

@@ -17,7 +17,11 @@
 			L.buckled.unbuckle_mob(L,force=1)
 		L.visible_message("<span class='warning'>[L]'s skin rapidly turns to marble!</span>", "<span class='userdanger'>Your body freezes up! Can't... move... can't...  think...</span>")
 		L.forceMove(src)
+<<<<<<< HEAD
 		L.disabilities |= MUTE
+=======
+		L.add_disability(DISABILITY_MUTE, STATUE_MUTE)
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		L.faction += "mimic" //Stops mimics from instaqdeling people in statues
 		L.status_flags |= GODMODE
 		obj_integrity = L.health + 100 //stoning damaged mobs will result in easier to shatter statues
@@ -59,7 +63,11 @@
 	if(petrified_mob)
 		petrified_mob.status_flags &= ~GODMODE
 		petrified_mob.forceMove(loc)
+<<<<<<< HEAD
 		petrified_mob.disabilities &= ~MUTE
+=======
+		petrified_mob.remove_disability(DISABILITY_MUTE, STATUE_MUTE)
+>>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		petrified_mob.take_overall_damage((petrified_mob.health - obj_integrity + 100)) //any new damage the statue incurred is transfered to the mob
 		petrified_mob.faction -= "mimic"
 		petrified_mob = null