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.

Sign up for GitHub

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

Jump to bottom

New fishing spots #14527

Merged
merged 13 commits into from Jun 13, 2023
Merged

New fishing spots #14527

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8d01d95
fishin
cheekybrdy Jun 10, 2023
7442abe
Merge branch 'goonstation:master' into new-fishing-spots
cheekybrdy Jun 11, 2023
c7042d1
code was acting fishy
cheekybrdy Jun 11, 2023
288c2e0
Merge branch 'new-fishing-spots' of https://github.com/cheekybrdy/goo…
cheekybrdy Jun 11, 2023
e799393
Update fishing_spots.dm
cheekybrdy Jun 11, 2023
61e7db4
Update code/modules/fishing/fishing_spots.dm
cheekybrdy Jun 11, 2023
2f10bfa
Merge branch 'goonstation:master' into new-fishing-spots
cheekybrdy Jun 12, 2023
64777b5
revert accidnet
cheekybrdy Jun 13, 2023
044bd5d
code fishin
cheekybrdy Jun 13, 2023
8b7d376
Merge branch 'goonstation:master' into new-fishing-spots
cheekybrdy Jun 13, 2023
a676118
fixed typos
cheekybrdy Jun 13, 2023
e87cd38
Merge branch 'new-fishing-spots'
cheekybrdy Jun 13, 2023
76f3eea
Update code/modules/fishing/fish.dm
cheekybrdy Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions code/modules/fishing/fish.dm
View file
Open in desktop
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
21 changes: 19 additions & 2 deletions code/modules/fishing/fishing_spots.dm
View file
Open in desktop
Expand Up @@ -47,8 +47,7 @@ ABSTRACT_TYPE(/datum/fishing_spot)
user.visible_message("[user] [pick("reels in", "catches", "pulls in", "fishes up")] a \
[pick("big", "wriggly", "fat", "slimy", "fishy", "large", "high-quality", "nasty", "chompy", "real", "wily")] \
[prob(80) ? "[fish.name]" : pick("one", "catch", "chomper", "wriggler", "sunovagun", "sucker")]!")
user.put_in_hand_or_drop(fish)
//fish.set_loc(get_turf(user))
fish.set_loc(get_turf(user))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like an unintentional change?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah this looks like it reverts back to the previous behaviour before I made fish attempt to get put in the player's open hand.

playsound(user, 'sound/items/fishing_rod_reel.ogg', 50, 1)
fishing_rod.last_fished = TIME //set the last fished time
return 1
Expand Down Expand Up @@ -700,3 +699,21 @@ 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_container/food/snacks/condiment/chocchips = 40,\
/obj/item/reagent_container/food/snacks/condiment/custard = 30,\
/obj/item/reagent_container/food/snacks/condiment/cream = 20,\
/obj/item/reagent_container/food/snacks/condiment/syrup = 15,\
/obj/item/raw_material/ice = 35,\
/obj/item/reagent_contain/food/snacks/ice_cream/goodrandom)
cheekybrdy marked this conversation as resolved.
Show resolved Hide resolved


//databank
/datum/fishing_spot/databank
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is really stretching the concept of fishing lol, should probably have more than one fish at least

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't mind a few silly ones, but yeah maybe this spot should include some random tapes/computer gear too?

fishing_atom_type = /obj/machinery/networked/storage/tape_drive
rod_tier_required = 3
fish_available = list(/obj/item/fish/code_worm = 50)
Binary file modified icons/obj/foodNdrink/food_fish.dmi
View file
Open in desktop
Binary file not shown.