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

merged 13 commits into from Jun 13, 2023

Conversation

cheekybrdy
Copy link
Contributor

@cheekybrdy cheekybrdy commented Jun 11, 2023 •
edited

(A-Hydroponics) (C-Feature) (C-Sprites)

About the PR

Adds two new fishing spots and a new epic fish.

Why's this needed?

More content for fishing

(u)Cheekybrdy
(+)Added 2 new fishing spots, the mainframe and the ice cream machine!

@boring-cyborg boring-cyborg bot added the C-Sprites Automatically applied on any .dmi or icons folder change label Jun 11, 2023
@github-actions github-actions bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 11, 2023
@cheekybrdy cheekybrdy closed this Jun 11, 2023
@frawhst
Copy link
Member

frawhst commented Jun 11, 2023

You don’t have to close the PR every time there’s an error, you can just fix the code and push to the PR branch and it’ll update

@cheekybrdy cheekybrdy reopened this Jun 11, 2023
@DisturbHerb DisturbHerb added C-Feature A new feature or enhancements to existing features A-Hydroponics Deals with plants, hydro, etc. labels Jun 11, 2023
@DisturbHerb
Copy link
Contributor

For future reference, label macros can be found in .github/keylabeler.yml or in the default PR description template. They're generally something like [FEAT] or [QOL].

TobleroneSwordfish
TobleroneSwordfish requested changes Jun 11, 2023
View reviewed changes
code/modules/fishing/fishing_spots.dm Outdated
@@ -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.

code/modules/fishing/fishing_spots.dm Outdated Show resolved Hide resolved
code/modules/fishing/fishing_spots.dm Outdated


//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?

@github-actions github-actions bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 11, 2023
@cheekybrdy @TobleroneSwordfish
Update code/modules/fishing/fishing_spots.dm
61e7db4 
Co-authored-by: TobleroneSwordfish <20713227+TobleroneSwordfish@users.noreply.github.com>
@github-actions github-actions bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 11, 2023
frawhst
frawhst reviewed Jun 13, 2023
View reviewed changes
Copy link
Member

@frawhst frawhst left a comment

Choose a reason for hiding this comment

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

Changelog should be a bit more descriptive, would at least mention what the new spots are.

code/modules/fishing/fish.dm Outdated Show resolved Hide resolved
@cheekybrdy @frawhst
Update code/modules/fishing/fish.dm
76f3eea 
Co-authored-by: aloe <frawhstdev@gmail.com>
frawhst
frawhst approved these changes Jun 13, 2023
View reviewed changes
Copy link
Member

@frawhst frawhst left a comment

Choose a reason for hiding this comment

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

lgtm

Gannets
Gannets approved these changes Jun 13, 2023
View reviewed changes
Copy link
Contributor

@Gannets Gannets left a comment

Choose a reason for hiding this comment

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

👍

@Gannets Gannets merged commit ce89336 into goonstation:master Jun 13, 2023
21 checks passed
github-actions bot pushed a commit that referenced this pull request Jun 13, 2023
@robuddybot
Changelog for #14527 [skip ci]
11f243d
@cheekybrdy cheekybrdy deleted the new-fishing-spots branch June 13, 2023 09:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Gannets Gannets Gannets approved these changes

@frawhst frawhst frawhst approved these changes

@TobleroneSwordfish TobleroneSwordfish Awaiting requested review from TobleroneSwordfish

Assignees
No one assigned
Labels
A-Hydroponics Deals with plants, hydro, etc. C-Feature A new feature or enhancements to existing features C-Sprites Automatically applied on any .dmi or icons folder change size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@cheekybrdy @frawhst @DisturbHerb @Gannets @TobleroneSwordfish