diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 87569fab553..3b3a2086bed 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -98550,7 +98550,7 @@ dir = 4 }, /obj/structure/rack, -/obj/item/storage/backpack/satchel/explorer, +/obj/item/storage/backpack/satchel_explorer, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/starboard) "tDb" = ( diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index 0b447347062..caaf54ce715 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -174,7 +174,7 @@ ) backpack = /obj/item/storage/backpack/explorer - satchel = /obj/item/storage/backpack/satchel/explorer + satchel = /obj/item/storage/backpack/satchel_explorer box = /obj/item/storage/box/survival_mining /datum/outfit/job/mining/on_mind_initialize(mob/living/carbon/human/H) @@ -251,7 +251,7 @@ id = /obj/item/card/id/explorer pda = /obj/item/pda/explorer backpack = /obj/item/storage/backpack/explorer - satchel = /obj/item/storage/backpack/satchel/explorer + satchel = /obj/item/storage/backpack/satchel_explorer box = /obj/item/storage/box/survival_mining /datum/outfit/job/explorer/on_mind_initialize(mob/living/carbon/human/H) @@ -425,7 +425,7 @@ bio_chips = list(/obj/item/bio_chip/sad_trombone) backpack = /obj/item/storage/backpack/clown - satchel = /obj/item/storage/backpack/satchel/clown + satchel = /obj/item/storage/backpack/satchel_clown dufflebag = /obj/item/storage/backpack/duffel/clown /datum/outfit/job/clown/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index ae05d45ae25..e7b34459798 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -661,7 +661,7 @@ /obj/item/clothing/shoes/workboots/mining = 3, /obj/item/clothing/mask/gas/explorer = 3, /obj/item/storage/backpack/explorer = 2, - /obj/item/storage/backpack/satchel/explorer = 2, + /obj/item/storage/backpack/satchel_explorer = 2, /obj/item/clothing/head/helmet/space/plasmaman/mining = 3, /obj/item/clothing/under/plasmaman/mining = 3) @@ -679,7 +679,7 @@ /obj/item/clothing/accessory/armband/cargo = 20, /obj/item/clothing/shoes/workboots/mining = 20, /obj/item/storage/backpack/explorer = 50, - /obj/item/storage/backpack/satchel/explorer = 50, + /obj/item/storage/backpack/satchel_explorer = 50, /obj/item/clothing/head/helmet/space/plasmaman/mining = 60, /obj/item/clothing/under/plasmaman/mining = 60) @@ -710,7 +710,7 @@ /obj/item/clothing/shoes/jackboots = 3, /obj/item/clothing/mask/gas/explorer = 3, /obj/item/storage/backpack/explorer = 2, - /obj/item/storage/backpack/satchel/explorer = 2, + /obj/item/storage/backpack/satchel_explorer = 2, /obj/item/clothing/head/helmet/space/plasmaman/expedition = 3, /obj/item/clothing/under/plasmaman/expedition = 3) @@ -727,7 +727,7 @@ /obj/item/clothing/accessory/armband/cargo = 20, /obj/item/clothing/shoes/jackboots = 20, /obj/item/storage/backpack/explorer = 50, - /obj/item/storage/backpack/satchel/explorer = 50, + /obj/item/storage/backpack/satchel_explorer = 50, /obj/item/clothing/head/helmet/space/plasmaman/expedition = 60, /obj/item/clothing/under/plasmaman/expedition = 60) diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 72feb45c8d2..73131fb31e1 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -53,7 +53,7 @@ GLOBAL_LIST_INIT(human_recipes, list( singular_name = "lizard skin piece" GLOBAL_LIST_INIT(lizard_recipes, list( - new /datum/stack_recipe("lizard skin handbag", /obj/item/storage/backpack/satchel/lizard, 5, on_floor = TRUE), + new /datum/stack_recipe("lizard skin handbag", /obj/item/storage/backpack/satchel_lizard, 5, on_floor = TRUE), )) /obj/item/stack/sheet/animalhide/lizard/Initialize(mapload, new_amount, merge = TRUE) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 58a50a5e76c..bca4bfd57f5 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -240,7 +240,7 @@ worn_icon_state = "satchel" inhand_icon_state = "satchel" -/obj/item/storage/backpack/satchel/lizard +/obj/item/storage/backpack/satchel_lizard name = "lizard skin handbag" desc = "A handbag made out of what appears to be supple green Unathi skin. A face can be vaguely seen on the front." icon_state = "satchel-lizard" @@ -250,7 +250,7 @@ desc = "A deluxe NT Satchel, made of the highest quality leather." icon_state = "satchel-norm" -/obj/item/storage/backpack/satchel/clown +/obj/item/storage/backpack/satchel_clown name = "Tickles Von Squeakerton" desc = "A satchel with extra pockets for all your banana storing needs!" icon_state = "satchel-clown" @@ -267,7 +267,7 @@ icon_state = "satchel-atmos" resistance_flags = FIRE_PROOF -/obj/item/storage/backpack/satchel/explorer +/obj/item/storage/backpack/satchel_explorer name = "explorer satchel" desc = "A robust satchel for stashing your loot." icon_state = "satchel-explorer" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm index 0a68bde3eff..45b88525f35 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm @@ -35,7 +35,7 @@ new /obj/item/clothing/under/plasmaman/mining(src) new /obj/item/storage/backpack/duffel(src) new /obj/item/storage/backpack/explorer(src) - new /obj/item/storage/backpack/satchel/explorer(src) + new /obj/item/storage/backpack/satchel_explorer(src) /obj/structure/closet/secure_closet/miner name = "miner's equipment" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm b/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm index d5c3db2497d..2987989208c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm @@ -6,7 +6,7 @@ /obj/structure/closet/secure_closet/clown/populate_contents() new /obj/item/storage/backpack/clown(src) new /obj/item/storage/backpack/duffel/clown(src) - new /obj/item/storage/backpack/satchel/clown(src) + new /obj/item/storage/backpack/satchel_clown(src) new /obj/item/clothing/under/rank/civilian/clown(src) new /obj/item/clothing/under/rank/civilian/clown/skirt(src) new /obj/item/clothing/under/rank/civilian/clown/sexy(src) diff --git a/tools/UpdatePaths/Scripts/30427_satchel_repath.txt b/tools/UpdatePaths/Scripts/30427_satchel_repath.txt new file mode 100644 index 00000000000..e3491dda853 --- /dev/null +++ b/tools/UpdatePaths/Scripts/30427_satchel_repath.txt @@ -0,0 +1,3 @@ +/obj/item/storage/backpack/satchel/lizard/@SUBTYPES : /obj/item/storage/backpack/satchel_lizard/@SUBTYPES{@OLD} +/obj/item/storage/backpack/satchel/explorer/@SUBTYPES : /obj/item/storage/backpack/satchel_explorer/@SUBTYPES{@OLD} +/obj/item/storage/backpack/satchel/clown/@SUBTYPES : /obj/item/storage/backpack/satchel_clown/@SUBTYPES{@OLD}