cmss13-devs · harryob · Feb 2, 2024 · Feb 1, 2024 · Feb 1, 2024 · Feb 1, 2024
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
@@ -61,33 +61,9 @@
 		"nano/templates/",
 	)
 
-/datum/asset/directory/nanoui/weapons
-	common_dirs = list(
-		"nano/images/weapons/",
-	)
-
-	uncommon_dirs = list()
-
-/datum/asset/directory/nanoui/weapons/send(client)
-	if(!client)
-		log_debug("Warning! Tried to send nanoui weapon data with a null client! (asset_list_items.dm line 93)")
-		return
-	SSassets.transport.send_assets(client, common)
-
-
 /datum/asset/simple/nanoui_images
 	keep_local_name = TRUE
 
-	assets = list(
-		"auto.png" = 'nano/images/weapons/auto.png',
-		"burst.png" = 'nano/images/weapons/burst.png',
-		"single.png" = 'nano/images/weapons/single.png',
-		"disabled_automatic.png" = 'nano/images/weapons/disabled_automatic.png',
-		"disabled_burst.png" = 'nano/images/weapons/disabled_burst.png',
-		"disabled_single.png" = 'nano/images/weapons/disabled_single.png',
-		"no_name.png" = 'nano/images/weapons/no_name.png',
-	)
-
 	var/list/common_dirs = list(
 		"nano/images/",
 	)
@@ -398,9 +374,22 @@
 	name = "gunlineart"
 
 /datum/asset/spritesheet/gun_lineart/register()
-	InsertAll("", 'icons/obj/items/weapons/guns/lineart.dmi')
+	var/icon_file = 'icons/obj/items/weapons/guns/lineart.dmi'
+	InsertAll("", icon_file)
+
+	for(var/obj/item/weapon/gun/current_gun as anything in subtypesof(/obj/item/weapon/gun))
+		var/icon_state = initial(current_gun.base_gun_icon)
+		if(icon_state && isnull(sprites[icon_state]))
+			stack_trace("[current_gun] does not have a valid lineart icon state, icon=[icon_file], icon_state=[json_encode(icon_state)](\ref[icon_state])")
+
 	..()
 
+/datum/asset/spritesheet/gun_lineart_modes
+	name = "gunlineartmodes"
+
+/datum/asset/spritesheet/gun_lineart_modes/register()
+	InsertAll("", 'icons/obj/items/weapons/guns/lineart_modes.dmi')
+	..()
 
 /datum/asset/simple/orbit
 	assets = list(
@@ -414,17 +403,6 @@
 		"ntosradarpointerS.png" = 'icons/images/ui_images/ntosradar_pointer_S.png'
 	)
 
-/datum/asset/simple/firemodes
-	assets = list(
-		"auto.png" = 'html/images/auto.png',
-		"disabled_auto.png" = 'html/images/disabled_automatic.png',
-		"burst.png" = 'html/images/burst.png',
-		"disabled_burst.png" = 'html/images/disabled_burst.png',
-		"single.png" = 'html/images/single.png',
-		"disabled_single.png" = 'html/images/disabled_single.png',
-	)
-
-
 /datum/asset/simple/particle_editor
 	assets = list(
 		"motion" = 'icons/images/ui_images/particle_editor/motion.png',

diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
@@ -663,11 +663,7 @@ As sniper rifles have both and weapon mods can change them as well. ..() deals w
 
 	// weapon info
 
-	data["icon"] = SSassets.transport.get_asset_url("no_name.png")
-
-	if(SSassets.cache["[base_gun_icon].png"])
-		data["icon"] = SSassets.transport.get_asset_url("[base_gun_icon].png")
-
+	data["icon"] = base_gun_icon
 	data["name"] = name
 	data["desc"] = desc
 	data["two_handed_only"] = (flags_gun_features & GUN_WIELDED_FIRING_ONLY)
@@ -727,8 +723,8 @@ As sniper rifles have both and weapon mods can change them as well. ..() deals w
 
 /obj/item/weapon/gun/ui_assets(mob/user)
 	. = ..() || list()
-	. += get_asset_datum(/datum/asset/simple/firemodes)
-	//. += get_asset_datum(/datum/asset/spritesheet/gun_lineart)
+	. += get_asset_datum(/datum/asset/spritesheet/gun_lineart_modes)
+	. += get_asset_datum(/datum/asset/spritesheet/gun_lineart)
 
 // END TGUI \\
 

diff --git a/icons/obj/items/weapons/guns/lineart.dmi b/icons/obj/items/weapons/guns/lineart.dmi
diff --git a/icons/obj/items/weapons/guns/lineart_modes.dmi b/icons/obj/items/weapons/guns/lineart_modes.dmi
diff --git a/nano/images/weapons/88m4.png b/nano/images/weapons/88m4.png
diff --git a/nano/images/weapons/aamateba.png b/nano/images/weapons/aamateba.png
diff --git a/nano/images/weapons/amateba.png b/nano/images/weapons/amateba.png
diff --git a/nano/images/weapons/auto.png b/nano/images/weapons/auto.png
diff --git a/nano/images/weapons/auto9.png b/nano/images/weapons/auto9.png
diff --git a/nano/images/weapons/b92fs.png b/nano/images/weapons/b92fs.png
diff --git a/nano/images/weapons/burst.png b/nano/images/weapons/burst.png
diff --git a/nano/images/weapons/c70.png b/nano/images/weapons/c70.png
diff --git a/nano/images/weapons/c_deagle.png b/nano/images/weapons/c_deagle.png
diff --git a/nano/images/weapons/cmateba.png b/nano/images/weapons/cmateba.png
diff --git a/nano/images/weapons/cshotgun.png b/nano/images/weapons/cshotgun.png
diff --git a/nano/images/weapons/dartgun.png b/nano/images/weapons/dartgun.png
diff --git a/nano/images/weapons/deagle.png b/nano/images/weapons/deagle.png
diff --git a/nano/images/weapons/disabled_automatic.png b/nano/images/weapons/disabled_automatic.png
diff --git a/nano/images/weapons/disabled_burst.png b/nano/images/weapons/disabled_burst.png
diff --git a/nano/images/weapons/disabled_single.png b/nano/images/weapons/disabled_single.png
diff --git a/nano/images/weapons/dshotgun.png b/nano/images/weapons/dshotgun.png
diff --git a/nano/images/weapons/fp9000.png b/nano/images/weapons/fp9000.png
diff --git a/nano/images/weapons/fp9000_pmc.png b/nano/images/weapons/fp9000_pmc.png
diff --git a/nano/images/weapons/g_deagle.png b/nano/images/weapons/g_deagle.png
diff --git a/nano/images/weapons/hg3712.png b/nano/images/weapons/hg3712.png
diff --git a/nano/images/weapons/highpower.png b/nano/images/weapons/highpower.png
diff --git a/nano/images/weapons/holdout.png b/nano/images/weapons/holdout.png
diff --git a/nano/images/weapons/hunting.png b/nano/images/weapons/hunting.png
diff --git a/nano/images/weapons/kt42.png b/nano/images/weapons/kt42.png
diff --git a/nano/images/weapons/l42mk1.png b/nano/images/weapons/l42mk1.png
diff --git a/nano/images/weapons/m16.png b/nano/images/weapons/m16.png
diff --git a/nano/images/weapons/m240.png b/nano/images/weapons/m240.png
diff --git a/nano/images/weapons/m240t.png b/nano/images/weapons/m240t.png
diff --git a/nano/images/weapons/m37-17.png b/nano/images/weapons/m37-17.png
diff --git a/nano/images/weapons/m37.png b/nano/images/weapons/m37.png
diff --git a/nano/images/weapons/m39.png b/nano/images/weapons/m39.png
diff --git a/nano/images/weapons/m41a.png b/nano/images/weapons/m41a.png
diff --git a/nano/images/weapons/m41a2.png b/nano/images/weapons/m41a2.png
diff --git a/nano/images/weapons/m41ae2.png b/nano/images/weapons/m41ae2.png
diff --git a/nano/images/weapons/m41amk1.png b/nano/images/weapons/m41amk1.png
diff --git a/nano/images/weapons/m41b.png b/nano/images/weapons/m41b.png
diff --git a/nano/images/weapons/m42a.png b/nano/images/weapons/m42a.png
diff --git a/nano/images/weapons/m42c.png b/nano/images/weapons/m42c.png
diff --git a/nano/images/weapons/m44r.png b/nano/images/weapons/m44r.png
diff --git a/nano/images/weapons/m44rc.png b/nano/images/weapons/m44rc.png
diff --git a/nano/images/weapons/m46c.png b/nano/images/weapons/m46c.png
diff --git a/nano/images/weapons/m4a3.png b/nano/images/weapons/m4a3.png
diff --git a/nano/images/weapons/m4a345.png b/nano/images/weapons/m4a345.png
diff --git a/nano/images/weapons/m4a3c.png b/nano/images/weapons/m4a3c.png
diff --git a/nano/images/weapons/m5.png b/nano/images/weapons/m5.png
diff --git a/nano/images/weapons/m56.png b/nano/images/weapons/m56.png
diff --git a/nano/images/weapons/m57a4.png b/nano/images/weapons/m57a4.png
diff --git a/nano/images/weapons/m60.png b/nano/images/weapons/m60.png
diff --git a/nano/images/weapons/m79.png b/nano/images/weapons/m79.png
diff --git a/nano/images/weapons/m81.png b/nano/images/weapons/m81.png
diff --git a/nano/images/weapons/m82f.png b/nano/images/weapons/m82f.png
diff --git a/nano/images/weapons/m92.png b/nano/images/weapons/m92.png
diff --git a/nano/images/weapons/m93b2.png b/nano/images/weapons/m93b2.png
diff --git a/nano/images/weapons/mac15.png b/nano/images/weapons/mac15.png
diff --git a/nano/images/weapons/mar30.png b/nano/images/weapons/mar30.png
diff --git a/nano/images/weapons/mar40.png b/nano/images/weapons/mar40.png
diff --git a/nano/images/weapons/mateba.png b/nano/images/weapons/mateba.png
diff --git a/nano/images/weapons/mk221.png b/nano/images/weapons/mk221.png
diff --git a/nano/images/weapons/mou.png b/nano/images/weapons/mou.png
diff --git a/nano/images/weapons/mp5.png b/nano/images/weapons/mp5.png
diff --git a/nano/images/weapons/mp7.png b/nano/images/weapons/mp7.png
diff --git a/nano/images/weapons/no_name.png b/nano/images/weapons/no_name.png
diff --git a/nano/images/weapons/ny762.png b/nano/images/weapons/ny762.png
diff --git a/nano/images/weapons/painless.png b/nano/images/weapons/painless.png
diff --git a/nano/images/weapons/pk9.png b/nano/images/weapons/pk9.png
diff --git a/nano/images/weapons/pk9r.png b/nano/images/weapons/pk9r.png
diff --git a/nano/images/weapons/pk9u.png b/nano/images/weapons/pk9u.png
diff --git a/nano/images/weapons/ppsh17b.png b/nano/images/weapons/ppsh17b.png
diff --git a/nano/images/weapons/single.png b/nano/images/weapons/single.png
diff --git a/nano/images/weapons/skorpion.png b/nano/images/weapons/skorpion.png
diff --git a/nano/images/weapons/skorpion_u.png b/nano/images/weapons/skorpion_u.png
diff --git a/nano/images/weapons/smartpistol.png b/nano/images/weapons/smartpistol.png
diff --git a/nano/images/weapons/spearhead.png b/nano/images/weapons/spearhead.png
diff --git a/nano/images/weapons/sshotgun.png b/nano/images/weapons/sshotgun.png
diff --git a/nano/images/weapons/supremo.png b/nano/images/weapons/supremo.png
diff --git a/nano/images/weapons/svd003.png b/nano/images/weapons/svd003.png
diff --git a/nano/images/weapons/sw357.png b/nano/images/weapons/sw357.png
diff --git a/nano/images/weapons/sw358.png b/nano/images/weapons/sw358.png
diff --git a/nano/images/weapons/syringegun.png b/nano/images/weapons/syringegun.png
diff --git a/nano/images/weapons/taser.png b/nano/images/weapons/taser.png
diff --git a/nano/images/weapons/type71.png b/nano/images/weapons/type71.png
diff --git a/nano/images/weapons/type71c.png b/nano/images/weapons/type71c.png
diff --git a/nano/images/weapons/type73.png b/nano/images/weapons/type73.png
diff --git a/nano/images/weapons/vp78.png b/nano/images/weapons/vp78.png
diff --git a/nano/images/weapons/xm42b.png b/nano/images/weapons/xm42b.png
diff --git a/nano/images/weapons/xm51.png b/nano/images/weapons/xm51.png
diff --git a/tgui/packages/tgui/interfaces/WeaponStats.jsx b/tgui/packages/tgui/interfaces/WeaponStats.jsx
@@ -1,5 +1,5 @@
 import { map } from 'common/collections';
-import { resolveAsset } from '../assets';
+import { classes } from 'common/react';
 import { useBackend } from '../backend';
 import { ProgressBar, Section, Box, Flex, Table, Divider } from '../components';
 import { Window } from '../layouts';
@@ -68,7 +68,7 @@ const GeneralInfo = (props) => {
         <Flex.Item align="center">
           <Box height="5px" />
           <Box align="center">
-            <img src={resolveAsset(icon)} />
+            <span className={classes(['Icon', 'gunlineart96x96', `${icon}`])} />
           </Box>
           <Box height="5px" />
         </Flex.Item>
@@ -78,25 +78,33 @@ const GeneralInfo = (props) => {
         <Flex.Item align="center">
           <Flex direction="row">
             <Flex.Item>
-              {!auto_only ? (
-                <img src={resolveAsset('single.png')} />
-              ) : (
-                <img src={resolveAsset('disabled_single.png')} />
-              )}
+              <span
+                className={classes([
+                  'Icon',
+                  'gunlineartmodes96x32',
+                  `${!auto_only ? 'single' : 'disabled_single'}`,
+                ])}
+              />
             </Flex.Item>
             <Flex.Item>
-              {!auto_only && burst_amount > 1 ? (
-                <img src={resolveAsset('burst.png')} />
-              ) : (
-                <img src={resolveAsset('disabled_burst.png')} />
-              )}
+              <span
+                className={classes([
+                  'Icon',
+                  'gunlineartmodes96x32',
+                  `${
+                    !auto_only && burst_amount > 1 ? 'burst' : 'disabled_burst'
+                  }`,
+                ])}
+              />
             </Flex.Item>
             <Flex.Item>
-              {automatic ? (
-                <img src={resolveAsset('auto.png')} />
-              ) : (
-                <img src={resolveAsset('disabled_automatic.png')} />
-              )}
+              <span
+                className={classes([
+                  'Icon',
+                  'gunlineartmodes96x32',
+                  `${automatic ? 'auto' : 'disabled_automatic'}`,
+                ])}
+              />
             </Flex.Item>
           </Flex>
         </Flex.Item>