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 00000000000..2caa12007a0 Binary files /dev/null and b/modular_zubbers/icons/obj/aquarium/fish.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 96fa82084a1..fdeb74018fc 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9583,6 +9583,8 @@ #include "modular_zubbers\code\modules\experisci\experiment\experiments.dm" #include "modular_zubbers\code\modules\experisci\experiment\handlers\experiment_handler.dm" #include "modular_zubbers\code\modules\experisci\experiment\types\scanning_fish.dm" +#include "modular_zubbers\code\modules\fishing\fish\types\saltwater.dm" +#include "modular_zubbers\code\modules\fishing\sources\subtypes\fishing_portal_machine.dm" #include "modular_zubbers\code\modules\fluff\flora\ash_flora.dm" #include "modular_zubbers\code\modules\food_and_drinks\machinery\stove.dm" #include "modular_zubbers\code\modules\food_and_drinks\recipes\drinks\drinks_alcoholic.dm"