Skip to content

Commit

Permalink
Fishupload (#2634)
Browse files Browse the repository at this point in the history
  • Loading branch information
neofatale authored Dec 22, 2024
1 parent 705e553 commit 145662f
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,21 @@
/obj/item/food/fish/fresh_water/boxin_man
name = "Boxin Man"
desc = "I'm boxin' here!"
icon_state = "walkin_man"
icon_state = "boxin_man"
random_case_rarity = FISH_RARITY_VERY_RARE
fillet_type = /obj/item/food/freshfish/white
sprite_width = 8
sprite_height = 8
average_size = 50
average_weight = 5600

/obj/item/food/fish/fresh_water/weever_blue_album
name = "Weever Blue Album"
desc = "Only in Dreams!"
icon_state = "weever_blue_album"
random_case_rarity = FISH_RARITY_VERY_RARE
fillet_type = /obj/item/food/freshfish/slime
sprite_width = 8
sprite_height = 8
average_size = 50
average_weight = 10000
10 changes: 10 additions & 0 deletions ModularTegustation/fishing/code/turfs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -264,12 +264,15 @@
/obj/item/clothing/head/beret/fishing_hat = 5,
)
loot_level3 = list(
/obj/item/food/fish/fresh_water/ufo = 5,
/obj/item/food/fish/fresh_water/unidentifiedfishobject = 1,
/obj/item/food/fish/fresh_water/ratfish = 25,
/obj/item/food/fish/fresh_water/waterflea = 20,
/obj/item/food/fish/fresh_water/yin = 20,
/obj/item/food/fish/fresh_water/yang = 20,
/mob/living/simple_animal/hostile/retaliate/frog = 10,
/obj/item/food/fish/emulsijack = 5,
/obj/item/food/fish/fresh_water/weever_blue_album = 5,
)

/turf/open/water/deep/saltwater
Expand All @@ -284,6 +287,7 @@
/obj/item/stack/sheet/mineral/wood = 10,
)
loot_level2 = list(
/obj/item/food/fish/salt_water/seabunny = 5,
/obj/item/food/fish/trout = 35,
/obj/item/food/fish/salt_water/cardinal = 25,
/obj/item/food/fish/salt_water/sheephead = 10,
Expand All @@ -293,6 +297,8 @@
/obj/item/clothing/head/beret/fishing_hat = 5,
)
loot_level3 = list(
/obj/item/food/fish/salt_water/fishmael = 8,
/obj/item/food/fish/salt_water/searabbit = 5,
/obj/item/food/fish/salt_water/lanternfish = 60,
/obj/item/food/fish/salt_water/smolshark = 10,
/obj/item/food/fish/salt_water/tuna_pallid = 10,
Expand Down Expand Up @@ -325,10 +331,14 @@
/mob/living/simple_animal/hostile/shrimp = 2,
)
loot_level3 = list(
/obj/item/food/fish/fresh_water/boxin_man = 10,
/obj/item/food/fish/fresh_water/walkin_man = 10,
/obj/item/food/fish/fresh_water/unidentifiedfishobject = 5,
/obj/item/food/fish/fresh_water/mosb = 25,
/obj/item/food/fish/salt_water/tuna_pallid = 25,
/obj/item/food/fish/salt_water/piscine_mermaid = 45,
/obj/item/food/fish/emulsijack = 5,
/obj/item/food/fish/fresh_water/weever_blue_album = 6,
)

/* Change this later so that it is not a subtype since the variable is in the deep type.
Expand Down
Binary file modified ModularTegustation/fishing/icons/fish_sprites.dmi
Binary file not shown.

0 comments on commit 145662f

Please sign in to comment.