From 5a63eba57a0b09dfb32b96ce465c64d753343b8d Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Fri, 3 Apr 2020 00:23:58 +0200 Subject: [PATCH 1/2] Stops a monky trick with mob holders. --- code/datums/elements/mob_holder.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/datums/elements/mob_holder.dm b/code/datums/elements/mob_holder.dm index 3cd5367f65..557cfb8f34 100644 --- a/code/datums/elements/mob_holder.dm +++ b/code/datums/elements/mob_holder.dm @@ -162,6 +162,11 @@ L.visible_message("[held_mob] escapes from [L]!", "[held_mob] escapes your grip!") release() +/obj/item/clothing/head/mob_holder/mob_can_equip(mob/living/M, mob/living/equipper, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE) + if(!ishuman(M)) //monkeys holding monkeys holding monkeys... + return FALSE + return ..() + /obj/item/clothing/head/mob_holder/assume_air(datum/gas_mixture/env) var/atom/location = loc if(!loc) From 1c81c8676b50df83a54eea2bd15850b08744d22a Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Fri, 3 Apr 2020 00:33:38 +0200 Subject: [PATCH 2/2] Stops alopecia. --- code/datums/elements/mob_holder.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/datums/elements/mob_holder.dm b/code/datums/elements/mob_holder.dm index 557cfb8f34..220aee4608 100644 --- a/code/datums/elements/mob_holder.dm +++ b/code/datums/elements/mob_holder.dm @@ -76,6 +76,7 @@ lefthand_file = 'icons/mob/animals_held_lh.dmi' icon_state = "" w_class = WEIGHT_CLASS_BULKY + dynamic_hair_suffix = "" var/mob/living/held_mob /obj/item/clothing/head/mob_holder/Initialize(mapload, mob/living/target, worn_state, alt_worn, right_hand, left_hand, slots = NONE)