From cd3d317ffb79b9c42d7ef3b86c528f2f37737360 Mon Sep 17 00:00:00 2001 From: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Date: Wed, 19 Jul 2023 00:30:49 +1000 Subject: [PATCH] Cleans up the lavaland exports to be properly consistent with their sources, readds missing items to their appropriate spots (#76883) ## About The Pull Request This list has probably needed some work for a bit. ## Why It's Good For The Game Missing items and incorrect items bad. Fixes https://github.com/tgstation/tgstation/issues/76829 ## Changelog :cl: fixes: Cleans up the lavaland exports to the modern loot table lists. /:cl: --- code/modules/cargo/exports/lavaland.dm | 76 ++++++++++++++------------ 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/code/modules/cargo/exports/lavaland.dm b/code/modules/cargo/exports/lavaland.dm index d4017646a79..31cc1319861 100644 --- a/code/modules/cargo/exports/lavaland.dm +++ b/code/modules/cargo/exports/lavaland.dm @@ -4,52 +4,56 @@ /datum/export/lavaland/minor cost = CARGO_CRATE_VALUE * 20 unit_name = "minor lava planet artifact" - export_types = list(/obj/item/immortality_talisman, - /obj/item/book_of_babel, - /obj/item/wisp_lantern, - /obj/item/katana/cursed, - /obj/item/clothing/glasses/godeye, - /obj/item/melee/ghost_sword, - /obj/item/clothing/neck/necklace/memento_mori, - /obj/item/organ/internal/heart/cursed/wizard, - /obj/item/clothing/suit/hooded/cloak/drake, - /obj/item/ship_in_a_bottle, - /obj/item/clothing/shoes/clown_shoes/banana_shoes, - /obj/item/gun/magic/staff/honk, - /obj/item/knife/envy, - /obj/item/gun/ballistic/revolver/russian/soul, - /obj/item/veilrender/vealrender, - /obj/item/clothing/suit/hooded/berserker, - /obj/item/freeze_cube, - /obj/item/soulstone/anybody/mining, - /obj/item/clothing/gloves/gauntlets, - /obj/item/jacobs_ladder, - ) + export_types = list( + /obj/item/immortality_talisman, + /obj/item/book_of_babel, + /obj/item/wisp_lantern, + /obj/item/organ/internal/cyberimp/arm/shard/katana, + /obj/item/clothing/glasses/godeye, + /obj/item/clothing/neck/necklace/memento_mori, + /obj/item/organ/internal/heart/cursed/wizard, + /obj/item/clothing/suit/hooded/cloak/drake, + /obj/item/ship_in_a_bottle, + /obj/item/clothing/shoes/clown_shoes/banana_shoes, + /obj/item/gun/magic/staff/honk, + /obj/item/knife/envy, + /obj/item/gun/ballistic/revolver/russian/soul, + /obj/item/veilrender/vealrender, + /obj/item/clothing/suit/hooded/berserker, + /obj/item/freeze_cube, + /obj/item/soulstone/anybody/mining, + /obj/item/clothing/gloves/gauntlets, + /obj/item/jacobs_ladder, + /obj/item/borg/upgrade/modkit/lifesteal, + ) /datum/export/lavaland/major //valuable chest/ruin loot, minor megafauna loot cost = CARGO_CRATE_VALUE * 40 unit_name = "lava planet artifact" - export_types = list(/obj/item/guardiancreator/miner, - /obj/item/rod_of_asclepius, - /obj/item/dragons_blood, - /obj/item/lava_staff, - /obj/item/prisoncube, - ) + export_types = list( + /obj/item/guardiancreator/miner, + /obj/item/rod_of_asclepius, + /obj/item/dragons_blood, + /obj/item/melee/ghost_sword, + /obj/item/lava_staff, + /obj/item/prisoncube, + ) //Megafauna loot, except for ash drakes /datum/export/lavaland/megafauna cost = CARGO_CRATE_VALUE * 80 unit_name = "major lava planet artifact" - export_types = list(/obj/item/hierophant_club, - /obj/item/melee/cleaving_saw, - /obj/item/organ/internal/vocal_cords/colossus, - /obj/machinery/anomalous_crystal, - /obj/item/mayhem, - /obj/item/gun/magic/staff/spellblade, - /obj/item/storm_staff, - /obj/item/clothing/suit/hooded/hostile_environment, - ) + export_types = list( + /obj/item/hierophant_club, + /obj/item/melee/cleaving_saw, + /obj/item/organ/internal/vocal_cords/colossus, + /obj/machinery/anomalous_crystal, + /obj/item/mayhem, + /obj/item/soulscythe, + /obj/item/storm_staff, + /obj/item/clothing/suit/hooded/hostile_environment, + ) /datum/export/lavaland/megafauna/total_printout(datum/export_report/ex, notes = TRUE) //in the unlikely case a miner feels like selling megafauna loot . = ..()