shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13814 from Xantholne/TwinSwordSheath

Browse Source 
Fixes twin sword sheaths icon/item state from being blank sprites
This commit is contained in:
DeltaFire
2020-12-21 02:20:32 +01:00
committed by GitHub
parent 7a5f47776a 1c968e6ebe
commit 8414db5add
1 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/belt.dm
+38 -2
View File
@@ -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
@@ -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."