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

Post dmi reorg fixes #7782

Merged
merged 30 commits into from
Dec 18, 2024
Merged

Post dmi reorg fixes #7782

merged 30 commits into from
Dec 18, 2024

Conversation

Blundir
Copy link
Contributor

@Blundir Blundir commented Dec 10, 2024

About the pull request

Fixes oversights from #7021

Closes #7780
Closes #7784
Closes #7790
Closes #7791

Changelog

🆑
add: blade runner revolvers and holdout pistol now have unique sprite in belt and fit gun belts
add: officer (SO) helmet now has sprite matching the armor on different maps
fix: broken icons
fix: es4 now fits gun belts
fix: wrapped burrito/hotdog/burger having no trash wrapper
/:cl:

@cmss13-ci cmss13-ci bot added Mapping did you remember to save in tgm format? Fix Fix one bug, make ten more labels Dec 10, 2024
cm13-github added a commit that referenced this pull request Dec 10, 2024
cm13-github added a commit that referenced this pull request Dec 10, 2024
@cmss13-ci cmss13-ci bot added the Sprites Remove the soul from the game. label Dec 10, 2024
cm13-github added a commit that referenced this pull request Dec 11, 2024
cm13-github added a commit that referenced this pull request Dec 11, 2024
cm13-github added a commit that referenced this pull request Dec 11, 2024
cm13-github added a commit that referenced this pull request Dec 11, 2024
cm13-github added a commit that referenced this pull request Dec 11, 2024
cm13-github added a commit that referenced this pull request Dec 11, 2024
cm13-github added a commit that referenced this pull request Dec 11, 2024
cm13-github added a commit that referenced this pull request Dec 11, 2024
cm13-github added a commit that referenced this pull request Dec 11, 2024
cm13-github added a commit that referenced this pull request Dec 11, 2024
cm13-github added a commit that referenced this pull request Dec 11, 2024
cm13-github added a commit that referenced this pull request Dec 11, 2024
@cm13-issue-bot cm13-issue-bot mentioned this pull request Dec 11, 2024
cm13-github added a commit that referenced this pull request Dec 11, 2024
cm13-github added a commit that referenced this pull request Dec 11, 2024
cm13-github added a commit that referenced this pull request Dec 11, 2024
cm13-github added a commit that referenced this pull request Dec 16, 2024
cm13-github added a commit that referenced this pull request Dec 16, 2024
cm13-github added a commit that referenced this pull request Dec 16, 2024
cm13-github added a commit that referenced this pull request Dec 16, 2024
cm13-github added a commit that referenced this pull request Dec 16, 2024
cm13-github added a commit that referenced this pull request Dec 16, 2024
cm13-github added a commit that referenced this pull request Dec 17, 2024
@Red-byte3D
Copy link
Contributor

image

@Blundir
Copy link
Contributor Author

Blundir commented Dec 17, 2024

not caused by reorg tho

@Red-byte3D
Copy link
Contributor

not caused by reorg tho

just assumed, thermal optics also have their sprites broken where should i put these instead

@Blundir
Copy link
Contributor Author

Blundir commented Dec 17, 2024

not caused by reorg tho

just assumed, thermal optics also have their sprites broken where should i put these instead

yeah these were me, i'll fix them

@hry-gh hry-gh added this pull request to the merge queue Dec 18, 2024
Merged via the queue into cmss13-devs:master with commit fe930ee Dec 18, 2024
29 checks passed
cmss13-ci bot added a commit that referenced this pull request Dec 18, 2024
@nuklearcellphoneg nuklearcellphoneg mentioned this pull request Dec 19, 2024
3 tasks
Git-Nivrak pushed a commit to Git-Nivrak/cmss13 that referenced this pull request Dec 31, 2024
# About the pull request

Fixes oversights from cmss13-devs#7021

Closes cmss13-devs#7780
Closes cmss13-devs#7784
Closes cmss13-devs#7790
Closes cmss13-devs#7791

# Changelog
:cl:
add: blade runner revolvers and holdout pistol now have unique sprite in
belt and fit gun belts
add: officer (SO) helmet now has sprite matching the armor on different
maps
fix: broken icons
fix: es4 now fits gun belts
fix: wrapped burrito/hotdog/burger having no trash wrapper
/:cl:
Git-Nivrak pushed a commit to Git-Nivrak/cmss13 that referenced this pull request Dec 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Fix Fix one bug, make ten more Mapping did you remember to save in tgm format? Sprites Remove the soul from the game. Testmerge Candidate we'll test this while you're asleep and the server has 10 players
Projects
Archived in project
5 participants