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

Shepherd Fixes for real this time #2616

Merged
merged 1 commit into from
Feb 2, 2024

Conversation

PigeonLord
Copy link
Contributor

@PigeonLord PigeonLord commented Dec 31, 2023

About The Pull Request

Fixed bees being able to open the Shepherd Apiary

Adds more Light Fixtures around the shepherd

Added some farming plots in the apiary so bees can actually make honey

Fixed bees being able to open the Shepherd Apiary

Sorry for fucking up the previous 2 PRs :(

Changelog

🆑
add: Adds more Light Switches around the shepherd
add: Added some farming plots in the apiary so bees can actually make honey
fix: Fixed bees being able to open the Shepherd Apiary
/:cl:

@PigeonLord PigeonLord requested a review from a team as a code owner December 31, 2023 18:31
@github-actions github-actions bot added the Map Change Tile placing is hard. Thank you for your service. label Dec 31, 2023
Copy link
Member

@goober3 goober3 left a comment

Choose a reason for hiding this comment

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

c4a3ba53845fe8f1b702bc8084380b59
Floating light switch.

118945bc9ae249a749a0065fa5b174bf
Remove the ORM, please.

a0a53d1107ec6f8e72ce203e71bca732
Cut this list down to just follower hoodies.

c750197b53f9c1d5266a5d6d985d4ee5
Remove the shard, nexus, and null rod. Replace the nexus with a hedge, or something.

652764acffe820daefe332fe430d6f40
Remove this altar or replace it with a fluff version.

9f98ee45e1c92aea447416dde35bf131
Can you replace the trophy rack on the captain's outfit with a regular bag? Remove the heroic beacon from the curator's outfit, as well.

2a53577bbeafa54379694fc677954eac
These guys are all on the same layer as the couch. Change their layer var to 3.1.

3dff85806e91cbb7b0b87d42df05f786-1
They can make do with one pair of insulated gloves.

Good PR, all in all. Thank you for maintaining the Shepherd!

@PigeonLord
Copy link
Contributor Author

PigeonLord commented Jan 7, 2024

Done everything except

Can you replace the trophy rack on the captain's outfit with a regular bag? Remove the heroic beacon from the curator's outfit, as well.

Because last time I fucked with job code it made the Integration test fail for unknowable reasons

@PigeonLord PigeonLord requested a review from goober3 January 27, 2024 18:05
Copy link
Contributor

@meemofcourse meemofcourse left a comment

Choose a reason for hiding this comment

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

the ship is starting to show its age, but thank you anyways

@meemofcourse meemofcourse added this pull request to the merge queue Jan 31, 2024
@meemofcourse meemofcourse removed this pull request from the merge queue due to a manual request Jan 31, 2024
Copy link
Member

@Latentish Latentish left a comment

Choose a reason for hiding this comment

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

looked good in uptime

Copy link
Member

@goober3 goober3 left a comment

Choose a reason for hiding this comment

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

yeah

@goober3 goober3 added this pull request to the merge queue Feb 2, 2024
Merged via the queue into shiptest-ss13:master with commit 6edb3f1 Feb 2, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Feb 4, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Fixed bees being able to open the Shepherd Apiary

Adds more Light Fixtures around the shepherd

Added some farming plots in the apiary so bees can actually make honey

Fixed bees being able to open the Shepherd Apiary

Sorry for fucking up the previous 2 PRs :(



## Changelog

:cl:
add: Adds more Light Switches around the shepherd
add: Added some farming plots in the apiary so bees can actually make
honey
fix: Fixed bees being able to open the Shepherd Apiary
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Map Change Tile placing is hard. Thank you for your service.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants