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

Weyland Yutani Trading Cards™ #5665

Merged
merged 23 commits into from
Feb 23, 2024
Merged

Conversation

Warfan1815
Copy link
Contributor

@Warfan1815 Warfan1815 commented Feb 5, 2024

About the pull request

Adds Weyland Yutani Trading Cards™ to the rec vendor
Adds Weyland Yutani Trading Cards™ packs of five to the rec vendor
Adds Weyland Yutani Trading Cards Gold™ cigarette packs to the rec vendor and colony cigarette machines (that exist soley to break the lucky strikes military tobacco monopoly)

Explain why it's good for the game

Adds some funny cards for marines to collect and to fight each other over

Testing Photographs and Procedure

Screenshots & Videos

https://cdn.discordapp.com/attachments/745447048261795890/1203903068756906016/2024-02-05_03-17-17.mp4?ex=65d2c91b&is=65c0541b&hm=13a9bbf4e63e9c3f8f14f02233ea9d43eaa62862957474677171dddde10efdf7&

Changelog

🆑
add: Added WeyYu Trading Cards (they come in packs of 5, single, or in special packs of WeyYu Gold) buyable at rec vendor (and/or colony tobacco vendors in the case of the special cigarette packs)
imageadd: Added sprites of the WeyYu Trading Cards, trading card packs, and special WeyYu Gold cigarette packs.
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge Code Improvement Make the code longer labels Feb 5, 2024
@Warfan1815
Copy link
Contributor Author

Just realised probably shouldn't have that code changelog there, it just gave the code improvement tag. Oops.

@Birdtalon Birdtalon removed the Code Improvement Make the code longer label Feb 5, 2024
Copy link
Contributor

@nauticall nauticall left a comment

Choose a reason for hiding this comment

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

cute

@nauticall nauticall added the Sprites Approved confirmed no stray pixels label Feb 7, 2024
code/game/objects/items/toys/trading_cards.dm Outdated Show resolved Hide resolved
code/game/objects/items/toys/trading_cards.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft February 14, 2024 09:57
@Warfan1815 Warfan1815 marked this pull request as ready for review February 14, 2024 15:15
@Drulikar Drulikar removed the Sprites Approved confirmed no stray pixels label Feb 15, 2024
@nauticall nauticall added the Sprites Approved confirmed no stray pixels label Feb 19, 2024
code/game/objects/items/storage/fancy.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/fancy.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/fancy.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/fancy.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/fancy.dm Outdated Show resolved Hide resolved
code/game/objects/items/toys/trading_cards.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft February 21, 2024 04:09
@Warfan1815 Warfan1815 marked this pull request as ready for review February 22, 2024 21:48
Copy link
Member

@harryob harryob left a comment

Choose a reason for hiding this comment

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

one last thing - we return ..() instead of assigning it to . at the end of a proc. it does the same thing, but uh... code styles 'n all. we do . = ..() at the beginning of an overridden proc

code/game/objects/items/storage/fancy.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/fancy.dm Outdated Show resolved Hide resolved
code/game/objects/items/toys/trading_cards.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/fancy.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/fancy.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft February 23, 2024 10:28
@Warfan1815 Warfan1815 marked this pull request as ready for review February 23, 2024 18:59
@harryob harryob added this pull request to the merge queue Feb 23, 2024
Merged via the queue into cmss13-devs:master with commit 772e5bf Feb 23, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Feb 23, 2024
@Warfan1815 Warfan1815 deleted the PlayingCards branch February 23, 2024 22:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants