From 84182bc05cf00c2d7e5f6fa7dfe684dddf6d1176 Mon Sep 17 00:00:00 2001 From: jughu Date: Sun, 1 Jan 2023 14:23:30 +0100 Subject: [PATCH] Fixes a oversight with cummerbund. closes #72357 (#72373) Turns cummerbund from a full 7 slot belt for any item into a fannypack subtype(which holds 3 items) --- code/game/objects/items/storage/belt.dm | 14 +++++++------- code/modules/cargo/packs/service.dm | 2 +- code/modules/vending/autodrobe.dm | 2 +- tools/UpdatePaths/Scripts/72373_Cummerbund.txt | 1 + 4 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 tools/UpdatePaths/Scripts/72373_Cummerbund.txt diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 669a45b366d..80ba00d0966 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -482,13 +482,6 @@ /obj/item/clothing/mask/luchador )) -/obj/item/storage/belt/cummerbund - name = "cummerbund" - desc = "A pleated sash that pairs well with a suit jacket." - icon_state = "cummerbund" - inhand_icon_state = null - worn_icon_state = "cummerbund" - /obj/item/storage/belt/military name = "chest rig" desc = "A set of tactical webbing worn by Syndicate boarding parties." @@ -770,6 +763,13 @@ icon_state = "fannypack_yellow" worn_icon_state = "fannypack_yellow" +/obj/item/storage/belt/fannypack/cummerbund + name = "cummerbund" + desc = "A pleated sash that pairs well with a suit jacket." + icon_state = "cummerbund" + inhand_icon_state = null + worn_icon_state = "cummerbund" + /obj/item/storage/belt/sabre name = "sabre sheath" desc = "An ornate sheath designed to hold an officer's blade." diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm index d511bc15bd1..94a758f0aa1 100644 --- a/code/modules/cargo/packs/service.dm +++ b/code/modules/cargo/packs/service.dm @@ -178,7 +178,7 @@ cost = CARGO_CRATE_VALUE * 3 contains = list(/obj/item/clothing/under/dress/wedding_dress, /obj/item/clothing/under/suit/tuxedo, - /obj/item/storage/belt/cummerbund, + /obj/item/storage/belt/fannypack/cummerbund, /obj/item/clothing/head/costume/weddingveil, /obj/item/bouquet, /obj/item/bouquet/sunflower, diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index da1ac327cf7..5dc893aa2b2 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -220,7 +220,7 @@ /obj/item/clothing/under/dress/wedding_dress = 1, /obj/item/clothing/under/suit/tuxedo = 1, /obj/item/clothing/head/costume/weddingveil = 1, - /obj/item/storage/belt/cummerbund = 1, + /obj/item/storage/belt/fannypack/cummerbund = 1, /obj/item/clothing/suit/costume/drfreeze_coat = 1, /obj/item/clothing/under/costume/drfreeze = 1, /obj/item/clothing/head/costume/drfreezehat = 1, diff --git a/tools/UpdatePaths/Scripts/72373_Cummerbund.txt b/tools/UpdatePaths/Scripts/72373_Cummerbund.txt new file mode 100644 index 00000000000..95452da1f6d --- /dev/null +++ b/tools/UpdatePaths/Scripts/72373_Cummerbund.txt @@ -0,0 +1 @@ +/obj/item/storage/belt/cummerbund : /obj/item/storage/belt/fannypack/cummerbund{@OLD} \ No newline at end of file