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

добиваем 096 #37

Merged
merged 4 commits into from
Apr 19, 2024

Conversation

xhankaishi
Copy link

About the Pull Request

Why It's Good For The Game

Changelog

🆑
add: Added new mechanics or gameplay changes
add: Added more things
del: Removed old things
qol: made something easier to use
balance: rebalanced something
fix: fixed a few things
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
imageadd: added some icons and images
imagedel: deleted some icons and images
spellcheck: fixed a few typos
code: changed some code
refactor: refactored some code
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
/:cl:

Copy link

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

@github-actions github-actions bot added the Code label Apr 13, 2024
Copy link
Member

@MysticalFaceLesS MysticalFaceLesS left a comment

Choose a reason for hiding this comment

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

Не указаны данные в файле: mod_celadon/SCP096/_SCP096.dm.
Требуется решить конфликты.

@MysticalFaceLesS MysticalFaceLesS merged commit f5cdd93 into CeladonSS13:beta-dev Apr 19, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants