From bcdcf311ed67e3554b6d0f5a1601f76b56b5dc8a Mon Sep 17 00:00:00 2001 From: Fghj240 <43589874+Fghj240@users.noreply.github.com> Date: Wed, 10 Dec 2025 12:16:28 -0800 Subject: [PATCH] Supply pod dismember cleanup and also an e was missing somewhere (#94330) ## About The Pull Request Supply pod had an unnecessary check because dismember() already checks for unremovable body parts. Also there was an e missing from sleeping carp text. ## Why It's Good For The Game spellcheck, also I left the supply pod stuff out of the changelog because it isn't player facing ## Changelog :cl: spellcheck: fixed a missing e in sleeping carp's recall teachings verb /:cl: Co-authored-by: Fghj240 --- code/datums/martial/sleeping_carp.dm | 2 +- code/modules/cargo/supplypod.dm | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index bd33e55c170..b6f556e3aa8 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -383,7 +383,7 @@ [span_notice("Crashing Wave Kick")]: Punch Shove. Launch your opponent away from you with incredible force!\n\ [span_notice("Keelhaul")]: Shove Shove. Nonlethally kick an opponent to the floor, knocking them down, discombobulating them and dealing substantial stamina damage. If they're already prone, disarm them as well.\n\ [span_notice("Kraken Wrack")]: Grab Punch. Deliver a knee jab into the opponent, dealing high stamina damage, as well as briefly stunning them, winding them and making it difficult for them to speak.\n\ - [span_notice("Grabs and Shoves")]: While in combat mode, your typical grab and shove do decent stamina damag, and your grabs harder to break. If you grab someone who has substantial amounts of stamina damage, you knock them out!\n\ + [span_notice("Grabs and Shoves")]: While in combat mode, your typical grab and shove do decent stamina damage, and your grabs harder to break. If you grab someone who has substantial amounts of stamina damage, you knock them out!\n\ While in combat mode (and not stunned, not a hulk, and not in a mech), you can reflect all projectiles that come your way, sending them back at the people who fired them! \n\ However, your ability to avoid projectiles is negatively affected when your are burdened by armor, or whenever you are carrying normal-sized or heavier objects in your hands. \n\ But if you commmit fully to the martial arts lifestyle by wearing martial arts or carp-related regalia, you will feel empowered enough to potentially avoid attacks even from melee weapons or other unarmed combatants. \n\ diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index 73875c011f7..bcc18308849 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -332,8 +332,7 @@ 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.bodypart_flags & BODYPART_UNREMOVABLE)) - bodypart.dismember() //Using the power of flextape i've sawed this man's limb in half! + if(bodypart.dismember()) //Using the power of flextape i've sawed this man's limb in half! break if (effectOrgans) //effectOrgans means remove every organ in our mob var/mob/living/carbon/carbon_target_mob = target_living @@ -346,8 +345,7 @@ 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 var/destination = get_edge_target_turf(turf_underneath, pick(GLOB.alldirs)) - if (!(bodypart.bodypart_flags & BODYPART_UNREMOVABLE)) - bodypart.dismember() //Using the power of flextape i've sawed this man's bodypart in half! + if (bodypart.dismember()) //Using the power of flextape i've sawed this man's bodypart in half! bodypart.throw_at(destination, 2, 3) sleep(0.1 SECONDS)