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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447

Browse Source
This commit is contained in:
Ghommie
2019-12-23 04:32:09 +01:00
parent 284202a092 e39f9732e0
commit b75349bebf
541 changed files with 13581 additions and 3235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/melee/misc.dm
+6 -6
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")