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

External webbing can hold firearms #4482

Merged
merged 7 commits into from
Sep 28, 2023
Merged

External webbing can hold firearms #4482

merged 7 commits into from
Sep 28, 2023

Conversation

QuickLode
Copy link
Contributor

@QuickLode QuickLode commented Sep 23, 2023

About the pull request

saw and this revives idea of #3983 #4027

  • removes ext webbing from staff officers(Morrow request)
  • allows ext webbing to hold belts and firearm
  • jackets that can hold machete scabbard can hold katana scabbard. not dutch because dutch is for dutch

Explain why it's good for the game

pr no longer stale

Webbings are made to hold things such as holsters, pouches, or indeed even slinging your firearm. It shouldn't prevent you from holding a firearm. For balancing purposes Morrow would like SO Lockers to not hold this ext webbing which makes sense.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: Allows ext webbing to hold firearms.
fix: exosuits which can hold scabbards can hold similar scabbards(ie, machete and katana)
del: Removes ext webbing from SO Locker
/:cl:

@github-actions github-actions bot added Feature Feature coder badge Fix Fix one bug, make ten more Removal snap labels Sep 23, 2023
@morrowwolf morrowwolf marked this pull request as draft September 26, 2023 09:52
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Sep 26, 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 Sep 28, 2023
@QuickLode QuickLode marked this pull request as ready for review September 28, 2023 00:14
@morrowwolf morrowwolf added this pull request to the merge queue Sep 28, 2023
Merged via the queue into cmss13-devs:master with commit 9484615 Sep 28, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Sep 28, 2023
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 Removal snap
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants