From c033ca4ec4ad88ed9ac2a1b167a67b5f35c9f922 Mon Sep 17 00:00:00 2001 From: Alexis Date: Sun, 24 May 2026 21:33:50 -0400 Subject: [PATCH] Adds Shrimp to Ocean Fishing (#5668) ## About The Pull Request Does as the title suggests. Once this gets merged I'll work on making some shrimp-based foods to go with the new crustacean. The large icon for shrimp is made by Rootoo807 of Baystation12, and the smaller aquarium shrimp icon is made by myself. image ## Why It's Good For The Game Shrimp are a pretty big meme in the Bubber community, and pretty shrimply put, the April Fools shrimp species probably wouldn't make a very good permanent addition. However, I feel this is a good compromise. ## Proof Of Testing See below!
Screenshots/Videos https://github.com/user-attachments/assets/bf897d0f-47c6-492b-96eb-4b93f7db33ef image
## Changelog :cl: add: Added a new crustacean to ocean fishing in the Fish-Porter 3000: Shrimp! /:cl: --- .../modules/fishing/fish/types/saltwater.dm | 21 ++++++++++++++++++ .../subtypes/fishing_portal_machine.dm | 3 +++ modular_zubbers/icons/obj/aquarium/fish.dmi | Bin 0 -> 630 bytes tgstation.dme | 2 ++ 4 files changed, 26 insertions(+) create mode 100644 modular_zubbers/code/modules/fishing/fish/types/saltwater.dm create mode 100644 modular_zubbers/code/modules/fishing/sources/subtypes/fishing_portal_machine.dm create mode 100644 modular_zubbers/icons/obj/aquarium/fish.dmi diff --git a/modular_zubbers/code/modules/fishing/fish/types/saltwater.dm b/modular_zubbers/code/modules/fishing/fish/types/saltwater.dm new file mode 100644 index 00000000000..5afecb79230 --- /dev/null +++ b/modular_zubbers/code/modules/fishing/fish/types/saltwater.dm @@ -0,0 +1,21 @@ +/obj/item/fish/shrimp + name = "shrimp" + fish_id = "shrimp" + desc = "A reddish pink crustacean. How many of them would you have to eat for your skin to turn pink?" + icon = 'modular_zubbers/icons/obj/aquarium/fish.dmi' + icon_state = "shrimp" + dedicated_in_aquarium_icon = 'modular_zubbers/icons/obj/aquarium/fish.dmi' + dedicated_in_aquarium_icon_state = "shrimp_small" + sprite_width = 7 + sprite_height = 7 + average_size = 14 + average_weight = 300 + stable_population = 4 + fish_traits = list() + required_temperature_min = MIN_AQUARIUM_TEMP + required_temperature_max = MIN_AQUARIUM_TEMP + 12 + required_fluid_type = AQUARIUM_FLUID_SALTWATER + fillet_type = null + +/obj/item/fish/shrimp/get_fish_taste() + return list("raw shrimp" = 2) diff --git a/modular_zubbers/code/modules/fishing/sources/subtypes/fishing_portal_machine.dm b/modular_zubbers/code/modules/fishing/sources/subtypes/fishing_portal_machine.dm new file mode 100644 index 00000000000..6eb0a4085a0 --- /dev/null +++ b/modular_zubbers/code/modules/fishing/sources/subtypes/fishing_portal_machine.dm @@ -0,0 +1,3 @@ +/datum/fish_source/portal/ocean/New() + fish_table += list(/obj/item/fish/shrimp = 5) + return ..() diff --git a/modular_zubbers/icons/obj/aquarium/fish.dmi b/modular_zubbers/icons/obj/aquarium/fish.dmi new file mode 100644 index 0000000000000000000000000000000000000000..2caa12007a0796fc7f4069e81dc06f891d9cb108 GIT binary patch literal 630 zcmV-+0*U>JP)V=-0C)j)jyno~Fc1an>?s!Q#b0Y9idg6sBw#cPMkO2c`UcYpb~BGDUW|3y z^&>Vz50|n`$Bq@2Nebeo*=a9D4niwhwF|;dI^{89ZONPwh?y+=Ap@~kX;k1(HnEZ0 z_7}(4j?H`G0f~wzNBirK2><{AxJg7oRCwC$ma$92Kp4gET3N<=Qm*SJy1!%q41fVJ00zJS7ytuc00tU8-uK6|*{*Z18)Z4r0Lc7U z!4a7Wr(^!}_Sy(SssOy=;O_~_}!_>`u2(s5SSzL zZ;dB47e@kgJ+CdP(zH#1@mGLSKn7vnsa&=pjAZiaG~xn4wNGY)GVuE;1FQc4GOdr% zqAch>IIUHLz9z~9z%<4FtJSiOzf}pKrIV$x9(@z@Q6!*W87E-stm-4)WL&=wAY6!H z&D$m*N*Mv5I;T5;M4v|!