From d60d72c7b79afb1d848173d93a6d4520998070cf Mon Sep 17 00:00:00 2001 From: Xantholne Date: Fri, 18 Dec 2020 22:03:24 -0700 Subject: [PATCH 1/3] Fixes twin belts gives item state and icon state to be functional --- code/game/objects/items/storage/belt.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 2a1844d218..7221a971f0 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -853,8 +853,8 @@ /obj/item/storage/belt/sabre/twin name = "twin sheath" desc = "Two sheaths. One is capable of holding a katana (or bokken) and the other a wakizashi. You could put two wakizashis in if you really wanted to. Now you can really roleplay as a samurai." - icon_state = "twinsheath" - item_state = "quiver" //this'll do. + icon_state = "2sheath" + item_state = "katana" //this'll do. w_class = WEIGHT_CLASS_BULKY fitting_swords = list(/obj/item/melee/smith/wakizashi, /obj/item/melee/smith/twohand/katana, /obj/item/melee/bokken) starting_sword = null From a5c14b90c5ccfd4e5c4c18ddfbdd574ff5346e2c Mon Sep 17 00:00:00 2001 From: Xantholne Date: Fri, 18 Dec 2020 22:56:30 -0700 Subject: [PATCH 2/3] Adds missing sheathing sounds --- code/game/objects/items/storage/belt.dm | 36 +++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 7221a971f0..f24b0c0ccf 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -865,6 +865,42 @@ STR.max_items = 2 STR.max_w_class = WEIGHT_CLASS_BULKY + WEIGHT_CLASS_NORMAL //katana and waki. +/obj/item/melee/smith/twohand/katana/on_exit_storage(datum/component/storage/S) + var/obj/item/storage/belt/sabre/twin/B = S.parent + if(istype(B)) + playsound(B, 'sound/items/unsheath.ogg', 25, 1) + ..() + +/obj/item/melee/smith/twohand/katana/on_enter_storage(datum/component/storage/S) + var/obj/item/storage/belt/sabre/twin/B = S.parent + if(istype(B)) + playsound(B, 'sound/items/sheath.ogg', 25, 1) + ..() + +/obj/item/melee/smith/wakizashi/on_exit_storage(datum/component/storage/S) + var/obj/item/storage/belt/sabre/twin/B = S.parent + if(istype(B)) + playsound(B, 'sound/items/unsheath.ogg', 25, 1) + ..() + +/obj/item/melee/smith/wakizashi/on_enter_storage(datum/component/storage/S) + var/obj/item/storage/belt/sabre/twin/B = S.parent + if(istype(B)) + playsound(B, 'sound/items/sheath.ogg', 25, 1) + ..() + +/obj/item/melee/bokken/on_exit_storage(datum/component/storage/S) + var/obj/item/storage/belt/sabre/twin/B = S.parent + if(istype(B)) + playsound(B, 'sound/items/unsheath.ogg', 25, 1) + ..() + +/obj/item/melee/bokken/on_enter_storage(datum/component/storage/S) + var/obj/item/storage/belt/sabre/twin/B = S.parent + if(istype(B)) + playsound(B, 'sound/items/sheath.ogg', 25, 1) + ..() + /obj/item/storage/belt/plant name = "botanical belt" desc = "A belt used to hold most hydroponics supplies. Suprisingly, not green." From 1c968e6ebe2ce62737c4366820412e7a1f4b72fb Mon Sep 17 00:00:00 2001 From: Xantholne Date: Sun, 20 Dec 2020 16:00:18 -0700 Subject: [PATCH 3/3] period equals --- code/game/objects/items/storage/belt.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index f24b0c0ccf..abd862736b 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -869,37 +869,37 @@ var/obj/item/storage/belt/sabre/twin/B = S.parent if(istype(B)) playsound(B, 'sound/items/unsheath.ogg', 25, 1) - ..() + . = ..() /obj/item/melee/smith/twohand/katana/on_enter_storage(datum/component/storage/S) var/obj/item/storage/belt/sabre/twin/B = S.parent if(istype(B)) playsound(B, 'sound/items/sheath.ogg', 25, 1) - ..() + . = ..() /obj/item/melee/smith/wakizashi/on_exit_storage(datum/component/storage/S) var/obj/item/storage/belt/sabre/twin/B = S.parent if(istype(B)) playsound(B, 'sound/items/unsheath.ogg', 25, 1) - ..() + . = ..() /obj/item/melee/smith/wakizashi/on_enter_storage(datum/component/storage/S) var/obj/item/storage/belt/sabre/twin/B = S.parent if(istype(B)) playsound(B, 'sound/items/sheath.ogg', 25, 1) - ..() + . = ..() /obj/item/melee/bokken/on_exit_storage(datum/component/storage/S) var/obj/item/storage/belt/sabre/twin/B = S.parent if(istype(B)) playsound(B, 'sound/items/unsheath.ogg', 25, 1) - ..() + . = ..() /obj/item/melee/bokken/on_enter_storage(datum/component/storage/S) var/obj/item/storage/belt/sabre/twin/B = S.parent if(istype(B)) playsound(B, 'sound/items/sheath.ogg', 25, 1) - ..() + . = ..() /obj/item/storage/belt/plant name = "botanical belt"