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

Merge branch 'crepe' of https://github.com/zeroisthebiggay/Citadel-Station-13 into crepe

Browse Source
This commit is contained in:
zerothebigboy
2020-10-11 01:20:34 -04:00
parent a8315a69e2 36b1e0b613
commit 9e04d5723c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stunbaton.dm
+2 -2
View File
@@ -249,13 +249,13 @@
return mutable_appearance(icon_file, "-stunsword") return mutable_appearance(icon_file, "-stunsword")
/obj/item/melee/baton/stunsword/on_exit_storage(datum/component/storage/S) /obj/item/melee/baton/stunsword/on_exit_storage(datum/component/storage/S)
var/obj/item/storage/belt/sabre/B = S.parent var/obj/item/storage/belt/sabre/secbelt/B = S.parent
if(istype(B)) if(istype(B))
playsound(B, 'sound/items/unsheath.ogg', 25, 1) playsound(B, 'sound/items/unsheath.ogg', 25, 1)
..() ..()
/obj/item/melee/baton/stunsword/on_enter_storage(datum/component/storage/S) /obj/item/melee/baton/stunsword/on_enter_storage(datum/component/storage/S)
var/obj/item/storage/belt/sabre/B = S.parent var/obj/item/storage/belt/sabre/secbelt/B = S.parent
if(istype(B)) if(istype(B))
playsound(B, 'sound/items/sheath.ogg', 25, 1) playsound(B, 'sound/items/sheath.ogg', 25, 1)
..() ..()