From ec5ebf099c2eb00e59e17c9e5ade431ff9731b3c Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Fri, 8 Sep 2017 10:09:42 -0500 Subject: [PATCH] Proper Inheritance --- code/game/objects/items/holy_weapons.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 75bbe5b6703..a552835e554 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -330,14 +330,10 @@ w_class = WEIGHT_CLASS_HUGE sharpness = IS_SHARP -/obj/item/nullrod/tentacle +/obj/item/nullrod/armblade/tentacle name = "unholy blessing" - desc = "Particularly twisted dieties grant gifts of dubious value." icon_state = "tentacle" item_state = "tentacle" - lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi' - righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi' - sharpness = IS_SHARP /obj/item/nullrod/carp name = "carp-sie plushie"