Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New fishing spots #14527

Merged
merged 13 commits into from Jun 13, 2023
11 changes: 11 additions & 0 deletions code/modules/fishing/fish.dm
Expand Up @@ -373,6 +373,17 @@ Alien/mutant/other fish:
inhand_color = "#8f3ed1"
value = FISH_RARITY_RARE

//code
/obj/item/fish/code_worm
name = "code worm"
desc = "This unstable creature has been swimming around in this code for a long time, giving developers and its victims a massive headache."
icon_state = "code_worm"
inhand_color = "#32CD32"
value = FISH_RARITY_EPIC
New()
..()
name = "\improper [pick("free", "gamer", "Xtreme", "funny", "ultimate", "REAL")] [pick("cat", "puppy", "gaming", "fail", "cheat", "hax")] [pick("video", "content", "game", "images", "text", "audiobook", "podcast")].worm"
cheekybrdy marked this conversation as resolved.
Show resolved Hide resolved

//solarium
/obj/item/fish/sun_fish
name = "literal sun fish"
Expand Down
22 changes: 22 additions & 0 deletions code/modules/fishing/fishing_spots.dm
Expand Up @@ -700,3 +700,25 @@ datum/fishing_spot/golden_toilet
/obj/item/fish/firefish = 5,\
/obj/item/fish/yellow_tang = 15,\
/obj/item/fish/mandarin_fish = 5)

//ice cream machine
/datum/fishing_spot/ice_cream_machine
fishing_atom_type = /obj/submachine/ice_cream_dispenser
rod_tier_required = 2
fish_available = list(/obj/item/reagent_containers/food/snacks/condiment/chocchips = 40,\
/obj/item/reagent_containers/food/snacks/condiment/custard = 30,\
/obj/item/reagent_containers/food/snacks/condiment/cream = 20,\
/obj/item/reagent_containers/food/snacks/condiment/syrup = 15,\
/obj/item/raw_material/ice = 35,\
/obj/item/fish/yellow_tang = 10,\
/obj/item/reagent_containers/food/snacks/ice_cream/goodrandom = 30)

//mainframe
/datum/fishing_spot/mainframe
fishing_atom_type = /obj/machinery/networked/mainframe/zeta
rod_tier_required = 3
fish_available = list(/obj/item/fish/code_worm = 50,\
/obj/item/disk/data/tape/boot2 = 30,\
/obj/item/disk/data/floppy/demo = 25,\
/obj/item/disk/data/cartridge/clown = 15,\
/obj/item/disk/data/cartridge/ringtone_beepy = 5)
Binary file modified icons/obj/foodNdrink/food_fish.dmi
Binary file not shown.