From 7aefac9692fa5d48844141c66826481d869943e0 Mon Sep 17 00:00:00 2001 From: Shadow-Quill <44811257+Shadow-Quill@users.noreply.github.com> Date: Thu, 2 Sep 2021 10:52:45 -0500 Subject: [PATCH] No-Handed humans can no longer strip people (#12414) --- .../mob/living/carbon/human/stripping.dm | 9 ++++ html/changelogs/Shadow Quill-PR-12414.yml | 41 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 html/changelogs/Shadow Quill-PR-12414.yml diff --git a/code/modules/mob/living/carbon/human/stripping.dm b/code/modules/mob/living/carbon/human/stripping.dm index 97f297e0c19..a69b0eeaa73 100644 --- a/code/modules/mob/living/carbon/human/stripping.dm +++ b/code/modules/mob/living/carbon/human/stripping.dm @@ -6,6 +6,15 @@ user << browse(null, text("window=mob[src.name]")) return FALSE + if(ishuman(user)) + // If you're a human and don't have hands, you shouldn't be able to strip someone. + var/mob/living/carbon/human/H = user + var/obj/item/organ/external/l_hand = H.get_organ(BP_L_HAND) + var/obj/item/organ/external/r_hand = H.get_organ(BP_R_HAND) + if(!(l_hand && l_hand.is_usable()) && !(r_hand && r_hand.is_usable())) + to_chat(user, SPAN_WARNING("You can't do that without working hands!")) + return FALSE + var/obj/item/target_slot = get_equipped_item(text2num(slot_to_strip)) if(istype(target_slot, /obj/item/clothing/ears/offear)) target_slot = (l_ear == target_slot ? r_ear : l_ear) diff --git a/html/changelogs/Shadow Quill-PR-12414.yml b/html/changelogs/Shadow Quill-PR-12414.yml new file mode 100644 index 00000000000..07f94475433 --- /dev/null +++ b/html/changelogs/Shadow Quill-PR-12414.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Shadow Quill + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Human mobs can no longer use the strip panel if they don't have working hands."