From f5d599fafa5ba6d91a135f7bc91f697773207289 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue, 3 Aug 2021 21:01:10 +0200
Subject: [PATCH] [MIRROR] picked up bees and mice can now fit in boxes.
 (#7325)

* picked up bees and mice can now fit in boxes. (#60161)

* picked up bees and mice can now fit in boxes.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
---
 code/modules/mob/living/inhand_holder.dm                | 1 +
 code/modules/mob/living/living_defines.dm               | 8 ++++++--
 code/modules/mob/living/simple_animal/friendly/mouse.dm | 1 +
 code/modules/mob/living/simple_animal/hostile/bees.dm   | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/inhand_holder.dm b/code/modules/mob/living/inhand_holder.dm
index 7a0aa4c0527..dcf408cd99a 100644
--- a/code/modules/mob/living/inhand_holder.dm
+++ b/code/modules/mob/living/inhand_holder.dm
@@ -20,6 +20,7 @@
 		righthand_file = rh_icon
 	if(worn_slot_flags)
 		slot_flags = worn_slot_flags
+	w_class = M.held_w_class
 	deposit(M)
 	. = ..()
 
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 68a60f2e013..3e3a8282d25 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -138,8 +138,12 @@
 
 	var/list/obj/effect/proc_holder/abilities = list()
 
-	var/can_be_held = FALSE //whether this can be picked up and held.
-	var/worn_slot_flags = NONE //if it can be held, can it be equipped to any slots? (think pAI's on head)
+	///whether this can be picked up and held.
+	var/can_be_held = FALSE
+	/// The w_class of the holder when held.
+	var/held_w_class = WEIGHT_CLASS_NORMAL
+	///if it can be held, can it be equipped to any slots? (think pAI's on head)
+	var/worn_slot_flags = NONE
 
 	var/radiation = 0 ///If the mob is irradiated.
 	var/ventcrawl_layer = PIPING_LAYER_DEFAULT
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index 131f1eff1b6..4c211993a22 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -28,6 +28,7 @@
 	gold_core_spawnable = FRIENDLY_SPAWN
 	var/chew_probability = 1
 	can_be_held = TRUE
+	held_w_class = WEIGHT_CLASS_TINY
 	held_state = "mouse_gray"
 	faction = list("rat")
 
diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index 6dd1101ca23..c5af0ab5040 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -44,6 +44,7 @@
 	gold_core_spawnable = FRIENDLY_SPAWN
 	search_objects = 1 //have to find those plant trays!
 	can_be_held = TRUE
+	held_w_class = WEIGHT_CLASS_TINY
 
 	//Spaceborn beings don't get hurt by space
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)