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

Merge pull request #12690 from BlackMajor/master

Browse Source 
[s] Inheritance is something often overlooked.
This commit is contained in:
silicons
2020-07-04 01:52:13 -07:00
committed by GitHub
parent f3f9429257 afdf8c698a
commit bb065abab7
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/items/toys.dm
View File

@@ -450,7 +450,6 @@
sharpness = IS_BLUNT
/obj/item/dualsaber/toy/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=0, wieldsound='sound/weapons/saberon.ogg', unwieldsound='sound/weapons/saberoff.ogg')
/obj/item/dualsaber/toy/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
@@ -470,7 +469,6 @@
sharpness = IS_BLUNT
/obj/item/dualsaber/hypereutactic/toy/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=0, wieldsound='sound/weapons/saberon.ogg', unwieldsound='sound/weapons/saberoff.ogg')
/obj/item/dualsaber/hypereutactic/toy/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)