Skip to content

Commit

Permalink
Making Frontier Satchels actual satchels (#3670)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Gw0sty authored Oct 4, 2024
1 parent d72f817 commit b8c5ee9
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
4 changes: 2 additions & 2 deletions monkestation/code/modules/blueshift/armaments/kaharaman.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions monkestation/code/modules/blueshift/biogenerator/equipment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
12 changes: 10 additions & 2 deletions monkestation/code/modules/blueshift/clothing/kahraman.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit b8c5ee9

Please sign in to comment.