Skip to content

Commit

Permalink
Imports Fish from Shiptest (#2103)
Browse files Browse the repository at this point in the history
imports fish from shiptest

more fishing variety
  • Loading branch information
InsightfulParasite authored May 2, 2024
1 parent de6c61e commit 65ecbc7
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 6 deletions.
28 changes: 28 additions & 0 deletions ModularTegustation/fishing/code/fish/freshwater_fish.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,34 @@
average_size = 30
average_weight = 500

/obj/item/food/fish/fresh_water/bass
name = "largemouth bass"
desc = "A large, carnivorous freshwater fish known for thriving in most environments and being popular amongst sport fishers."
icon_state = "bass"
fillet_type = /obj/item/food/freshfish/white
average_size = 40
average_weight = 5000
stable_population = 3

/obj/item/food/fish/trout
name = "steelhead trout"
desc = "A species of coastal trout closely related to salmon and with a deep history of being used as a source of food."
icon_state = "trout"
fillet_type = /obj/item/food/freshfish/white
required_fluid_type = AQUARIUM_FLUID_ANADROMOUS
average_size = 60
average_weight = 12000
stable_population = 3

/obj/item/food/fish/fresh_water/perch
name = "perch"
desc = "A relatively small, yet common, species of predatory fish."
icon_state = "perch"
fillet_type = /obj/item/food/freshfish/white
average_size = 20
average_weight = 900
stable_population = 6

/obj/item/food/fish/fresh_water/angelfish
name = "angelfish"
desc = "Young Angelfish often live in groups, while adults prefer solitary life. They become territorial and aggressive toward other fish when they reach adulthood."
Expand Down
15 changes: 9 additions & 6 deletions ModularTegustation/fishing/code/turfs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,10 @@
icon_state = "water_turf1"
loot_level1 = list(
//75% chance bulk
/obj/item/food/fish/fresh_water/guppy = 35,
/obj/item/food/fish/fresh_water/guppy = 25,
/obj/item/food/fish/fresh_water/angelfish = 20,
/obj/item/food/fish/fresh_water/plasmatetra = 20,
/obj/item/food/fish/fresh_water/plasmatetra = 15,
/obj/item/food/fish/fresh_water/perch = 15,
//25% chance
/obj/item/stack/sheet/mineral/wood = 13,
/obj/item/fishing_component/hook/bone = 5,
Expand All @@ -256,8 +257,9 @@
)
loot_level2 = list(
/obj/item/food/fish/fresh_water/catfish = 50,
/obj/item/stack/sheet/sinew/wolf = 20,
/obj/item/stack/sheet/leather = 15,
/obj/item/food/fish/fresh_water/bass = 15,
/obj/item/stack/sheet/sinew/wolf = 10,
/obj/item/stack/sheet/leather = 10,
/obj/item/reagent_containers/food/drinks/bottle/wine/unlabeled = 10,
/obj/item/clothing/head/beret/fishing_hat = 5,
)
Expand All @@ -282,8 +284,9 @@
/obj/item/stack/sheet/mineral/wood = 10,
)
loot_level2 = list(
/obj/item/food/fish/salt_water/cardinal = 45,
/obj/item/food/fish/salt_water/sheephead = 40,
/obj/item/food/fish/trout = 35,
/obj/item/food/fish/salt_water/cardinal = 30,
/obj/item/food/fish/salt_water/sheephead = 20,
/obj/item/reagent_containers/food/drinks/bottle/wine/unlabeled = 10,
/obj/item/clothing/head/beret/fishing_hat = 5,
)
Expand Down
Binary file modified ModularTegustation/fishing/icons/fish_sprites.dmi
Binary file not shown.

0 comments on commit 65ecbc7

Please sign in to comment.