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

Patrol Cap Equalization #455

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open

Patrol Cap Equalization #455

wants to merge 28 commits into from

Conversation

KoishiVibe
Copy link
Contributor

Summary

  • Patrol Cap and subvariants like boonie now come with the same potential for keeping small items like a helmet does.
  • Rewrites flavor text of patrol cap
  • doesnt include goggles NVGs or the faceshield because maybe soon diff sprite pls dont kill koishi

KoishiVibe and others added 28 commits June 2, 2024 03:35
fuck that shit
de6c369
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
2b6c465
emails
8ea6f23
should hopefully accidently unfuck this
1e582ef
@KoishiVibe
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
38aee5f
FUCK.
b69183d
unfucks that.
d5078fe
try to fix the problem
edf2ede
i dont know why hpefully fixed????
a361ab2
hopefully fixed wait no this needs to mathc
0f713b9
@KoishiVibe
done
115e852
fucking fix you piece of shit
f0b4d03
undoes a fuckup with the master
017baf3
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
3be565c
fixes issue
9698a01
@KoishiVibe
how tf did this get changed
c040c59
@KoishiVibe
flask draftoid
d681f97
@KoishiVibe
mre obliteration
71341c8
@KoishiVibe
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
fe00da5
decommits stuff
6cd3f94
fucking fix you pice of shit
fc4270d
@KoishiVibe
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
df9e105
@KoishiVibe
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
ab2a3a0
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
d4766cc
@KoishiVibe
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
5e31559
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
8e66c08
hat operation
901cc12
whoopsies
56b7124
@cm13-github
Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Merge Conflict Missing Changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@KoishiVibe @cm13-github