From 46e1f8ff27ab653bb6f03f6cab53976d580a2c51 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 9 Dec 2025 14:52:03 -0600 Subject: [PATCH] Fix closets, crates, and drawers missing material tags (#94273) ## About The Pull Request This adds custom material lists to closets and crates so it shows what materials they are made out of when examined. ## Why It's Good For The Game dreamseeker_XhFtjANMiX ## Changelog :cl: fix: Fix closets, crates, and drawers missing material tags /:cl: --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/game/objects/structures/crates_lockers/closets.dm | 1 - .../objects/structures/crates_lockers/closets/cardboardbox.dm | 2 ++ code/game/objects/structures/crates_lockers/closets/gimmick.dm | 3 +++ .../structures/crates_lockers/closets/secure/personal.dm | 2 ++ code/game/objects/structures/crates_lockers/crates/wooden.dm | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 7cb1f75050e..a01ba7fdeef 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -21,7 +21,6 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets) contents_thermal_insulation = 0 pass_flags_self = PASSSTRUCTURE | LETPASSCLICKS custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2) - /// The overlay for the closet's door var/obj/effect/overlay/closet_door/door_obj /// Whether or not this door is being animated diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index 9ac66a11fe9..66f7e2780e5 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -9,6 +9,7 @@ can_weld_shut = 0 cutting_tool = /obj/item/wirecutters material_drop = /obj/item/stack/sheet/cardboard + material_drop_amount = 4 custom_materials = list(/datum/material/cardboard = SHEET_MATERIAL_AMOUNT * 4) delivery_icon = "deliverybox" anchorable = FALSE @@ -119,4 +120,5 @@ close_sound = 'sound/machines/crate/crate_close.ogg' open_sound_volume = 35 close_sound_volume = 50 + custom_materials = list(/datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 4) material_drop = /obj/item/stack/sheet/plasteel diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index 24e9c93bdb9..d0d8689bc97 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -9,12 +9,15 @@ close_sound_volume = 50 max_integrity = 70 door_anim_time = 0 // no animation + material_drop = /obj/item/stack/sheet/mineral/wood + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 2) /obj/structure/closet/acloset name = "strange closet" desc = "It looks alien!" icon_state = "alien" material_drop = /obj/item/stack/sheet/mineral/abductor + custom_materials = list(/datum/material/alloy/alien = SHEET_MATERIAL_AMOUNT * 2) /obj/structure/closet/gimmick name = "administrative supply closet" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index f639df5f128..01eb0550d57 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -45,6 +45,8 @@ open_sound_volume = 25 close_sound_volume = 50 door_anim_time = 0 // no animation + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 2) + material_drop = /obj/item/stack/sheet/mineral/wood /obj/structure/closet/secure_closet/personal/cabinet/PopulateContents() new /obj/item/storage/backpack/satchel/leather/withwallet( src ) diff --git a/code/game/objects/structures/crates_lockers/crates/wooden.dm b/code/game/objects/structures/crates_lockers/crates/wooden.dm index 062428d6f43..284bea5243d 100644 --- a/code/game/objects/structures/crates_lockers/crates/wooden.dm +++ b/code/game/objects/structures/crates_lockers/crates/wooden.dm @@ -1,6 +1,7 @@ /obj/structure/closet/crate/wooden name = "wooden crate" desc = "Works just as well as a metal one." + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 6) material_drop = /obj/item/stack/sheet/mineral/wood material_drop_amount = 6 icon_state = "wooden"