diff --git a/code/modules/mining/equipment/mineral_scanner.dm b/code/modules/mining/equipment/mineral_scanner.dm index 692d582b1d4..ada079e0185 100644 --- a/code/modules/mining/equipment/mineral_scanner.dm +++ b/code/modules/mining/equipment/mineral_scanner.dm @@ -3,7 +3,7 @@ desc = "A scanner that checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations." name = "manual mining scanner" icon = 'icons/obj/device.dmi' - icon_state = "mining1" + icon_state = "manual_mining" inhand_icon_state = "analyzer" worn_icon_state = "analyzer" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' @@ -33,7 +33,7 @@ /obj/item/t_scanner/adv_mining_scanner desc = "A scanner that automatically checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations. This one has an extended range." name = "advanced automatic mining scanner" - icon_state = "mining0" + icon_state = "advmining0" inhand_icon_state = "analyzer" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' @@ -51,6 +51,7 @@ /obj/item/t_scanner/adv_mining_scanner/lesser name = "automatic mining scanner" desc = "A scanner that automatically checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations." + icon_state = "mining0" range = 4 cooldown = 50 diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 2c82b160ba1..35af3197b25 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -66,8 +66,6 @@ /obj/item/pickaxe/drill name = "mining drill" icon_state = "handdrill" - inhand_icon_state = "jackhammer" - worn_icon_state = "jackhammer" slot_flags = ITEM_SLOT_BELT toolspeed = 0.6 //available from roundstart, faster than a pickaxe. usesound = 'sound/weapons/drill.ogg' diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index d1ea5c6f6d7..aebed2809f3 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -2,6 +2,7 @@ name = "proto-kinetic accelerator" desc = "A self recharging, ranged mining tool that does increased damage in low pressure." icon_state = "kineticgun" + base_icon_state = "kineticgun" inhand_icon_state = "kineticgun" ammo_type = list(/obj/item/ammo_casing/energy/kinetic) cell_type = /obj/item/stock_parts/cell/emproof @@ -74,6 +75,7 @@ M.modify_projectile(K) /obj/item/gun/energy/kinetic_accelerator/cyborg + icon_state = "kineticgun_b" holds_charge = TRUE unique_frequency = TRUE max_mod_capacity = 80 @@ -153,7 +155,7 @@ /obj/item/gun/energy/kinetic_accelerator/update_overlays() . = ..() if(!can_shoot()) - . += "[icon_state]_empty" + . += "[base_icon_state]_empty" //Casing /obj/item/ammo_casing/energy/kinetic @@ -565,11 +567,19 @@ . = ..() if(.) KA.icon_state = chassis_icon + KA.inhand_icon_state = chassis_icon KA.name = chassis_name + if(iscarbon(KA.loc)) + var/mob/living/carbon/holder = KA.loc + holder.update_inv_hands() /obj/item/borg/upgrade/modkit/chassis_mod/uninstall(obj/item/gun/energy/kinetic_accelerator/KA) KA.icon_state = initial(KA.icon_state) + KA.inhand_icon_state = initial(KA.inhand_icon_state) KA.name = initial(KA.name) + if(iscarbon(KA.loc)) + var/mob/living/carbon/holder = KA.loc + holder.update_inv_hands() ..() /obj/item/borg/upgrade/modkit/chassis_mod/orange diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 08f33fcd01a..92911c6503c 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -89,6 +89,7 @@ name = "mini energy crossbow" desc = "A weapon favored by syndicate stealth specialists." icon_state = "crossbow" + base_icon_state = "crossbow" inhand_icon_state = "crossbow" w_class = WEIGHT_CLASS_SMALL custom_materials = list(/datum/material/iron=2000) @@ -106,6 +107,7 @@ name = "candy corn crossbow" desc = "A weapon favored by Syndicate trick-or-treaters." icon_state = "crossbow_halloween" + base_icon_state = "crossbow_halloween" inhand_icon_state = "crossbow" ammo_type = list(/obj/item/ammo_casing/energy/bolt/halloween) @@ -113,6 +115,7 @@ name = "energy crossbow" desc = "A reverse engineered weapon using syndicate technology." icon_state = "crossbowlarge" + base_icon_state = "crossbowlarge" w_class = WEIGHT_CLASS_BULKY custom_materials = list(/datum/material/iron=4000) suppressed = null diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 848aeb13fd6..412e7d1e031 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 485f9288e88..8ebdb4f1e1f 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 5a2a695f928..1b243fa65d4 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/feet.dmi b/icons/mob/clothing/feet.dmi index dbf6e503646..385fc3c9dde 100644 Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 684eef4192d..adf1f3acabc 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi index d7c44f1ca6d..018cfdc4696 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 950be502b52..f216bedbe95 100644 Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index f3e70d8114b..4cd0a4c6a38 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/under/cargo.dmi b/icons/mob/clothing/under/cargo.dmi index 6761d5eeaa0..5ca4efec0d8 100644 Binary files a/icons/mob/clothing/under/cargo.dmi and b/icons/mob/clothing/under/cargo.dmi differ diff --git a/icons/mob/icemoon/icemoon_monsters.dmi b/icons/mob/icemoon/icemoon_monsters.dmi index ce25dce5307..9240b9bca44 100644 Binary files a/icons/mob/icemoon/icemoon_monsters.dmi and b/icons/mob/icemoon/icemoon_monsters.dmi differ diff --git a/icons/mob/inhands/equipment/mining_lefthand.dmi b/icons/mob/inhands/equipment/mining_lefthand.dmi index 709180b32c4..34d2442328b 100644 Binary files a/icons/mob/inhands/equipment/mining_lefthand.dmi and b/icons/mob/inhands/equipment/mining_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/mining_righthand.dmi b/icons/mob/inhands/equipment/mining_righthand.dmi index 45e05bdd314..1345559a800 100644 Binary files a/icons/mob/inhands/equipment/mining_righthand.dmi and b/icons/mob/inhands/equipment/mining_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi index 98316b40a46..e1267ab91bb 100644 Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi index 02c03f721bc..4d2c83541fd 100644 Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/hammers_lefthand.dmi b/icons/mob/inhands/weapons/hammers_lefthand.dmi index 1c61c7a7721..2d5c68cd5cf 100644 Binary files a/icons/mob/inhands/weapons/hammers_lefthand.dmi and b/icons/mob/inhands/weapons/hammers_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/hammers_righthand.dmi b/icons/mob/inhands/weapons/hammers_righthand.dmi index e11e40321a2..e568193cd12 100644 Binary files a/icons/mob/inhands/weapons/hammers_righthand.dmi and b/icons/mob/inhands/weapons/hammers_righthand.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 4ecb7992580..1ba3c824bc4 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 50034f2e1cf..31ccf1cc03b 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index 568893d36f6..604345ded70 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index be93cdf54f6..cac72464e54 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/under/cargo.dmi b/icons/obj/clothing/under/cargo.dmi index 65d8f04cbbc..a80f0c4650b 100644 Binary files a/icons/obj/clothing/under/cargo.dmi and b/icons/obj/clothing/under/cargo.dmi differ diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 0ba79a88d27..96e6e0ce242 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi index 7e2e884c801..31be9c45a86 100644 Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ diff --git a/icons/obj/lavaland/artefacts.dmi b/icons/obj/lavaland/artefacts.dmi index dd65e49104f..69f7dd8f7ff 100644 Binary files a/icons/obj/lavaland/artefacts.dmi and b/icons/obj/lavaland/artefacts.dmi differ diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi index 3790698b130..6756bc7355f 100644 Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ