From 2ab82dd93571239d60d1b9f16aaeaf5bf5990b8f Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Thu, 18 Sep 2025 13:44:54 -0700 Subject: [PATCH] [MIRROR] Santabag is a bag and no longer turns invisible (#11686) Co-authored-by: Will <7099514+Willburd@users.noreply.github.com> --- .../objects/items/weapons/storage/backpack.dm | 9 ------- .../objects/items/weapons/storage/bags.dm | 24 +++++++++++++++++++ 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 9abe18751f..5126f17cb3 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -101,15 +101,6 @@ return FALSE return ..() -/obj/item/storage/backpack/santabag - name = "\improper Santa's gift bag" - desc = "Space Santa uses this to deliver toys to all the nice children in space in Christmas! Wow, it's pretty big!" - icon_state = "giftbag0" - item_state_slots = list(slot_r_hand_str = "giftbag", slot_l_hand_str = "giftbag") - w_class = ITEMSIZE_LARGE - max_w_class = ITEMSIZE_NORMAL - max_storage_space = ITEMSIZE_COST_NORMAL * 100 // can store a ton of shit! - /obj/item/storage/backpack/cultpack name = "trophy rack" desc = "It's useful for both carrying extra gear and proudly declaring your insanity." diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 56466524b3..0bed0a9e5d 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -516,3 +516,27 @@ max_w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_SMALL can_hold = list(/obj/item/forensics/swab,/obj/item/sample/print,/obj/item/sample/fibers,/obj/item/evidencebag) + +// ----------------------------- +// Santa bag +// ----------------------------- +/obj/item/storage/bag/santabag + name = "\improper Santa's gift bag" + desc = "Space Santa uses this to deliver toys to all the nice children in space in Christmas! Wow, it's pretty big!" + icon = 'icons/obj/storage.dmi' + icon_state = "giftbag0" + item_state_slots = list(slot_r_hand_str = "giftbag", slot_l_hand_str = "giftbag") + + w_class = ITEMSIZE_LARGE + max_w_class = ITEMSIZE_NORMAL + max_storage_space = ITEMSIZE_COST_NORMAL * 100 // can store a ton of shit! + can_hold = list() // any + cant_hold = list(/obj/item/disk/nuclear) + +/obj/item/storage/bag/santabag/update_icon() + if(contents.len < 10) + icon_state = "giftbag0" + else if(contents.len < 25) + icon_state = "giftbag1" + else + icon_state = "giftbag2"