what have i done (#21112)

yogstation13 · Dec 17, 2023 · 66f1c77 · 66f1c77
1 parent d4d7346
commit 66f1c77
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
@@ -1169,7 +1169,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 			if(iscarbon(target))
 				var/mob/living/carbon/CM = target
 				for(var/obj/item/bodypart/bodypart in CM.bodyparts)
-					if(bodypart.body_part != HEAD && bodypart.body_part != CHEST)
+					if(!(bodypart.body_part & (HEAD|CHEST)))
 						if(bodypart.dismemberable)
 							bodypart.dismember()
 		if(ADMIN_PUNISHMENT_GIB)

diff --git a/code/modules/antagonists/bloodsuckers/powers/targeted/tzimisce.dm b/code/modules/antagonists/bloodsuckers/powers/targeted/tzimisce.dm
@@ -143,7 +143,7 @@
 	if(ishuman(target))
 		var/mob/living/carbon/human/H = target
 		for(var/obj/item/bodypart/bodypart in H.bodyparts)
-			if(bodypart.body_part != HEAD && bodypart.body_part != CHEST)
+			if(bodypart.body_part & (HEAD|CHEST))
 				if(bodypart.dismemberable)
 					bodypart.dismember()
 					qdel(bodypart)
@@ -154,7 +154,7 @@
 	if(iscarbon(target))
 		var/mob/living/carbon/C = target
 		for(var/obj/item/bodypart/bodypart in C.bodyparts)
-			if(bodypart.body_part != HEAD && bodypart.body_part != CHEST)
+			if(!(bodypart.body_part & (HEAD|CHEST)))
 				if(bodypart.dismemberable)
 					bodypart.dismember()
 					qdel(bodypart)

diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm
@@ -227,7 +227,7 @@
 				var/mob/living/carbon/carbon_target_mob = target_living
 				for (var/bp in carbon_target_mob.bodyparts) //Look at the bodyparts in our poor mob beneath our pod as it lands
 					var/obj/item/bodypart/bodypart = bp
-					if(bodypart.body_part != HEAD && bodypart.body_part != CHEST)//we dont want to kill him, just teach em a lesson!
+					if(!(bodypart.body_part & (HEAD|CHEST)))//we dont want to kill him, just teach em a lesson!
 						if (bodypart.dismemberable)
 							bodypart.dismember() //Using the power of flextape i've sawed this man's limb in half!
 							break

diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
@@ -408,7 +408,7 @@ mob/living/simple_animal/hostile/construct/attackby(obj/item/W, mob/living/user,
 		var/undismembermerable_limbs = 0
 		for(var/X in C.bodyparts)
 			var/obj/item/bodypart/BP = X
-			if(BP.body_part != HEAD && BP.body_part != CHEST)
+			if(!(BP.body_part & (HEAD|CHEST)))
 				if(BP.dismemberable)
 					parts += BP
 				else

diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
@@ -49,7 +49,7 @@
 		if(C.stat >= UNCONSCIOUS)
 			for(var/X in C.bodyparts)
 				var/obj/item/bodypart/BP = X
-				if(BP.body_part != HEAD && BP.body_part != CHEST)
+				if(!(BP.body_part & (HEAD|CHEST)))
 					if(BP.dismemberable)
 						parts += BP
 			return parts