From bbc685b60a1ce6d0cd9f060dd90d40bc5a12633c Mon Sep 17 00:00:00 2001 From: deathrobotpunch <87455177+deathrobotpunch@users.noreply.github.com> Date: Tue, 17 Sep 2024 20:48:31 +0800 Subject: [PATCH] adds fishing category to games vendor (#86699) ## About The Pull Request this pull request adds a fishing category to the games vendor with items that cost 50 credits more than their goodie alternatives. ## Why It's Good For The Game this allows people to start their fishing goals earlier without waiting 20 minutes for cargo at the caveat of the items costing 50 credits extra than normal ## Changelog :cl: add: Added new fishing category to games vendor /:cl: --- code/modules/fishing/aquarium/fish_analyzer.dm | 1 + code/modules/fishing/fish_catalog.dm | 1 + code/modules/fishing/fishing_equipment.dm | 4 ++++ code/modules/fishing/fishing_rod.dm | 1 + code/modules/vending/games.dm | 13 +++++++++++++ 5 files changed, 20 insertions(+) diff --git a/code/modules/fishing/aquarium/fish_analyzer.dm b/code/modules/fishing/aquarium/fish_analyzer.dm index 3d01479ef5a..764626fddbf 100644 --- a/code/modules/fishing/aquarium/fish_analyzer.dm +++ b/code/modules/fishing/aquarium/fish_analyzer.dm @@ -8,6 +8,7 @@ worn_icon_state = "fish_analyzer" desc = "A fish-shaped scanner used to monitor fish's status and evolutionary traits." obj_flags = CONDUCTS_ELECTRICITY + custom_price = PAYCHECK_CREW * 3 item_flags = NOBLUDGEON slot_flags = ITEM_SLOT_BELT throwforce = 3 diff --git a/code/modules/fishing/fish_catalog.dm b/code/modules/fishing/fish_catalog.dm index 4235e5fe88d..6e0216dcb8c 100644 --- a/code/modules/fishing/fish_catalog.dm +++ b/code/modules/fishing/fish_catalog.dm @@ -3,6 +3,7 @@ name = "Fish Encyclopedia" desc = "Indexes all fish known to mankind (and related species)." icon_state = "fishbook" + custom_price = PAYCHECK_CREW * 2 starting_content = "Lot of fish stuff" //book wrappers could use cleaning so this is not necessary /obj/item/book/manual/fish_catalog/ui_interact(mob/user, datum/tgui/ui) diff --git a/code/modules/fishing/fishing_equipment.dm b/code/modules/fishing/fishing_equipment.dm index 5b2a250f42b..e2b4523448b 100644 --- a/code/modules/fishing/fishing_equipment.dm +++ b/code/modules/fishing/fishing_equipment.dm @@ -287,6 +287,7 @@ icon_state = "fishing" inhand_icon_state = "artistic_toolbox" material_flags = NONE + custom_price = PAYCHECK_CREW * 3 /obj/item/storage/toolbox/fishing/Initialize(mapload) . = ..() @@ -339,6 +340,7 @@ /obj/item/storage/box/fishing_hooks name = "fishing hook set" illustration = "fish" + custom_price = PAYCHECK_CREW * 2 /obj/item/storage/box/fishing_hooks/PopulateContents() new /obj/item/fishing_hook/magnet(src) @@ -355,6 +357,7 @@ /obj/item/storage/box/fishing_lines name = "fishing line set" illustration = "fish" + custom_price = PAYCHECK_CREW * 2 /obj/item/storage/box/fishing_lines/PopulateContents() new /obj/item/fishing_line/bouncy(src) @@ -403,6 +406,7 @@ icon_state = "plasticbox" foldable_result = null illustration = "fish" + custom_price = PAYCHECK_CREW * 9 /obj/item/storage/box/fishing_lures/PopulateContents() new /obj/item/paper/lures_instructions(src) diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm index f7f4d12e6a0..7ee15cead66 100644 --- a/code/modules/fishing/fishing_rod.dm +++ b/code/modules/fishing/fishing_rod.dm @@ -502,6 +502,7 @@ icon_state = "fishing_rod_telescopic" desc = "A lightweight, ergonomic, easy to store telescopic fishing rod. " inhand_icon_state = null + custom_price = PAYCHECK_CREW * 9 force = 0 w_class = WEIGHT_CLASS_NORMAL ui_description = "A collapsible fishing rod that can fit within a backpack." diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm index d1a237eaf64..98a77c7f40c 100644 --- a/code/modules/vending/games.dm +++ b/code/modules/vending/games.dm @@ -45,6 +45,19 @@ /obj/item/stack/pipe_cleaner_coil/random = 10, ), ), + list( + "name" = "Fishing", + "icon" = "fish", + "products" = list( + /obj/item/storage/toolbox/fishing = 2, + /obj/item/storage/box/fishing_hooks = 2, + /obj/item/storage/box/fishing_lines = 2, + /obj/item/storage/box/fishing_lures = 2, + /obj/item/book/manual/fish_catalog = 5, + /obj/item/fish_analyzer = 2, + /obj/item/fishing_rod/telescopic = 1, + ), + ), list( "name" = "Skillchips", "icon" = "floppy-disk",