diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm index be29bb1105b..5d540999ca1 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -136,11 +136,14 @@ /obj/item/kitchen/knife/ritual name = "ritual knife" desc = "The unearthly energies that once powered this blade are now dormant." - icon = 'icons/obj/wizard.dmi' - icon_state = "render" - worn_icon_state = "render" - lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' + icon = 'icons/obj/eldritch.dmi' + icon_state = "bone_blade" + inhand_icon_state = "bone_blade" + worn_icon_state = "bone_blade" + lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi' + righthand_file = 'icons/mob/inhands/64x64_righthand.dmi' + inhand_x_dimension = 64 + inhand_y_dimension = 64 w_class = WEIGHT_CLASS_NORMAL /obj/item/kitchen/knife/bloodletter diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index 9222f3087ca..16034ab7395 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -6,11 +6,14 @@ /obj/item/veilrender name = "veil render" desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast city." - icon = 'icons/obj/wizard.dmi' - icon_state = "render" - inhand_icon_state = "knife" - lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' + icon = 'icons/obj/eldritch.dmi' + icon_state = "bone_blade" + inhand_icon_state = "bone_blade" + worn_icon_state = "bone_blade" + lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi' + righthand_file = 'icons/mob/inhands/64x64_righthand.dmi' + inhand_x_dimension = 64 + inhand_y_dimension = 64 force = 15 throwforce = 10 w_class = WEIGHT_CLASS_NORMAL @@ -87,7 +90,9 @@ spawn_amt = 10 activate_descriptor = "depression" rend_desc = "Gently wafting with the sounds of endless laughter." - icon_state = "clownrender" + icon_state = "banana_blade" + inhand_icon_state = "banana_blade" + worn_icon_state = "render" /obj/item/veilrender/honkrender/honkhulkrender name = "superior honk render" @@ -96,7 +101,6 @@ spawn_amt = 5 activate_descriptor = "depression" rend_desc = "Gently wafting with the sounds of mirthful grunting." - icon_state = "clownrender" #define TEAR_IN_REALITY_CONSUME_RANGE 3 #define TEAR_IN_REALITY_SINGULARITY_SIZE STAGE_FOUR diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index bf6af3dc3aa..acb013d0d1c 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -8,6 +8,7 @@ name = "glass bottle" desc = "This blank bottle is unyieldingly anonymous, offering no clues to its contents." icon_state = "glassbottle" + worn_icon_state = "bottle" fill_icon_thresholds = list(0, 10, 20, 30, 40, 50, 60, 70, 80, 90) custom_price = PAYCHECK_EASY * 1.1 amount_per_transfer_from_this = 10 diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 3f103b7477c..f149257ee13 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index a5f3a740162..f12803c66b5 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/clothing/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi index d9e0f0c3bca..b64fd75359c 100644 Binary files a/icons/mob/clothing/belt_mirror.dmi and b/icons/mob/clothing/belt_mirror.dmi differ diff --git a/icons/mob/inhands/64x64_lefthand.dmi b/icons/mob/inhands/64x64_lefthand.dmi index 51fc21053f8..8a18be5580e 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 708daed9b4d..4ad421a29e6 100644 Binary files a/icons/mob/inhands/64x64_righthand.dmi and b/icons/mob/inhands/64x64_righthand.dmi differ diff --git a/icons/obj/eldritch.dmi b/icons/obj/eldritch.dmi index 9d5beb61aec..38de4f4fb8b 100644 Binary files a/icons/obj/eldritch.dmi and b/icons/obj/eldritch.dmi differ