From 0aa7a69f5d84df86c8d6707305e12db38f0ccefa Mon Sep 17 00:00:00 2001 From: Alberyk Date: Mon, 11 May 2020 20:00:10 -0300 Subject: [PATCH] Stops borgs from stripping people (#8838) --- code/modules/mob/living/carbon/human/stripping.dm | 2 +- html/changelogs/alberyk-borgstripping.yml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/alberyk-borgstripping.yml diff --git a/code/modules/mob/living/carbon/human/stripping.dm b/code/modules/mob/living/carbon/human/stripping.dm index 63bc7b72cc1..f08c92d3ffc 100644 --- a/code/modules/mob/living/carbon/human/stripping.dm +++ b/code/modules/mob/living/carbon/human/stripping.dm @@ -1,5 +1,5 @@ /mob/living/carbon/human/proc/handle_strip(var/slot_to_strip, var/mob/living/user) - if(!slot_to_strip || !istype(user) || ispAI(user) || (isanimal(user) && !istype(user, /mob/living/simple_animal/hostile) ) ) + if(!slot_to_strip || !istype(user) || ispAI(user) || (isanimal(user) && !istype(user, /mob/living/simple_animal/hostile) ) || isrobot(user) ) return FALSE if(user.incapacitated() || !user.Adjacent(src)) diff --git a/html/changelogs/alberyk-borgstripping.yml b/html/changelogs/alberyk-borgstripping.yml new file mode 100644 index 00000000000..33781e0d005 --- /dev/null +++ b/html/changelogs/alberyk-borgstripping.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - tweak: "Cyborgs can't remove items or clothing from human mobs anymore."