diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 54536db73c..ad7174f02a 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -3,8 +3,10 @@ desc = "A sword humming with unholy energy. It glows with a dim red light." icon_state = "cultblade" item_state = "cultblade" - lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi' + righthand_file = 'icons/mob/inhands/64x64_righthand.dmi' + inhand_x_dimension = 64 + inhand_y_dimension = 64 flags_1 = CONDUCT_1 sharpness = IS_SHARP w_class = WEIGHT_CLASS_BULKY diff --git a/code/game/gamemodes/cult/cult_items.dm.rej b/code/game/gamemodes/cult/cult_items.dm.rej index cb9c6324c1..5fbfc399bf 100644 --- a/code/game/gamemodes/cult/cult_items.dm.rej +++ b/code/game/gamemodes/cult/cult_items.dm.rej @@ -1,10 +1,10 @@ diff a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm (rejected hunks) -@@ -31,7 +31,7 @@ - /obj/item/melee/cultblade/ghost - name = "eldritch sword" - force = 19 //can't break normal airlocks -- flags = NODROP|DROPDEL -+ flags_1 = NODROP_1|DROPDEL_1 - - /obj/item/melee/cultblade/pickup(mob/living/user) - ..() +@@ -55,6 +57,8 @@ + item_state = "knife" + lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' ++ inhand_x_dimension = 32 ++ inhand_y_dimension = 32 + w_class = WEIGHT_CLASS_SMALL + force = 15 + throwforce = 25 diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 6d377cdcc5..5a5d9dd2e6 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -105,6 +105,10 @@ /obj/item/nullrod/claymore/darkblade icon_state = "cultblade" item_state = "cultblade" + lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi' + righthand_file = 'icons/mob/inhands/64x64_righthand.dmi' + inhand_x_dimension = 64 + inhand_y_dimension = 64 name = "dark blade" desc = "Spread the glory of the dark gods!" slot_flags = SLOT_BELT diff --git a/icons/mob/inhands/64x64_lefthand.dmi b/icons/mob/inhands/64x64_lefthand.dmi index ba2f54dac3..a9a952733a 100644 Binary files a/icons/mob/inhands/64x64_lefthand.dmi and b/icons/mob/inhands/64x64_lefthand.dmi differ diff --git a/icons/mob/inhands/64x64_righthand.dmi b/icons/mob/inhands/64x64_righthand.dmi index 05023605fa..bff96a991b 100644 Binary files a/icons/mob/inhands/64x64_righthand.dmi and b/icons/mob/inhands/64x64_righthand.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index 92ce2efa3e..7667672715 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ