From ba89c5f276839192be696b9b336b78475fe56e0f Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Mon, 23 Oct 2023 21:57:00 +0200 Subject: [PATCH 1/4] Ezpz --- code/game/atoms.dm | 3 --- code/game/objects/items.dm | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index affb125eb0ce..0f11ca369f71 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/game/objects/items.dm b/code/game/objects/items.dm index bad62caa116b..347586ab5b89 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -133,6 +133,8 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons /// Holder var for the item outline filter, null when no outline filter on the item. var/outline_filter + //Detective Work, used for allowing a given atom to leave its fibers on stuff. Allowed by default + var/can_leave_fibers = TRUE /obj/item/New() ..() From c1ab0133b086bbc6cceb3b95aefef3d2f0282552 Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Mon, 23 Oct 2023 22:25:34 +0200 Subject: [PATCH 2/4] GDN review --- code/game/objects/items.dm | 2 -- code/modules/clothing/clothing.dm | 3 +++ code/modules/mob/living/carbon/human/human_defines.dm | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 347586ab5b89..bad62caa116b 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -133,8 +133,6 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons /// Holder var for the item outline filter, null when no outline filter on the item. var/outline_filter - //Detective Work, used for allowing a given atom to leave its fibers on stuff. Allowed by default - var/can_leave_fibers = TRUE /obj/item/New() ..() diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index d061aaf0f713..3dcd233be203 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 f70deb5ab420..179faac85167 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/belt = null - var/obj/item/gloves = null - var/obj/item/glasses = null + var/obj/item/clothing/shoes = null + var/obj/item/clothing/belt = 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 From 3872cfbdd0216c0cb360ac2722a7024f7fa08dc1 Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Mon, 23 Oct 2023 22:26:03 +0200 Subject: [PATCH 3/4] Belts aren't clothing --- code/modules/mob/living/carbon/human/human_defines.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 179faac85167..d6b74d07a08f 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -30,7 +30,7 @@ //Equipment slots var/obj/item/clothing/under/w_uniform = null var/obj/item/clothing/shoes = null - var/obj/item/clothing/belt = null + var/obj/item/belt = null var/obj/item/clothing/gloves = null var/obj/item/clothing/glasses = null var/obj/item/l_ear = null From c3feb04533cace52bfab4af2aad048d88d276820 Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Thu, 26 Oct 2023 00:26:51 +0200 Subject: [PATCH 4/4] Update code/modules/clothing/clothing.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> --- code/modules/clothing/clothing.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 3dcd233be203..c8ebcbb7b0d6 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -39,7 +39,7 @@ var/blockTracking w_class = WEIGHT_CLASS_SMALL - //Detective Work, used for allowing a given atom to leave its fibers on stuff. Allowed by default + /// 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()