diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index 5ddb39e92e2..5ae4ead27e7 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -164,6 +164,7 @@ icon = 'icons/obj/items_and_weapons.dmi' icon_state = "bike_horn" inhand_icon_state = "bike_horn" + worn_icon_state = "horn" lefthand_file = 'icons/mob/inhands/equipment/horns_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/horns_righthand.dmi' throwforce = 0 @@ -195,6 +196,7 @@ name = "air horn" desc = "Damn son, where'd you find this?" icon_state = "air_horn" + worn_icon_state = "horn_air" /obj/item/bikehorn/airhorn/Initialize() . = ..() @@ -206,6 +208,7 @@ desc = "Golden? Clearly, it's made with bananium! Honk!" icon_state = "gold_horn" inhand_icon_state = "gold_horn" + worn_icon_state = "horn_gold" COOLDOWN_DECLARE(golden_horn_cooldown) /obj/item/bikehorn/golden/attack() diff --git a/code/game/objects/items/singularityhammer.dm b/code/game/objects/items/singularityhammer.dm index 699e496c1db..38568071300 100644 --- a/code/game/objects/items/singularityhammer.dm +++ b/code/game/objects/items/singularityhammer.dm @@ -82,6 +82,7 @@ name = "Mjolnir" desc = "A weapon worthy of a god, able to strike with the force of a lightning bolt. It crackles with barely contained energy." icon_state = "mjollnir0" + worn_icon_state = "mjolnir" lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi' flags_1 = CONDUCT_1 diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 08e3c343859..f46ff568b30 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -239,6 +239,7 @@ icon = 'icons/obj/watercloset.dmi' icon_state = "rubberducky" inhand_icon_state = "rubberducky" + worn_icon_state = "duck" /obj/structure/sink name = "sink" diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index aec13052f5b..cd1b13b3e55 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -191,6 +191,7 @@ desc = "A mysterious pendant. An inscription on it says: \"Certain death tomorrow means certain life today.\"" icon = 'icons/obj/lavaland/artefacts.dmi' icon_state = "memento_mori" + worn_icon_state = "memento" actions_types = list(/datum/action/item_action/hands_free/memento_mori) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF var/mob/living/carbon/human/active_owner diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm index 9443de4835b..32954041b3e 100644 --- a/code/modules/photography/camera/camera.dm +++ b/code/modules/photography/camera/camera.dm @@ -7,6 +7,7 @@ desc = "A polaroid camera." icon_state = "camera" inhand_icon_state = "camera" + worn_icon_state = "camera" lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' light_color = COLOR_WHITE diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm index 2046ecf1d22..9837e1adfc1 100644 --- a/code/modules/projectiles/guns/magic/staff.dm +++ b/code/modules/projectiles/guns/magic/staff.dm @@ -106,6 +106,7 @@ ammo_type = /obj/item/ammo_casing/magic/locker icon_state = "locker" inhand_icon_state = "locker" + worn_icon_state = "lockerstaff" max_charges = 6 recharge_rate = 4 @@ -117,7 +118,8 @@ fire_sound = 'sound/magic/staff_healing.ogg' ammo_type = /obj/item/ammo_casing/magic/flying icon_state = "staffofflight" - inhand_icon_state = "staffofflight" + inhand_icon_state = "staffofchange" + worn_icon_state = "flightstaff" /obj/item/gun/magic/staff/sapping name = "staff of sapping" @@ -125,7 +127,8 @@ fire_sound = 'sound/magic/staff_change.ogg' ammo_type = /obj/item/ammo_casing/magic/sapping icon_state = "staffofsapping" - inhand_icon_state = "staffofsapping" + inhand_icon_state = "staffofdoor" + worn_icon_state = "sapstaff" /obj/item/gun/magic/staff/necropotence name = "staff of necropotence" @@ -133,7 +136,8 @@ fire_sound = 'sound/magic/staff_change.ogg' ammo_type = /obj/item/ammo_casing/magic/necropotence icon_state = "staffofnecropotence" - inhand_icon_state = "staffofnecropotence" + inhand_icon_state = "staffofchaos" + worn_icon_state = "necrostaff" /obj/item/gun/magic/staff/wipe name = "staff of possession" @@ -141,4 +145,5 @@ fire_sound = 'sound/magic/staff_change.ogg' ammo_type = /obj/item/ammo_casing/magic/wipe icon_state = "staffofwipe" - inhand_icon_state = "staffofwipe" + inhand_icon_state = "pharoah_sceptre" + worn_icon_state = "wipestaff" diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index d15f089efb6..12a21cb4ee5 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 482da90547f..fea1aca2108 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 e890e6ddb84..885f7aeb3e9 100644 Binary files a/icons/mob/clothing/belt_mirror.dmi and b/icons/mob/clothing/belt_mirror.dmi differ diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi index c2bea0639b8..a7b80e1c25c 100644 Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi index 7149d0d8e62..71ef0be83da 100644 Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ