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

Merge pull request #10144 from Linzolle/sabre-noise

Browse Source 
makes the officer's sabre play the un/sheating noise properly
This commit is contained in:
Putnam3145
2019-12-15 12:08:46 -08:00
committed by GitHub
parent 8e97b0e331 6c8dc1d294
commit b7d082a204
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/game/objects/items/melee/misc.dm
View File

@@ -79,17 +79,17 @@
final_block_chance = 0 //Don't bring a sword to a gunfight
return ..()
/obj/item/melee/sabre/on_exit_storage(obj/item/storage/S)
..()
var/obj/item/storage/belt/sabre/B = S
/obj/item/melee/sabre/on_exit_storage(datum/component/storage/S)
var/obj/item/storage/belt/sabre/B = S.parent
if(istype(B))
playsound(B, 'sound/items/unsheath.ogg', 25, 1)
/obj/item/melee/sabre/on_enter_storage(obj/item/storage/S)
..()
var/obj/item/storage/belt/sabre/B = S
/obj/item/melee/sabre/on_enter_storage(datum/component/storage/S)
var/obj/item/storage/belt/sabre/B = S.parent
if(istype(B))
playsound(B, 'sound/items/sheath.ogg', 25, 1)
..()
/obj/item/melee/sabre/get_belt_overlay()
return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "sabre")