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.

Sign up for GitHub

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

Jump to bottom

fixes duplicate apc on shivas #7513

Merged
merged 2 commits into from
Nov 7, 2024
Merged

fixes duplicate apc on shivas #7513

merged 2 commits into from
Nov 7, 2024

Conversation

BOBAMAx
Copy link
Contributor

@BOBAMAx BOBAMAx commented Nov 6, 2024 •
edited by github-actions bot
Loading

About the pull request

remove extra apc i forgot about

Explain why it's good for the game

areas should have 1 apc
shivas2

Testing Photographs and Procedure

it compiled

Changelog

🆑
fix: extra apc in shivas removed
/:cl:

@BOBAMAx BOBAMAx requested a review from Nanu308 as a code owner November 6, 2024 10:54
@cmss13-ci cmss13-ci bot added Mapping did you remember to save in tgm format? Fix Fix one bug, make ten more labels Nov 6, 2024
@harryob harryob changed the title #7488 followup fixes duplicate apc on shivas Nov 6, 2024
@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Nov 7, 2024
Nanu308
Nanu308 approved these changes Nov 7, 2024
View reviewed changes
Copy link
Member

@Nanu308 Nanu308 left a comment

Choose a reason for hiding this comment

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

lgtm

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 7, 2024
@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 Nov 7, 2024
@cm13-github
Copy link
Contributor

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

@Drulikar Drulikar added this pull request to the merge queue Nov 7, 2024
Merged via the queue into cmss13-devs:master with commit 010ff19 Nov 7, 2024
27 checks passed
cmss13-ci bot added a commit that referenced this pull request Nov 7, 2024
@cmss13-ci
Automatic changelog for PR #7513 [ci skip]
50f511f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Nanu308 Nanu308 Nanu308 approved these changes

Assignees
No one assigned
Labels
Fix Fix one bug, make ten more Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format?
Projects
Review Backlog
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@BOBAMAx @cm13-github @Nanu308 @Drulikar