Skip to content

Commit

Permalink
Merge pull request #3933 from MistakeNot4892/rework/jerkin
Browse files Browse the repository at this point in the history
Updates jerkin path to /shirt.
  • Loading branch information
out-of-phaze authored Apr 22, 2024
2 parents cccf749 + 1b7a7c3 commit e98707f
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion mods/species/fantasy/items/clothing/_loadout.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

/decl/loadout_option/clothing/fantasy/uniform/jerkin
name = "jerkin"
path = /obj/item/clothing/accessory/jerkin
path = /obj/item/clothing/shirt/jerkin
slot = slot_tie_str

/decl/loadout_option/clothing/fantasy/uniform/tunic
Expand Down
2 changes: 1 addition & 1 deletion mods/species/fantasy/items/clothing/_recipes.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/decl/stack_recipe/textiles/jerkin
result_type = /obj/item/clothing/accessory/jerkin
result_type = /obj/item/clothing/shirt/jerkin

/decl/stack_recipe/textiles/gown
result_type = /obj/item/clothing/under/gown
Expand Down
2 changes: 1 addition & 1 deletion mods/species/fantasy/items/clothing/jerkin.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/obj/item/clothing/accessory/jerkin
/obj/item/clothing/shirt/jerkin
name = "jerkin"
desc = "A sturdy jerkin, worn on the upper body."
icon = 'mods/species/fantasy/icons/clothing/jerkin.dmi'
Expand Down
2 changes: 1 addition & 1 deletion mods/species/fantasy/items/clothing/trousers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

/obj/item/clothing/pants/trousers/jerkin/Initialize()
. = ..()
var/obj/item/clothing/accessory/jerkin/jerkin = new
var/obj/item/clothing/shirt/jerkin/jerkin = new
attach_accessory(null, jerkin)
if(!(jerkin in accessories))
qdel(jerkin)
Expand Down

0 comments on commit e98707f

Please sign in to comment.