From b31e548c252cfbe69c8d0a9b1d58368a6eb02b8b Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Thu, 26 Oct 2023 11:41:55 +0200 Subject: [PATCH] Moves the `can_leave_fibers` var to `/obj/item/clothing` instead of being on `/atom` (#23005) * Ezpz * GDN review * Belts aren't clothing * Update code/modules/clothing/clothing.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> --------- Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> --- code/game/atoms.dm | 3 --- code/modules/clothing/clothing.dm | 3 +++ code/modules/mob/living/carbon/human/human_defines.dm | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index a7723c649c4..2fc37b6c259 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -37,9 +37,6 @@ //Detective Work, used for the duplicate data points kept in the scanners var/list/original_atom - //Detective Work, used for allowing a given atom to leave its fibers on stuff. Allowed by default - var/can_leave_fibers = TRUE - var/admin_spawned = FALSE //was this spawned by an admin? used for stat tracking stuff. var/initialized = FALSE diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index b59c865a3f8..385af84f4ca 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -39,6 +39,9 @@ var/blockTracking w_class = WEIGHT_CLASS_SMALL + /// Detective Work, used for allowing a given atom to leave its fibers on stuff. Allowed by default + var/can_leave_fibers = TRUE + /obj/item/clothing/update_icon_state() if(!can_toggle) return diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index f70deb5ab42..d6b74d07a08 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -29,10 +29,10 @@ //Equipment slots var/obj/item/clothing/under/w_uniform = null - var/obj/item/shoes = null + var/obj/item/clothing/shoes = null var/obj/item/belt = null - var/obj/item/gloves = null - var/obj/item/glasses = null + var/obj/item/clothing/gloves = null + var/obj/item/clothing/glasses = null var/obj/item/l_ear = null var/obj/item/r_ear = null var/obj/item/wear_id = null