diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index b6d8a81709..c609d38c4a 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -2,7 +2,7 @@ name = "inteliCard" icon = 'icons/obj/pda.dmi' icon_state = "aicard" // aicard-full - item_state = "electronic" + item_state = "aicard" w_class = ITEMSIZE_SMALL slot_flags = SLOT_BELT show_messages = 0 diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm index dde6814494..525c5d1255 100644 --- a/code/game/objects/items/devices/t_scanner.dm +++ b/code/game/objects/items/devices/t_scanner.dm @@ -4,9 +4,9 @@ name = "\improper T-ray scanner" desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes." icon_state = "t-ray0" + item_state = "t-ray" slot_flags = SLOT_BELT w_class = ITEMSIZE_SMALL - item_state = "electronic" matter = list(DEFAULT_WALL_MATERIAL = 150) origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 330bde967f..28179f7dbd 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -21,6 +21,7 @@ name = "robotic module reset board" desc = "Used to reset a cyborg's module. Destroys any other upgrades applied to the robot." icon_state = "cyborg_upgrade1" + item_state = "cyborg_upgrade" require_module = 1 /obj/item/borg/upgrade/reset/action(var/mob/living/silicon/robot/R) @@ -41,6 +42,7 @@ name = "robot reclassification board" desc = "Used to rename a cyborg." icon_state = "cyborg_upgrade1" + item_state = "cyborg_upgrade" var/heldname = "default name" /obj/item/borg/upgrade/rename/attack_self(mob/user as mob) @@ -59,6 +61,7 @@ name = "robot emergency restart module" desc = "Used to force a restart of a disabled-but-repaired robot, bringing it back online." icon_state = "cyborg_upgrade1" + item_state = "cyborg_upgrade" /obj/item/borg/upgrade/restart/action(var/mob/living/silicon/robot/R) @@ -82,6 +85,7 @@ name = "robotic VTEC Module" desc = "Used to kick in a robot's VTEC systems, increasing their speed." icon_state = "cyborg_upgrade2" + item_state = "cyborg_upgrade" require_module = 1 /obj/item/borg/upgrade/vtec/action(var/mob/living/silicon/robot/R) @@ -98,6 +102,7 @@ name = "robotic Rapid Taser Cooling Module" desc = "Used to cool a mounted taser, increasing the potential current in it and thus its recharge rate." icon_state = "cyborg_upgrade3" + item_state = "cyborg_upgrade" require_module = 1 @@ -132,6 +137,7 @@ name = "mining robot jetpack" desc = "A carbon dioxide jetpack suitable for low-gravity mining operations." icon_state = "cyborg_upgrade3" + item_state = "cyborg_upgrade" require_module = 1 /obj/item/borg/upgrade/jetpack/action(var/mob/living/silicon/robot/R) @@ -153,6 +159,7 @@ name = "illegal equipment module" desc = "Unlocks the hidden, deadlier functions of a robot" icon_state = "cyborg_upgrade3" + item_state = "cyborg_upgrade" require_module = 1 /obj/item/borg/upgrade/syndicate/action(var/mob/living/silicon/robot/R) diff --git a/code/game/objects/items/weapons/circuitboards/circuitboard.dm b/code/game/objects/items/weapons/circuitboards/circuitboard.dm index d6cb806586..83a651a201 100644 --- a/code/game/objects/items/weapons/circuitboards/circuitboard.dm +++ b/code/game/objects/items/weapons/circuitboards/circuitboard.dm @@ -8,7 +8,6 @@ name = "circuit board" icon = 'icons/obj/module.dmi' icon_state = "id_mod" - item_state = "electronic" origin_tech = list(TECH_DATA = 2) density = 0 anchored = 0 @@ -47,7 +46,7 @@ var/comp_amt = req_components[comp_path] if(!comp_amt) continue - + if(ispath(comp_path, /obj/item/stack)) M.component_parts += new comp_path(contain_parts ? M : null, comp_amt) else diff --git a/code/game/objects/items/weapons/circuitboards/mecha.dm b/code/game/objects/items/weapons/circuitboards/mecha.dm index ac4d83d98c..1415edea84 100644 --- a/code/game/objects/items/weapons/circuitboards/mecha.dm +++ b/code/game/objects/items/weapons/circuitboards/mecha.dm @@ -7,7 +7,6 @@ name = "exosuit circuit board" icon = 'icons/obj/module.dmi' icon_state = "std_mod" - item_state = "electronic" board_type = "other" /obj/item/weapon/circuitboard/mecha/ripley diff --git a/code/modules/integrated_electronics/core/tools.dm b/code/modules/integrated_electronics/core/tools.dm index 21a56f014d..8220162be7 100644 --- a/code/modules/integrated_electronics/core/tools.dm +++ b/code/modules/integrated_electronics/core/tools.dm @@ -11,6 +11,7 @@ used for power or data transmission." icon = 'icons/obj/electronic_assemblies.dmi' icon_state = "wirer-wire" + item_state = "wirer" flags = CONDUCT w_class = 2 var/datum/integrated_io/selected_io = null diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index f77c8c5207..7975c8452e 100644 Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ diff --git a/icons/mob/items/lefthand_shoes.dmi b/icons/mob/items/lefthand_shoes.dmi index b2c266b146..b88be1fed7 100644 Binary files a/icons/mob/items/lefthand_shoes.dmi and b/icons/mob/items/lefthand_shoes.dmi differ diff --git a/icons/mob/items/lefthand_storage.dmi b/icons/mob/items/lefthand_storage.dmi index c3e04f0f66..e14e0a31f0 100644 Binary files a/icons/mob/items/lefthand_storage.dmi and b/icons/mob/items/lefthand_storage.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index da47c520be..63e930d287 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/mob/items/righthand_shoes.dmi b/icons/mob/items/righthand_shoes.dmi index ad77a54bd4..3dd044488f 100644 Binary files a/icons/mob/items/righthand_shoes.dmi and b/icons/mob/items/righthand_shoes.dmi differ diff --git a/icons/mob/items/righthand_storage.dmi b/icons/mob/items/righthand_storage.dmi index 3d100172b3..4df80fb4b3 100644 Binary files a/icons/mob/items/righthand_storage.dmi and b/icons/mob/items/righthand_storage.dmi differ