add: loadout icons

ss220-space · Feb 26, 2024 · f0e42f9 · f0e42f9
1 parent 42ca380
commit f0e42f9
Show file tree

Hide file tree

Showing 27 changed files with 100 additions and 66 deletions.
diff --git a/code/game/objects/items/weapons/material/swiss.dm b/code/game/objects/items/weapons/material/swiss.dm
@@ -13,7 +13,7 @@
 	name = "combi-knife"
 	desc = "A small, colourable, multi-purpose folding knife."
 	icon = 'icons/obj/swiss_knife.dmi'
-	icon_state = "swissknf_closed"
+	icon_state = "swissknf_handle"
 	handle_icon = "swissknf_handle"
 	takes_colour = FALSE
 	valid_colors = null
@@ -25,7 +25,7 @@
 	var/sharp_tools = list(SWISSKNF_LBLADE, SWISSKNF_SBLADE, SWISSKNF_GBLADE, SWISSKNF_WBLADE)
 
 /obj/item/material/knife/folding/swiss/attack_self(mob/user)
-	var/choice	
+	var/choice
 	if(user.a_intent != I_HELP && ((SWISSKNF_LBLADE in tools) || (SWISSKNF_SBLADE in tools)) && active_tool == SWISSKNF_CLOSED)
 		open = TRUE
 		if(SWISSKNF_LBLADE in tools)
@@ -38,7 +38,7 @@
 		else
 			choice = SWISSKNF_CLOSED
 			open = FALSE
-	
+
 	if(!choice || !CanPhysicallyInteract(user))
 		return
 	if(choice == SWISSKNF_CLOSED)
@@ -51,7 +51,7 @@
 			playsound(user, 'sound/weapons/flipblade.ogg', 15, 1)
 		else
 			user.visible_message("<span class='notice'>\The [user] opens the [lowertext(choice)].</span>")
-			
+
 	active_tool = choice
 	update_force()
 	update_icon()

diff --git a/code/modules/client/preference_setup/loadout/lists/accessories.dm b/code/modules/client/preference_setup/loadout/lists/accessories.dm
@@ -6,7 +6,7 @@
 
 /datum/gear/accessory/tie
 	display_name = "tie selection"
-	path = /obj/item/clothing/accessory
+	path = /obj/item/clothing/accessory/blue
 
 /datum/gear/accessory/tie/New()
 	..()
@@ -55,7 +55,7 @@
 /datum/gear/accessory/ntaward
 	display_name = "NT award selection" //inf, was: display_name = "NanoTrasen award selection"
 	description = "A medal or ribbon awarded to NanoTrasen personnel for significant accomplishments."
-	path = /obj/item/clothing/accessory/medal
+	path = /obj/item/clothing/accessory/medal/iron/nanotrasen
 	cost = 8
 
 /datum/gear/accessory/ntaward/New()

diff --git a/code/modules/client/preference_setup/loadout/lists/augments.dm b/code/modules/client/preference_setup/loadout/lists/augments.dm
@@ -6,12 +6,16 @@
 	display_name = "minor augments selection (head)"
 	description = "A minor augment with no in-game effects."
 	cost = 1
+	icon = 'icons/obj/augment.dmi'
+	icon_state = "booster"
 	path = /obj/item/organ/internal/augment/fluff/head
 	flags = GEAR_HAS_SUBTYPE_SELECTION
 
 /datum/gear/augment/minor_chest
 	display_name = "minor augments selection (chest)"
 	description = "A minor augment with no in-game effects."
+	icon = 'icons/obj/surgery.dmi'
+	icon_state = "cell"
 	cost = 1
 	path = /obj/item/organ/internal/augment/fluff/chest
 	flags = GEAR_HAS_SUBTYPE_SELECTION

diff --git a/code/modules/client/preference_setup/loadout/lists/earwear.dm b/code/modules/client/preference_setup/loadout/lists/earwear.dm
@@ -12,7 +12,7 @@
 
 /datum/gear/earrings
 	display_name = "earrings"
-	path = /obj/item/clothing/ears/earring
+	path = /obj/item/clothing/ears/earring/dangle/diamond
 	sort_category = "Earwear"
 
 /datum/gear/earrings/New()

diff --git a/code/modules/client/preference_setup/loadout/lists/eyegear.dm b/code/modules/client/preference_setup/loadout/lists/eyegear.dm
@@ -13,7 +13,7 @@
 
 /datum/gear/eyes/fashionglasses
 	display_name = "non-prescription glasses"
-	path = /obj/item/clothing/glasses
+	path = /obj/item/clothing/glasses/prescription/gglasses
 
 /datum/gear/eyes/fashionglasses/New()
 	..()

diff --git a/code/modules/client/preference_setup/loadout/lists/footwear.dm b/code/modules/client/preference_setup/loadout/lists/footwear.dm
@@ -11,7 +11,7 @@
 
 /datum/gear/shoes/boots
 	display_name = "boot selection"
-	path = /obj/item/clothing/shoes
+	path = /obj/item/clothing/shoes/desertboots
 	cost = 3
 
 /datum/gear/shoes/boots/New()
@@ -26,7 +26,7 @@
 
 /datum/gear/shoes/color
 	display_name = "shoe selection"
-	path = /obj/item/clothing/shoes
+	path = /obj/item/clothing/shoes/black
 
 /datum/gear/shoes/color/New()
 	..()
@@ -63,4 +63,4 @@
 /datum/gear/shoes/heels
 	display_name = "high heels, colour select"
 	path = /obj/item/clothing/shoes/heels
-	flags = GEAR_HAS_COLOR_SELECTION
+	flags = GEAR_HAS_COLOR_SELECTION
diff --git a/code/modules/client/preference_setup/loadout/lists/gloves.dm b/code/modules/client/preference_setup/loadout/lists/gloves.dm
@@ -29,7 +29,7 @@
 
 /datum/gear/ring
 	display_name = "ring"
-	path = /obj/item/clothing/ring
+	path = /obj/item/clothing/ring/cti
 
 /datum/gear/ring/New()
 	..()

diff --git a/code/modules/client/preference_setup/loadout/lists/headwear.dm b/code/modules/client/preference_setup/loadout/lists/headwear.dm
@@ -11,7 +11,7 @@
 
 /datum/gear/head/bandana
 	display_name = "bandana selection"
-	path = /obj/item/clothing
+	path = /obj/item/clothing/mask/bandana
 
 /datum/gear/head/bandana/New()
 	..()
@@ -39,7 +39,7 @@
 
 /datum/gear/head/cap
 	display_name = "cap selection"
-	path = /obj/item/clothing/head
+	path = /obj/item/clothing/head/soft/black
 
 /datum/gear/head/cap/New()
 	..()
@@ -91,7 +91,7 @@
 
 /datum/gear/head/formalhat
 	display_name = "formal hat selection"
-	path = /obj/item/clothing/head
+	path = /obj/item/clothing/head/boaterhat
 
 /datum/gear/head/formalhat/New()
 	..()
@@ -109,7 +109,7 @@
 
 /datum/gear/head/informalhat
 	display_name = "informal hat selection"
-	path = /obj/item/clothing/head
+	path = /obj/item/clothing/head/cowboy_hat
 
 /datum/gear/head/informalhat/New()
 	..()
@@ -175,7 +175,7 @@
 
 /datum/gear/head/corporateberet
 	display_name = "corporate beret selection"
-	path = /obj/item/clothing/head/beret
+	path = /obj/item/clothing/head/beret/pcrc
 
 /datum/gear/head/corporateberet/New()
 	..()

diff --git a/code/modules/client/preference_setup/loadout/lists/misc.dm b/code/modules/client/preference_setup/loadout/lists/misc.dm
@@ -64,7 +64,7 @@
 /datum/gear/knives
 	display_name = "knives selection"
 	description = "A selection of knives."
-	path = /obj/item/material/knife
+	path = /obj/item/material/knife/folding
 
 /datum/gear/knives/New()
 	..()
@@ -271,7 +271,7 @@
 
 /datum/gear/cross
 	display_name = "cross"
-	path = /obj/item/material/cross
+	path = /obj/item/material/cross/wood
 	cost = 2
 
 /datum/gear/cross/New()
@@ -284,7 +284,7 @@
 
 /datum/gear/coin
 	display_name = "coin"
-	path = /obj/item/material/coin
+	path = /obj/item/material/coin/gold
 	cost = 2
 
 /datum/gear/coin/New()

diff --git a/code/modules/client/preference_setup/loadout/lists/storage.dm b/code/modules/client/preference_setup/loadout/lists/storage.dm
@@ -5,7 +5,7 @@
 
 /datum/gear/storage/vest
 	display_name = "webbing vest selection"
-	path = /obj/item/clothing/accessory/storage
+	path = /obj/item/clothing/accessory/storage/black_vest
 	cost = 3
 
 /datum/gear/storage/vest/New()
@@ -18,7 +18,7 @@
 
 /datum/gear/storage/pouches
 	display_name = "drop pouches selection"
-	path = /obj/item/clothing/accessory/storage
+	path = /obj/item/clothing/accessory/storage/black_drop
 
 /datum/gear/storage/pouches/New()
 	..()
@@ -30,7 +30,7 @@
 
 /datum/gear/storage/belt
 	display_name = "storage belt selection"
-	path = /obj/item/storage/belt
+	path = /obj/item/storage/belt/general
 	slot = slot_belt
 	cost = 2
 

diff --git a/code/modules/client/preference_setup/loadout/lists/suits.dm b/code/modules/client/preference_setup/loadout/lists/suits.dm
@@ -34,7 +34,7 @@
 
 /datum/gear/suit/suit_jacket
 	display_name = "standard suit jackets"
-	path = /obj/item/clothing/suit/storage/toggle/suit
+	path = /obj/item/clothing/suit/storage/toggle/suit/black
 
 /datum/gear/suit/suit_jacket/New()
 	..()
@@ -65,7 +65,7 @@
 
 /datum/gear/suit/hoodie_sel
 	display_name = "standard hoodies"
-	path = /obj/item/clothing/suit/storage/toggle/hoodie
+	path = /obj/item/clothing/suit/storage/toggle/hoodie/black
 
 /datum/gear/suit/hoodie_sel/New()
 	..()
@@ -103,7 +103,7 @@
 
 /datum/gear/suit/leather
 	display_name = "jacket selection"
-	path = /obj/item/clothing/suit
+	path = /obj/item/clothing/suit/storage/tgbomber
 
 /datum/gear/suit/leather/New()
 	..()
@@ -141,15 +141,15 @@
 
 /datum/gear/suit/medcoat
 	display_name = "medical suit selection"
-	path = /obj/item/clothing/suit
+	path = /obj/item/clothing/suit/storage/toggle/fr_jacket
 
 /datum/gear/suit/medcoat/New()
 	..()
 	gear_tweaks += new/datum/gear_tweak/path/specified_types_args(/obj/item/clothing/suit/storage/toggle/fr_jacket, /obj/item/clothing/suit/storage/toggle/fr_jacket/ems, /obj/item/clothing/suit/surgicalapron, /obj/item/clothing/suit/storage/toggle/fr_jacket/emrs)
 
 /datum/gear/suit/trenchcoat
 	display_name = "trenchcoat selection"
-	path = /obj/item/clothing/suit
+	path = /obj/item/clothing/suit/storage/det_trench/ft
 
 /datum/gear/suit/trenchcoat/New()
 	..()

diff --git a/code/modules/client/preference_setup/loadout/lists/tactical.dm b/code/modules/client/preference_setup/loadout/lists/tactical.dm
@@ -10,7 +10,7 @@
 
 /datum/gear/tactical/helm_covers
 	display_name = "helmet covers"
-	path = /obj/item/clothing/accessory/armor/helmcover
+	path = /obj/item/clothing/accessory/armor/helmcover/black
 //INF	flags = GEAR_HAS_SUBTYPE_SELECTION
 //[INF]
 /datum/gear/tactical/helm_covers/New()

diff --git a/code/modules/client/preference_setup/loadout/lists/uniforms.dm b/code/modules/client/preference_setup/loadout/lists/uniforms.dm
@@ -23,7 +23,7 @@
 
 /datum/gear/uniform/suit
 	display_name = "clothes selection"
-	path = /obj/item/clothing/under
+	path = /obj/item/clothing/under/sl_suit
 
 /datum/gear/uniform/suit/New()
 	..()
@@ -69,7 +69,7 @@
 
 /datum/gear/uniform/dress
 	display_name = "dress selection"
-	path = /obj/item/clothing/under
+	path = /obj/item/clothing/under/dress/dress_fire
 
 /datum/gear/uniform/dress/New()
 	..()
@@ -151,7 +151,7 @@
 
 /datum/gear/uniform/corporate
 	display_name = "corporate uniform selection"
-	path = /obj/item/clothing/under
+	path = /obj/item/clothing/under/rank/scientist/corporate/nanotrasen
 
 /datum/gear/uniform/corporate/New()
 	..()

diff --git a/code/modules/client/preference_setup/loadout/lists/xenowear.dm b/code/modules/client/preference_setup/loadout/lists/xenowear.dm
@@ -192,7 +192,7 @@
 
 /datum/gear/eyes/visors
 	display_name = "(Tajara) visor selection"
-	path = /obj/item/clothing/glasses/tajvisor
+	path = /obj/item/clothing/glasses/tajvisor/a
 	sort_category = "Xenowear"
 	whitelisted = list(SPECIES_TAJARA)
 	cost = 1
@@ -274,7 +274,7 @@
 
 /datum/gear/accessory/capes
 	display_name = "(Tajara) shoulder capes"
-	path = /obj/item/clothing/accessory/shouldercape
+	path = /obj/item/clothing/accessory/shouldercape/officer
 	whitelisted = list(SPECIES_TAJARA)
 	sort_category = "Xenowear"