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

Frozen's Rat Competition Reward #8007

Draft
wants to merge 13 commits into
base: master
Choose a base branch
from

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Jan 4, 2025

About the pull request

Adds the rewards for winning the rat competition Frozen ran.
Incorporates #8006

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑
add: Added the reward for winning rat competition from Frozen.
add: Added sprites and function for having rats on your shoulder.
/:cl:

@cmss13-ci cmss13-ci bot added Sprites Remove the soul from the game. Feature Feature coder badge labels Jan 4, 2025
cm13-github added a commit that referenced this pull request Jan 4, 2025
forest2001 added 2 commits January 4, 2025 16:13
cm13-github added a commit that referenced this pull request Jan 4, 2025
cm13-github added a commit that referenced this pull request Jan 4, 2025

/client
/// Whether or not the client has spawned a unique pet.
var/spawned_pet = FALSE
Copy link
Member

@hry-gh hry-gh Jan 4, 2025

Choose a reason for hiding this comment

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

1 this shouldn't be a bespoke var, just use a trait
2 this shouldn't be on client because they can just reconnect to get a new client datum (this is what player details is for)

@hry-gh hry-gh marked this pull request as draft January 4, 2025 18:00
cm13-github added a commit that referenced this pull request Jan 4, 2025
cm13-github added a commit that referenced this pull request Jan 18, 2025
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jan 18, 2025
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

cm13-github added a commit that referenced this pull request Jan 18, 2025
cm13-github added a commit that referenced this pull request Jan 18, 2025
cm13-github added a commit that referenced this pull request Jan 18, 2025
cm13-github added a commit that referenced this pull request Jan 19, 2025
cm13-github added a commit that referenced this pull request Jan 19, 2025
cm13-github added a commit that referenced this pull request Jan 19, 2025
cm13-github added a commit that referenced this pull request Jan 19, 2025
cm13-github added a commit that referenced this pull request Jan 20, 2025
cm13-github added a commit that referenced this pull request Jan 20, 2025
cm13-github added a commit that referenced this pull request Jan 21, 2025
cm13-github added a commit that referenced this pull request Jan 21, 2025
cm13-github added a commit that referenced this pull request Jan 21, 2025
Copy link
Contributor

@Blundir Blundir left a comment

Choose a reason for hiding this comment

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

please make sure the ooc.dmi in repo is synchronized with the one on server

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Sprites Remove the soul from the game.
Projects
Status: Changes Requested
Development

Successfully merging this pull request may close these issues.

4 participants