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

Adds new loadout items #4801

Merged
merged 8 commits into from
Nov 3, 2023
Merged

Conversation

BeagleGaming1
Copy link
Contributor

@BeagleGaming1 BeagleGaming1 commented Oct 29, 2023

About the pull request

New loadout items for customization

Explain why it's good for the game

When someone inevitably finds your corpse, some personalized stuff on it can add that much more storytelling.

Changelog

🆑
add: Added many new loadout items
code: Added a signal to items that triggers right after the mob finishes spawning
code: Added a signal to add additional behavior to storing items in shoes
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? Feature Feature coder badge Code Improvement Make the code longer labels Oct 29, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Oct 29, 2023
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Oct 29, 2023
@cm13-github
Copy link
Contributor

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

@BeagleGaming1 BeagleGaming1 marked this pull request as ready for review October 29, 2023 01:40
code/game/objects/items/props/helmetgarb.dm Outdated Show resolved Hide resolved
code/game/objects/items/props/helmetgarb.dm Show resolved Hide resolved
code/game/objects/items/tools/flame_tools.dm Show resolved Hide resolved
code/game/objects/items/toys/toys.dm Show resolved Hide resolved
code/game/objects/items/toys/toys.dm Outdated Show resolved Hide resolved
code/game/objects/items/toys/toys.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/blades.dm Outdated Show resolved Hide resolved
code/game/objects/objs.dm Outdated Show resolved Hide resolved
html/changelogs/AutoChangeLog-pr-3470.yml Outdated Show resolved Hide resolved
code/game/objects/items.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft October 30, 2023 10:34
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Oct 31, 2023
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Oct 31, 2023
@BeagleGaming1 BeagleGaming1 marked this pull request as ready for review October 31, 2023 22:50
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.

sprites 👍

@nauticall nauticall added the Sprites Approved confirmed no stray pixels label Nov 3, 2023
@harryob harryob added this pull request to the merge queue Nov 3, 2023
Merged via the queue into cmss13-devs:master with commit 4a4c57a Nov 3, 2023
27 checks passed
cm13-github added a commit that referenced this pull request Nov 3, 2023
github-merge-queue bot pushed a commit that referenced this pull request Nov 9, 2023
# About the pull request

Minor fixes for #4801 

 * Removes hard ref in photo and pen
 * Switches post-spawn signaling to avoid recursing mob contents
 * Fix unset pen displaying bogus text
* Add a fallback for plushie generator to put it in hands if theres no
backpack
 * Fix lingering reference for map-placed random plushies

And with any luck that also fixes the photo initialization bug

# Explain why it's good for the game
Is fix

# Testing Photographs and Procedure
Just tested spawning in with plushie / photo a few times
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Make the code longer Feature Feature coder badge Mapping did you remember to save in tgm format? 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