From b8c5ee9e7ee0ef9a9ee273ec409aa7fe1b942806 Mon Sep 17 00:00:00 2001
From: Ghosti <83688318+Gw0sty@users.noreply.github.com>
Date: Fri, 4 Oct 2024 16:23:36 -0500
Subject: [PATCH] Making Frontier Satchels actual satchels (#3670)

* Makes frontier satchels and messenger bags accurate by making them satchels, not backpacks.

Both are subtypes of the bag without actually changing the bag type. Which is slightly annoying as I want  a satchel type bag when buying the satchel

* hm

* There we go
---
 .../code/modules/blueshift/armaments/kaharaman.dm    |  4 ++--
 .../code/modules/blueshift/biogenerator/equipment.dm |  4 ++--
 .../code/modules/blueshift/clothing/kahraman.dm      | 12 ++++++++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/monkestation/code/modules/blueshift/armaments/kaharaman.dm b/monkestation/code/modules/blueshift/armaments/kaharaman.dm
index b392ab14c2c4..0d17c3602315 100644
--- a/monkestation/code/modules/blueshift/armaments/kaharaman.dm
+++ b/monkestation/code/modules/blueshift/armaments/kaharaman.dm
@@ -97,11 +97,11 @@
 	cost = PAYCHECK_CREW
 
 /datum/armament_entry/company_import/kahraman/storage_equipment/satchel
-	item_type = /obj/item/storage/backpack/industrial/frontier_colonist/satchel
+	item_type = /obj/item/storage/backpack/satchel/eng/frontier_colonist
 	cost = PAYCHECK_CREW
 
 /datum/armament_entry/company_import/kahraman/storage_equipment/messenger
-	item_type = /obj/item/storage/backpack/industrial/frontier_colonist/messenger
+	item_type = /obj/item/storage/backpack/satchel/eng/frontier_colonist/messenger
 	cost = PAYCHECK_CREW
 
 /datum/armament_entry/company_import/kahraman/storage_equipment/belt
diff --git a/monkestation/code/modules/blueshift/biogenerator/equipment.dm b/monkestation/code/modules/blueshift/biogenerator/equipment.dm
index 580f8e2ba2e1..1b3197c1ab67 100644
--- a/monkestation/code/modules/blueshift/biogenerator/equipment.dm
+++ b/monkestation/code/modules/blueshift/biogenerator/equipment.dm
@@ -61,7 +61,7 @@
 	id = "frontier_satchel"
 	build_type = BIOGENERATOR
 	materials = list(/datum/material/biomass = 100)
-	build_path = /obj/item/storage/backpack/industrial/frontier_colonist/satchel
+	build_path = /obj/item/storage/backpack/satchel/eng/frontier_colonist
 	category = list(
 		RND_CATEGORY_INITIAL,
 		RND_CATEGORY_AKHTER_EQUIPMENT,
@@ -72,7 +72,7 @@
 	id = "frontier_messenger"
 	build_type = BIOGENERATOR
 	materials = list(/datum/material/biomass = 100)
-	build_path = /obj/item/storage/backpack/industrial/frontier_colonist/messenger
+	build_path = /obj/item/storage/backpack/satchel/eng/frontier_colonist/messenger
 	category = list(
 		RND_CATEGORY_INITIAL,
 		RND_CATEGORY_AKHTER_EQUIPMENT,
diff --git a/monkestation/code/modules/blueshift/clothing/kahraman.dm b/monkestation/code/modules/blueshift/clothing/kahraman.dm
index f95b27140c60..887920bdf9c9 100644
--- a/monkestation/code/modules/blueshift/clothing/kahraman.dm
+++ b/monkestation/code/modules/blueshift/clothing/kahraman.dm
@@ -14,13 +14,21 @@
 	. = ..()
 	AddElement(/datum/element/manufacturer_examine, COMPANY_KAHRAMAN)
 
-/obj/item/storage/backpack/industrial/frontier_colonist/satchel
+/obj/item/storage/backpack/satchel/eng/frontier_colonist
 	name = "frontier satchel"
 	desc = "A rugged satchel often used by settlers and explorers. Holds less of your equipment than a backpack will."
+	icon = 'monkestation/code/modules/blueshift/icons/clothes/clothing.dmi'
 	icon_state = "satchel"
+	worn_icon = 'monkestation/code/modules/blueshift/icons/clothes/clothing_worn.dmi'
+	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
 	worn_icon_state = "satchel"
+	inhand_icon_state = "backpack"
+
+/obj/item/storage/backpack/satchel/eng/frontier_colonist/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/manufacturer_examine, COMPANY_KAHRAMAN)
 
-/obj/item/storage/backpack/industrial/frontier_colonist/messenger
+/obj/item/storage/backpack/satchel/eng/frontier_colonist/messenger
 	name = "frontier messenger bag"
 	desc = "A rugged messenger bag often used by settlers and explorers. Holds less of your equipment than a backpack will."
 	icon_state = "messenger"