From f845f9a85b683366148b11fdb378237607d8e2d0 Mon Sep 17 00:00:00 2001 From: Casper3667 <8396443+Casper3667@users.noreply.github.com> Date: Sat, 13 Nov 2021 13:42:19 +0100 Subject: [PATCH] makes vaurca not suffocate when hanged (#12748) changelog Co-authored-by: TGW --- code/modules/power/cable.dm | 6 +++++- html/changelogs/VaurcaBreathing.yml | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/VaurcaBreathing.yml diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index f61f27aed90..40c354e19c9 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -1116,6 +1116,10 @@ obj/structure/cable/proc/cableColor(var/colorC) to_chat(user, SPAN_DANGER("They don't have a head.")) return + if(M.mob_size >= 20) + to_chat(user, SPAN_DANGER("They are too large for the noose to hold.")) + return + if(M.loc != src.loc) return FALSE //Can only noose someone if they're on the same tile as noose add_fingerprint(user) @@ -1193,7 +1197,7 @@ obj/structure/cable/proc/cableColor(var/colorC) var/mob/living/B = buckled if (ishuman(B)) var/mob/living/carbon/human/H = B - if (H.species && (H.species.flags & NO_BREATHE)) + if (H.species && (H.species.flags & NO_BREATHE) || isvaurca(H)) return B.adjustOxyLoss(5) B.adjustBrainLoss(1) diff --git a/html/changelogs/VaurcaBreathing.yml b/html/changelogs/VaurcaBreathing.yml new file mode 100644 index 00000000000..b797904b8c0 --- /dev/null +++ b/html/changelogs/VaurcaBreathing.yml @@ -0,0 +1,4 @@ +author: TheGreyWolf +delete-after: True +changes: + - rscadd: "Vaurca no longer suffocate when hanged. Bulwarks and Ta can no longer be hanged."