more save points

code/modules/projectiles/gun.dm

@@ -158,11 +158,7 @@
 	//Exclude lasertag guns from the DISABILITY_CLUMSY check.
 	if(clumsy_check)
 		if(istype(user))
-<<<<<<< HEAD
-			if (user.disabilities & CLUMSY && prob(40))
-=======
 			if (user.has_disability(DISABILITY_CLUMSY) && prob(40))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 				to_chat(user, "<span class='userdanger'>You shoot yourself in the foot with [src]!</span>")
 				var/shot_leg = pick("l_leg", "r_leg")
 				process_fire(user,user,0,params, zone_override = shot_leg)

code/modules/projectiles/guns/ballistic/revolver.dm

@@ -349,11 +349,7 @@
 	clumsy_check = 0
 
 /obj/item/gun/ballistic/revolver/reverse/can_trigger_gun(mob/living/user)
-<<<<<<< HEAD
-	if((user.disabilities & CLUMSY) || (user.mind && user.mind.assigned_role == "Clown"))
-=======
 	if((user.has_disability(DISABILITY_CLUMSY)) || (user.mind && user.mind.assigned_role == "Clown"))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return ..()
 	if(process_fire(user, user, 0, zone_override = "head"))
 		user.visible_message("<span class='warning'>[user] somehow manages to shoot [user.p_them()]self in the face!</span>", "<span class='userdanger'>You somehow shoot yourself in the face! How the hell?!</span>")

code/modules/projectiles/pins.dm

@@ -129,11 +129,7 @@
 // A gun with ultra-honk pin is useful for clown and useless for everyone else.
 /obj/item/device/firing_pin/clown/ultra/pin_auth(mob/living/user)
 	playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1)
-<<<<<<< HEAD
-	if(!(user.disabilities & CLUMSY) && !(user.mind && user.mind.assigned_role == "Clown"))
-=======
 	if(!(user.has_disability(DISABILITY_CLUMSY)) && !(user.mind && user.mind.assigned_role == "Clown"))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return 0
 	return 1