diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 8638a5e780b..88701e97a5e 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -514,7 +514,7 @@ w_class = 1.0 force = 5.0 throwforce = 15.0 - item_state = "shard-glass" + item_state = "shard-glassnew" g_amt = 3750 w_type = RECYK_GLASS attack_verb = list("stabbed", "slashed", "sliced", "cut") diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 614b72b1c8b..5190486cced 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -2,7 +2,7 @@ name = "Soul Stone Shard" icon = 'icons/obj/wizard.dmi' icon_state = "soulstone" - item_state = "electronic" + item_state = "shard-soulstone" desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefacts power." w_class = 1.0 flags = FPRINT | TABLEPASS diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 5dc53291fd4..abdd8f7888d 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -17,7 +17,7 @@ name = "Circuit board" icon = 'icons/obj/module.dmi' icon_state = "id_mod" - item_state = "electronic" + item_state = "circuitboard" origin_tech = "programming=2" g_amt=2000 // Recycle glass only w_type = RECYK_ELECTRONIC diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 6c7fabcd8b5..1f80c34eb9b 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -408,7 +408,7 @@ name = "Exosuit Circuit board" icon = 'icons/obj/module.dmi' icon_state = "std_mod" - item_state = "electronic" + item_state = "circuitboard" board_type = "other" flags = FPRINT | TABLEPASS | CONDUCT force = 5.0 diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 63ad6e005b2..2dacfc75224 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -204,7 +204,7 @@ var/global/list/datum/stack_recipe/phazon_recipes = list() singular_name = "phazon sheet" desc = "Holy christ what is this?" icon_state = "sheet-phazon" - item_state = "sheet-metal" + item_state = "sheet-phazon" m_amt = 7500 w_type = RECYK_METAL throwforce = 15.0 diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 74b2256b465..9fe7dff2f07 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -116,7 +116,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \ singular_name = "plasteel sheet" desc = "This sheet is an alloy of iron and plasma." icon_state = "sheet-plasteel" - item_state = "sheet-metal" + item_state = "sheet-plasteel" m_amt = 3750 // Was 7500, which doesn't make any fucking sense throwforce = 15.0 flags = FPRINT | TABLEPASS | CONDUCT diff --git a/code/game/objects/items/weapons/ai_modules/AI_modules.dm b/code/game/objects/items/weapons/ai_modules/AI_modules.dm index 4d313ae86e8..45eb52e03f2 100644 --- a/code/game/objects/items/weapons/ai_modules/AI_modules.dm +++ b/code/game/objects/items/weapons/ai_modules/AI_modules.dm @@ -10,7 +10,7 @@ Refactored AI modules by N3X15 name = "AI Module" icon = 'icons/obj/module.dmi' icon_state = "std_mod" - item_state = "electronic" + item_state = "circuitboard" desc = "An AI Module for transmitting encrypted instructions to the AI." flags = FPRINT | TABLEPASS| CONDUCT force = 5.0 diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 9f6876b076e..af30b2ad24f 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -26,6 +26,7 @@ name = "Bag of Holding" desc = "A backpack that opens into a localized pocket of Blue Space." origin_tech = "bluespace=4" + item_state = "holdingpack" icon_state = "holdingpack" max_w_class = 4 max_combined_w_class = 28 @@ -87,6 +88,7 @@ name = "trophy rack" desc = "It's useful for both carrying extra gear and proudly declaring your insanity." icon_state = "cultpack" + item_state = "cultpacknew" /obj/item/weapon/storage/backpack/clown name = "Giggles Von Honkerton" diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 3fc01977788..7084783d1cb 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -79,7 +79,7 @@ name = "oxygen deprivation first aid" desc = "A box full of oxygen goodies." icon_state = "o2" - item_state = "firstaid-o2" + item_state = "firstaid-oxy" New() ..() @@ -126,7 +126,7 @@ storage_slots = 14 m_amt = 10 g_amt = 60 - + /obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object as obj) //Quick pillbottle fix. -Agouri if (ishuman(usr) || ismonkey(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~ diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 0867f8efa8c..a442151a292 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -146,6 +146,7 @@ name = "emergency nitrogen tank" desc = "Used for emergencies. Not useful unless you only breathe nitrogen." icon_state = "emergency_nitrogen" + slot_flags = SLOT_BELT w_class = 2.0 volume = 2 diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index 5218243845d..eebdb3cf331 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -2,7 +2,7 @@ name = "hand labeler" icon = 'icons/obj/bureaucracy.dmi' icon_state = "labeler0" - item_state = "flight" + item_state = "labeler0" var/label = null var/labels_left = 30 var/mode = 0 //off or on. diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index acd3f5bb8e1..00148f48317 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -99,8 +99,8 @@ name = "camera" icon = 'icons/obj/items.dmi' desc = "A polaroid camera." - icon_state = "camera" - item_state = "electropack" + icon_state = "polaroid" + item_state = "polaroid" w_class = 2.0 flags = FPRINT | CONDUCT | USEDELAY | TABLEPASS slot_flags = SLOT_BELT diff --git a/code/modules/research/xenoarchaeology/finds/finds_misc.dm b/code/modules/research/xenoarchaeology/finds/finds_misc.dm index e213096f8ba..e22d8f2b801 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_misc.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_misc.dm @@ -5,6 +5,7 @@ force = 8.0 throwforce = 15.0 icon_state = "plasmalarge" + item_state = "shard-plasglass" /obj/item/weapon/shard/plasma/New() diff --git a/html/changelogs/DeityLink_1702.yml b/html/changelogs/DeityLink_1702.yml new file mode 100644 index 00000000000..20e78007413 --- /dev/null +++ b/html/changelogs/DeityLink_1702.yml @@ -0,0 +1,5 @@ +author: Deity Link +delete-after: true +changes: + - imageadd: over 57 items finally got their in-hand icons. belt too for some. + - experiment: Maracas. Chick-chiky boom, chick-chiky boom. \ No newline at end of file diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi index 0e1f7304d8c..97808c8c6cd 100644 Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ diff --git a/icons/mob/in-hand/in-hand_sync_report.txt b/icons/mob/in-hand/in-hand_sync_report.txt index 8c542084952..d9ced5f82b2 100644 --- a/icons/mob/in-hand/in-hand_sync_report.txt +++ b/icons/mob/in-hand/in-hand_sync_report.txt @@ -1,23 +1,28 @@ -# DMITool Difference Report: D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\left D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\right ---- D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\left\cable_stuff.dmi -+++ D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\right\cable_stuff.dmi +# DMITool Difference Report: Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\left Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\right +--- Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\left\cable_stuff.dmi ++++ Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\right\cable_stuff.dmi + cuff_cyan + cuff_orange + cuff_pink + cuff_white ---- D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\left\guns.dmi -+++ D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\right\guns.dmi +--- Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\left\guns.dmi ++++ Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\right\guns.dmi + scythe0 + taser100 ---- D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\left\paramedic_eva.dmi -+++ D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\right\paramedic_eva.dmi +--- Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\left\newsprites_lefthand.dmi ++++ Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\right\newsprites_lefthand.dmi + + chapmask + + honkbook + + ianism + + necronomicon + + shadows + + torah +--- Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\left\paramedic_eva.dmi ++++ Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\right\paramedic_eva.dmi + paramedic-eva + paramedic-eva-helmet ---- D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\left\pcollectorleft.dmi -+++ D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\right\pcollectorleft.dmi - + pcollector_left ---- D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\left\swords_axes.dmi -+++ D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\right\swords_axes.dmi +--- Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\left\swords_axes.dmi ++++ Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\right\swords_axes.dmi + axe0 + axe1 - dualsaber0 @@ -27,11 +32,11 @@ - katana - scythe0 - unathiknife ---- D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\left\vox_civvie.dmi -+++ D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\right\vox_civvie.dmi +--- Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\left\vox_civvie.dmi ++++ Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\right\vox_civvie.dmi + vox-pressure-security ---- D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\left\zz_old_items_lefthand.dmi -+++ D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\right\zz_old_items_lefthand.dmi +--- Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\left\zz_old_items_lefthand.dmi ++++ Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\right\zz_old_items_lefthand.dmi + DONGS + altair_locket + an_tank diff --git a/icons/mob/in-hand/left/assemblies.dmi b/icons/mob/in-hand/left/assemblies.dmi new file mode 100644 index 00000000000..7405cd6241f Binary files /dev/null and b/icons/mob/in-hand/left/assemblies.dmi differ diff --git a/icons/mob/in-hand/left/backpacks_n_bags.dmi b/icons/mob/in-hand/left/backpacks_n_bags.dmi new file mode 100644 index 00000000000..2ed4f2a6296 Binary files /dev/null and b/icons/mob/in-hand/left/backpacks_n_bags.dmi differ diff --git a/icons/mob/in-hand/left/balaclava.dmi b/icons/mob/in-hand/left/balaclava.dmi new file mode 100644 index 00000000000..963ccb61941 Binary files /dev/null and b/icons/mob/in-hand/left/balaclava.dmi differ diff --git a/icons/mob/in-hand/left/electronics.dmi b/icons/mob/in-hand/left/electronics.dmi new file mode 100644 index 00000000000..679a2997b81 Binary files /dev/null and b/icons/mob/in-hand/left/electronics.dmi differ diff --git a/icons/mob/in-hand/left/firstaid-kits.dmi b/icons/mob/in-hand/left/firstaid-kits.dmi new file mode 100644 index 00000000000..c75b19239c4 Binary files /dev/null and b/icons/mob/in-hand/left/firstaid-kits.dmi differ diff --git a/icons/mob/in-hand/left/flashlights_n_lamps.dmi b/icons/mob/in-hand/left/flashlights_n_lamps.dmi new file mode 100644 index 00000000000..60b8ce16a33 Binary files /dev/null and b/icons/mob/in-hand/left/flashlights_n_lamps.dmi differ diff --git a/icons/mob/in-hand/left/lokiamis.dmi b/icons/mob/in-hand/left/lokiamis.dmi index af893e3709f..379b08ae548 100644 Binary files a/icons/mob/in-hand/left/lokiamis.dmi and b/icons/mob/in-hand/left/lokiamis.dmi differ diff --git a/icons/mob/in-hand/left/maracas.dmi b/icons/mob/in-hand/left/maracas.dmi new file mode 100644 index 00000000000..8f7558a08c5 Binary files /dev/null and b/icons/mob/in-hand/left/maracas.dmi differ diff --git a/icons/mob/in-hand/left/misc_tools.dmi b/icons/mob/in-hand/left/misc_tools.dmi new file mode 100644 index 00000000000..2aea135ca94 Binary files /dev/null and b/icons/mob/in-hand/left/misc_tools.dmi differ diff --git a/icons/mob/in-hand/left/necromancer.dmi b/icons/mob/in-hand/left/necromancer.dmi new file mode 100644 index 00000000000..9a2a4b0243b Binary files /dev/null and b/icons/mob/in-hand/left/necromancer.dmi differ diff --git a/icons/mob/in-hand/left/newsprites_lefthand.dmi b/icons/mob/in-hand/left/newsprites_lefthand.dmi new file mode 100644 index 00000000000..4fa2eeb9e7e Binary files /dev/null and b/icons/mob/in-hand/left/newsprites_lefthand.dmi differ diff --git a/icons/mob/in-hand/left/shards.dmi b/icons/mob/in-hand/left/shards.dmi new file mode 100644 index 00000000000..4d365390dd7 Binary files /dev/null and b/icons/mob/in-hand/left/shards.dmi differ diff --git a/icons/mob/in-hand/left/sheets.dmi b/icons/mob/in-hand/left/sheets.dmi deleted file mode 100644 index 51eb53ac3dc..00000000000 Binary files a/icons/mob/in-hand/left/sheets.dmi and /dev/null differ diff --git a/icons/mob/in-hand/left/sheets_n_ores.dmi b/icons/mob/in-hand/left/sheets_n_ores.dmi new file mode 100644 index 00000000000..36693c2ae02 Binary files /dev/null and b/icons/mob/in-hand/left/sheets_n_ores.dmi differ diff --git a/icons/mob/in-hand/left/tanks.dmi b/icons/mob/in-hand/left/tanks.dmi new file mode 100644 index 00000000000..a214f9e3fb2 Binary files /dev/null and b/icons/mob/in-hand/left/tanks.dmi differ diff --git a/icons/mob/in-hand/right/assemblies.dmi b/icons/mob/in-hand/right/assemblies.dmi new file mode 100644 index 00000000000..d8cd24787e8 Binary files /dev/null and b/icons/mob/in-hand/right/assemblies.dmi differ diff --git a/icons/mob/in-hand/right/backpacks_n_bags.dmi b/icons/mob/in-hand/right/backpacks_n_bags.dmi new file mode 100644 index 00000000000..1901d44b7a0 Binary files /dev/null and b/icons/mob/in-hand/right/backpacks_n_bags.dmi differ diff --git a/icons/mob/in-hand/right/balaclava.dmi b/icons/mob/in-hand/right/balaclava.dmi new file mode 100644 index 00000000000..70cf034f53b Binary files /dev/null and b/icons/mob/in-hand/right/balaclava.dmi differ diff --git a/icons/mob/in-hand/right/electronics.dmi b/icons/mob/in-hand/right/electronics.dmi new file mode 100644 index 00000000000..8c502bb61ce Binary files /dev/null and b/icons/mob/in-hand/right/electronics.dmi differ diff --git a/icons/mob/in-hand/right/firstaid-kits.dmi b/icons/mob/in-hand/right/firstaid-kits.dmi new file mode 100644 index 00000000000..9a087542b24 Binary files /dev/null and b/icons/mob/in-hand/right/firstaid-kits.dmi differ diff --git a/icons/mob/in-hand/right/flashlights_n_lamps.dmi b/icons/mob/in-hand/right/flashlights_n_lamps.dmi new file mode 100644 index 00000000000..26b62925995 Binary files /dev/null and b/icons/mob/in-hand/right/flashlights_n_lamps.dmi differ diff --git a/icons/mob/in-hand/right/lokiamis.dmi b/icons/mob/in-hand/right/lokiamis.dmi index 15de2ba62f2..12efeb367ae 100644 Binary files a/icons/mob/in-hand/right/lokiamis.dmi and b/icons/mob/in-hand/right/lokiamis.dmi differ diff --git a/icons/mob/in-hand/right/maracas.dmi b/icons/mob/in-hand/right/maracas.dmi new file mode 100644 index 00000000000..b02053ba908 Binary files /dev/null and b/icons/mob/in-hand/right/maracas.dmi differ diff --git a/icons/mob/in-hand/right/misc_tools.dmi b/icons/mob/in-hand/right/misc_tools.dmi new file mode 100644 index 00000000000..ff81aaa15b0 Binary files /dev/null and b/icons/mob/in-hand/right/misc_tools.dmi differ diff --git a/icons/mob/in-hand/right/necromancer.dmi b/icons/mob/in-hand/right/necromancer.dmi new file mode 100644 index 00000000000..cc3b3388fd8 Binary files /dev/null and b/icons/mob/in-hand/right/necromancer.dmi differ diff --git a/icons/mob/in-hand/right/newsprites_righthand.dmi b/icons/mob/in-hand/right/newsprites_righthand.dmi new file mode 100644 index 00000000000..16715b0278f Binary files /dev/null and b/icons/mob/in-hand/right/newsprites_righthand.dmi differ diff --git a/icons/mob/in-hand/right/shards.dmi b/icons/mob/in-hand/right/shards.dmi new file mode 100644 index 00000000000..8aa8273f3d4 Binary files /dev/null and b/icons/mob/in-hand/right/shards.dmi differ diff --git a/icons/mob/in-hand/right/sheets.dmi b/icons/mob/in-hand/right/sheets.dmi deleted file mode 100644 index 33ad6d83f40..00000000000 Binary files a/icons/mob/in-hand/right/sheets.dmi and /dev/null differ diff --git a/icons/mob/in-hand/right/sheets_n_ores.dmi b/icons/mob/in-hand/right/sheets_n_ores.dmi new file mode 100644 index 00000000000..249eae62610 Binary files /dev/null and b/icons/mob/in-hand/right/sheets_n_ores.dmi differ diff --git a/icons/mob/in-hand/right/tanks.dmi b/icons/mob/in-hand/right/tanks.dmi new file mode 100644 index 00000000000..86540f38146 Binary files /dev/null and b/icons/mob/in-hand/right/tanks.dmi differ diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index 9537ef52b81..368598affce 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index 60a15019b38..ceab90ed5b4 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/mob/newsprites_lefthand.dmi b/icons/mob/newsprites_lefthand.dmi deleted file mode 100644 index 6fcf9ed6f9d..00000000000 Binary files a/icons/mob/newsprites_lefthand.dmi and /dev/null differ diff --git a/icons/mob/newsprites_righthand.dmi b/icons/mob/newsprites_righthand.dmi deleted file mode 100644 index 9854cf91320..00000000000 Binary files a/icons/mob/newsprites_righthand.dmi and /dev/null differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 2c305fbee20..4d7c749c99a 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ