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

Cats now have the correct name and description when held and in your bag #6306

Merged
merged 3 commits into from
May 19, 2024

Conversation

Nomoresolvalou
Copy link
Contributor

@Nomoresolvalou Nomoresolvalou commented May 18, 2024

About the pull request

changes the get_scooped proc so that it now uses the correct name and description when creating a new mob_holder object. This means that mobs will have the correct name and description when held or in a container.

Explain why it's good for the game

saying, "Here's the colony cat, Orion!" and then using the show held item verb, only to show "cat" with the default cat description makes no sense and breaks my immersion.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑 Nomoresolvalou

fix: fixed cats not specifically defined in code displaying wrong info when held or stored in a container. This should also fix any other mob capable of being picked up that is not defined in code as well.

/:cl:

description to the correct info
@github-actions github-actions bot added the Fix Fix one bug, make ten more label May 18, 2024
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

You might also want to implement get_examine_text for a /obj/item/holder If its holding an item, you can just return ..() to use the item implementation. But if a mob, you ought to replicate I think /atom/proc/get_examine_text(mob/user)

Currently the mob holder uses the generic item implementation resulting in the difference here:
image

code/modules/mob/holder.dm Outdated Show resolved Hide resolved
code/modules/mob/holder.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft May 18, 2024 05:09
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

Btw you can undraft when ready here:
image

@Drulikar Drulikar marked this pull request as ready for review May 18, 2024 06:07
@Drulikar Drulikar added this pull request to the merge queue May 19, 2024
Merged via the queue into cmss13-devs:master with commit 8ac6186 May 19, 2024
28 checks passed
cm13-github added a commit that referenced this pull request May 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants