diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 3d323e99a66..5fd2ab9ea64 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -190,6 +190,7 @@ RLD name = "rapid-construction-device (RCD)" icon = 'icons/obj/tools.dmi' icon_state = "rcd" + worn_icon_state = "RCD" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' custom_premium_price = 1700 @@ -635,6 +636,7 @@ RLD desc = "A device used to rapidly provide lighting sources to an area. Reload with metal, plasteel, glass or compressed matter cartridges." icon = 'icons/obj/tools.dmi' icon_state = "rld-5" + worn_icon_state = "RPD" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' matter = 200 diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index f1aec586129..c71e8548763 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -178,6 +178,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( desc = "A device used to rapidly pipe things." icon = 'icons/obj/tools.dmi' icon_state = "rpd" + worn_icon_state = "RPD" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' flags_1 = CONDUCT_1 diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm index 1df97ee2ab9..fa128bf67d8 100644 --- a/code/game/objects/items/airlock_painter.dm +++ b/code/game/objects/items/airlock_painter.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "paint sprayer" inhand_icon_state = "paint sprayer" - + worn_icon_state = "painter" w_class = WEIGHT_CLASS_SMALL custom_materials = list(/datum/material/iron=50, /datum/material/glass=50) diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 258f8a3b533..4448eddd3e3 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -609,6 +609,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon = 'icons/obj/cigarettes.dmi' icon_state = "zippo" inhand_icon_state = "zippo" + worn_icon_state = "lighter" w_class = WEIGHT_CLASS_TINY flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index cc132426f88..48ac348aa37 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -5,6 +5,7 @@ icon = 'icons/obj/lighting.dmi' icon_state = "flashlight" inhand_icon_state = "flashlight" + worn_icon_state = "flashlight" lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' w_class = WEIGHT_CLASS_SMALL @@ -267,6 +268,7 @@ brightness_on = 7 // Pretty bright. icon_state = "flare" inhand_icon_state = "flare" + worn_icon_state = "flare" actions_types = list() var/fuel = 0 var/on_damage = 7 @@ -444,6 +446,7 @@ color = LIGHT_COLOR_GREEN icon_state = "glowstick" inhand_icon_state = "glowstick" + worn_icon_state = "lightstick" grind_results = list(/datum/reagent/phenol = 15, /datum/reagent/hydrogen = 10, /datum/reagent/oxygen = 5) //Meth-in-a-stick var/fuel = 0 diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 4bd80a9cf95..c02c9c86f3e 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -19,6 +19,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( desc = "An updated, modular intercom that fits over the head. Takes encryption keys." icon_state = "headset" inhand_icon_state = "headset" + worn_icon_state = null custom_materials = list(/datum/material/iron=75) subspace_transmission = TRUE canhear_range = 0 // can't hear headsets from very far away diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 8ef28db2151..73e368a8236 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -5,6 +5,7 @@ name = "station bounced radio" icon_state = "walkietalkie" inhand_icon_state = "walkietalkie" + worn_icon_state = "radio" desc = "A basic handheld radio that communicates with local telecommunication networks." dog_fashion = /datum/dog_fashion/back diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index bec7b165019..a9d3473b52b 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -370,6 +370,7 @@ However, you are also unable to use any ranged weaponry, and some medical supplies will prove useless to you. You can learn more about your newfound art by using the Recall Teachings verb in the Sleeping Carp tab." icon = 'icons/obj/wizard.dmi' icon_state = "scroll2" + worn_icon_state = "scroll" remarks = list("Wait, a high protein diet is really all it takes to become bulletproof...?", "Overwhelming force, immovable object...", "Focus... And you'll be able to incapacitate any foe in seconds...", "I must pierce armor for maximum damage...", "I don't think this would combine with other martial arts...", "Become one with the carp...", "Glub...") /obj/item/book/granter/martial/carp/onlearned(mob/living/carbon/user) diff --git a/code/game/objects/items/grenades/grenade.dm b/code/game/objects/items/grenades/grenade.dm index 3f2405d138c..cf911e99c71 100644 --- a/code/game/objects/items/grenades/grenade.dm +++ b/code/game/objects/items/grenades/grenade.dm @@ -5,6 +5,7 @@ icon = 'icons/obj/grenade.dmi' icon_state = "grenade" inhand_icon_state = "flashbang" + worn_icon_state = "grenade" lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' throw_speed = 3 diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm index 04569876329..5b91dcb15b1 100644 --- a/code/game/objects/items/grenades/plastic.dm +++ b/code/game/objects/items/grenades/plastic.dm @@ -3,6 +3,7 @@ desc = "Used to put holes in specific areas without too much extra hole. A saboteur's favorite." icon_state = "plastic-explosive0" inhand_icon_state = "plastic-explosive" + worn_icon_state = "c4" lefthand_file = 'icons/mob/inhands/weapons/bombs_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/bombs_righthand.dmi' item_flags = NOBLUDGEON @@ -160,5 +161,6 @@ desc = "A shaped high-explosive breaching charge. Designed to ensure user safety and wall nonsafety." icon_state = "plasticx40" inhand_icon_state = "plasticx4" + worn_icon_state = "x4" directional = TRUE boom_sizes = list(0, 2, 5) diff --git a/code/game/objects/items/grenades/syndieminibomb.dm b/code/game/objects/items/grenades/syndieminibomb.dm index 5d49a3bdb15..5c4945dbe28 100644 --- a/code/game/objects/items/grenades/syndieminibomb.dm +++ b/code/game/objects/items/grenades/syndieminibomb.dm @@ -4,6 +4,7 @@ icon = 'icons/obj/grenade.dmi' icon_state = "syndicate" inhand_icon_state = "flashbang" + worn_icon_state = "minibomb" ex_dev = 1 ex_heavy = 2 ex_light = 4 diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index d3dc42f8935..eb122c9c6b4 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -653,6 +653,7 @@ icon = 'icons/obj/items_and_weapons.dmi' icon_state = "mace_greyscale" inhand_icon_state = "mace_greyscale" + worn_icon_state = "mace" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS //Material type changes the prefix as well as the color. diff --git a/code/game/objects/items/scrolls.dm b/code/game/objects/items/scrolls.dm index f441208cfa8..36be826f701 100644 --- a/code/game/objects/items/scrolls.dm +++ b/code/game/objects/items/scrolls.dm @@ -3,6 +3,7 @@ desc = "A scroll for moving around." icon = 'icons/obj/wizard.dmi' icon_state = "scroll" + worn_icon_state = "scroll" var/uses = 4 w_class = WEIGHT_CLASS_SMALL inhand_icon_state = "paper" diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index 5a38f9158e5..19cb8a98da7 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -3,6 +3,7 @@ desc = "I guess someone didn't like it." icon = 'icons/obj/library.dmi' icon_state ="book" + worn_icon_state = "book" throw_speed = 2 throw_range = 5 w_class = WEIGHT_CLASS_NORMAL diff --git a/code/modules/antagonists/eldritch_cult/eldritch_book.dm b/code/modules/antagonists/eldritch_cult/eldritch_book.dm index 575670d9ec7..f3135fe6599 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_book.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_book.dm @@ -3,6 +3,7 @@ desc = "Book describing the secrets of the veil." icon = 'icons/obj/eldritch.dmi' icon_state = "book" + worn_icon_state = "book" w_class = WEIGHT_CLASS_SMALL ///Last person that touched this var/mob/living/last_user diff --git a/code/modules/antagonists/wizard/equipment/spellbook.dm b/code/modules/antagonists/wizard/equipment/spellbook.dm index b3e9714f5cb..49a422ca24d 100644 --- a/code/modules/antagonists/wizard/equipment/spellbook.dm +++ b/code/modules/antagonists/wizard/equipment/spellbook.dm @@ -533,7 +533,7 @@ /datum/spellbook_entry/summon/events name = "Summon Events" desc = "Give Murphy's law a little push and replace all events with special wizard ones that will confound and confuse everyone. Multiple castings increase the rate of these events." - cost = 2 + cost = 2 limit = 1 var/times = 0 @@ -579,6 +579,7 @@ desc = "An unearthly tome that glows with power." icon = 'icons/obj/library.dmi' icon_state ="book" + worn_icon_state = "book" throw_speed = 2 throw_range = 5 w_class = WEIGHT_CLASS_TINY diff --git a/code/modules/events/wizard/rpgloot.dm b/code/modules/events/wizard/rpgloot.dm index b2719c03a78..45b8e7fc94b 100644 --- a/code/modules/events/wizard/rpgloot.dm +++ b/code/modules/events/wizard/rpgloot.dm @@ -34,6 +34,7 @@ desc = "Somehow, this piece of paper can be applied to items to make them \"better\". Apparently there's a risk of losing the item if it's already \"too good\". This all feels so arbitrary..." icon = 'icons/obj/wizard.dmi' icon_state = "scroll" + worn_icon_state = "scroll" w_class = WEIGHT_CLASS_TINY var/upgrade_amount = 1 diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 6a1a3b6fabd..c1415b1e254 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -205,6 +205,7 @@ name = "book" icon = 'icons/obj/library.dmi' icon_state ="book" + worn_icon_state = "book" desc = "Crack it open, inhale the musk of its pages, and learn something new." throw_speed = 1 throw_range = 5 diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index a2c004a09dc..c69bded2a50 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -120,6 +120,7 @@ desc = "A large tool for digging and moving dirt." icon = 'icons/obj/mining.dmi' icon_state = "shovel" + worn_icon_state = "shovel" lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi' flags_1 = CONDUCT_1 @@ -151,6 +152,7 @@ desc = "A small tool for digging and moving dirt." icon_state = "spade" inhand_icon_state = "spade" + worn_icon_state = "spade" lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi' force = 5 @@ -162,6 +164,7 @@ desc = "A wicked tool that cleaves through dirt just as easily as it does flesh. The design was styled after ancient lavaland tribal designs." icon_state = "shovel_bone" inhand_icon_state = "shovel_bone" + worn_icon_state = "shovel_serr" lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi' force = 15 diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 68b385abf76..437d8f676bb 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -3,6 +3,7 @@ icon = 'icons/obj/bureaucracy.dmi' icon_state = "clipboard" inhand_icon_state = "clipboard" + worn_icon_state = "clipboard" throwforce = 0 w_class = WEIGHT_CLASS_SMALL throw_speed = 3 diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index ac3a4d8ff4f..1d21d88dd08 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -58,6 +58,7 @@ icon = 'icons/obj/bureaucracy.dmi' icon_state = "paper" inhand_icon_state = "paper" + worn_icon_state = "paper" custom_fire_overlay = "paper_onfire_overlay" throwforce = 0 w_class = WEIGHT_CLASS_TINY diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index eb9172fef38..a58bb4ddb87 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -328,6 +328,7 @@ desc = "Used to set the destination of properly wrapped packages." icon = 'icons/obj/device.dmi' icon_state = "cargotagger" + worn_icon_state = "cargotagger" var/currTag = 0 //Destinations are stored in code\globalvars\lists\flavor_misc.dm var/locked_destination = FALSE //if true, users can't open the destination tag window to prevent changing the tagger's current destination w_class = WEIGHT_CLASS_TINY @@ -382,6 +383,7 @@ desc = "A scanner that lets you tag wrapped items for sale, splitting the profit between you and cargo. Ctrl-Click to clear the registered account." icon = 'icons/obj/device.dmi' icon_state = "salestagger" + worn_icon_state = "salestagger" inhand_icon_state = "electronic" lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index b5383c94864..3006723d902 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -6,6 +6,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good desc = "Special mechanical module made to store, sort, and apply standard machine parts." icon_state = "RPED" inhand_icon_state = "RPED" + worn_icon_state = "RPED" lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' w_class = WEIGHT_CLASS_HUGE diff --git a/code/modules/uplink/uplink_devices.dm b/code/modules/uplink/uplink_devices.dm index ead123cd1f1..f57e3dd5671 100644 --- a/code/modules/uplink/uplink_devices.dm +++ b/code/modules/uplink/uplink_devices.dm @@ -8,6 +8,7 @@ icon = 'icons/obj/radio.dmi' icon_state = "radio" inhand_icon_state = "walkietalkie" + worn_icon_state = "radio" desc = "A basic handheld radio that communicates with local telecommunication networks." lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index b173611772e..482da90547f 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 fe484e4ccd8..924aaf05259 100644 Binary files a/icons/mob/clothing/belt_mirror.dmi and b/icons/mob/clothing/belt_mirror.dmi differ