save point - a lot of shit to fix

code/game/objects/structures/petrified_statue.dm

@@ -17,11 +17,7 @@
 			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
@@ -63,11 +59,7 @@
 	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