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

Elevates Quartermaster back to Requisitions Officer #6701

Closed
wants to merge 1 commit into from

Conversation

Blundir
Copy link
Contributor

@Blundir Blundir commented Jul 13, 2024

About the pull request

When Morrow initially made changes to the RO, it was a part of the experiment to add altitude control console and everything related to it, to justify piloting permissions and similar things, but it never happened and altitude control got scrapped, and QM was left demoted.

This pr promoted QM to second lieutenant (i know RO was first lieutenant), making that job on the same rank with IO, SO, CE, GP, DP, Forecon SL, Doctor.

CoC is not changed, ASO is still supervisor and has higher rank.

All QM named things been reverted back to RO.

No changes to Bunker QM, that job is completely the same.

Added special lieutenant beret to RO's vendor. Sprites by me.

Explain why it's good for the game

Currently QM is in limbo of having all the access, skills and capabilities of a full officer, but has actually no officer rank, and the rank demotion wasn't justified, the thing that it was made for got axed.

Testing Photographs and Procedure

Screenshots & Videos

dreamseeker_HPZ4dBhCRr
Z3RH2vOTTK
yzzToXaj6s
2LpaCRxfaP

Changelog

🆑
add: QM promoted to 2lt and renamed back to RO
add: added RO beret
add: everything related to QM has been renamed back to RO, (bunker QM is the same)
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge labels Jul 13, 2024
@LC4492
Copy link
Contributor

LC4492 commented Jul 13, 2024

Altitude control wasn't scrapped and is always operational in-game, the altitude control computer is still waiting for map addition, and that's all.

@Blundir
Copy link
Contributor Author

Blundir commented Jul 13, 2024

Altitude control wasn't scrapped and is always operational in-game, the altitude control computer is still waiting for map addition, and that's all.

It's surely taking its time, considering how long it's been

Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jul 21, 2024
@realforest2001 realforest2001 removed the Stale beg a maintainer to review your PR label Jul 21, 2024
@realforest2001
Copy link
Member

I'm contemplating this at the moment but I'm not entirely sold on the idea. I'll handle rank changes in #6295 so I'm going to close this, but feel free to re-open it after #6295 is merged assuming I do restore them to officer rank

@Blundir Blundir mentioned this pull request Aug 2, 2024
github-merge-queue bot pushed a commit that referenced this pull request Aug 22, 2024
# About the pull request

Pr contains a lot of req related tweaks that are just too minor and too
numerous, and touch the same files, so i just combined them all into one
pr.

**Adds to ASRS store:**

- HIDP, AGM-I grenade boxes
- Fragmentation mortar shells

**Adds to req vendors:**

- External webbings
- XM88 ammo packets
- XM88 ammo box (will start working when
#6693 gets merged)
- HPDP WP nade packets
- HIDP, AMG-F, AGM-I grenade boxes
- Metal foam grenade packets
- Flashlight box
- 16g breaching slugs packet

Chance of ingridients crate to be sent by asrs have been lowered,
because it is too annoyingly common, and it's not needed by MST in that
quantity.

Req clothing vendor now has different backpacks, boots, uniforms.

M4A3 HP mags are now in ASRS rotation, with the same chance as M4A3 AP.

Added qm fluff locker to qm's office, as well some decor to it as well.

Added some paper bins to req area.

Tweaked xm88 packet from 90 to 100 rounds.

Tweaked hpr holo ammo price in asrs from 3000 to 2000 (normal ammo costs
2000)

Package wrapper now has wider selection of crate skins to chose from.

Added megaphone use sound and inhand sprites.

Made QM's jacket a subtype of marine jacket, which solves numerous
inconsistencies between them.

Added slightly edited [Quartermaster
Creed](https://quartermaster.army.mil/qm_creed.html) plaque to the QM's
office, with unique sprite.


HPDP nades exist in weak and strong variants, which look the same and
have the same name, i made them into CCDP and WPDP, to easily differ
them between one another.

Combat flashlights now have unique sprites, added combat flashlight ammo
box, also tweaked combat flashlight desc.

Added QM beret from #6701

Added req vendor animations and sounds.

<details>


https://github.com/user-attachments/assets/cf0044af-dd51-426f-b268-4db3bdc28d41

</details>

Fixed incorrect wall smoothing near req vendors.

<details>
Before


![StrongDMM_IGQg7eUei3](https://github.com/user-attachments/assets/18a00ade-1c72-47b3-9d7a-166ae58754f5)

After

![dreamseeker_ZwOp8phFgu](https://github.com/user-attachments/assets/7ccb383c-05c5-489e-be58-50b2ef17986d)

</details>

All new sprites by me.

# Explain why it's good for the game

Just overall fixes, qol and tweaks

About xm88, it is the only weapon kit in req vendor that doesn't have
its ammo in the ammo vendor, i corrected that

About external webbings, it has the same stats as hazard vests, and
overall it's literally resprite of it, added it by popular demand.

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


![dreamseeker_MZ37WeLOCV](https://github.com/user-attachments/assets/83aed7d0-42e9-41b2-ab11-588555ff0f43)


![dreamseeker_CpCiruAFLt](https://github.com/user-attachments/assets/9885c152-0612-49d0-a6ab-c8ddaaa5d44c)


![dreamseeker_Ub8rWA0uB5](https://github.com/user-attachments/assets/bd7b5041-36bc-4564-8f8d-f3a85f2c7507)


![hLotkQil5n](https://github.com/user-attachments/assets/2c6e075f-d2d5-412c-9880-bb32636e8c45)


![Fw2QAWpN7w](https://github.com/user-attachments/assets/fe6a7c40-10e8-46d8-ba9c-2dcc5a970d14)


https://github.com/user-attachments/assets/627f87d4-639f-498e-b7dc-5bc13df2aef4


![dreamseeker_ylaKHIC7Ek](https://github.com/user-attachments/assets/8ced50fb-94b9-4968-9594-7bb153131f26)


![dreamseeker_sScM1xFPkV](https://github.com/user-attachments/assets/d615f6c6-ec05-4cbd-883d-6f106bf1cfa1)



</details>


# Changelog
:cl:
add: HPDP strong and weak are now CCDP and WPDP, CCDP now has unique
packet sprite and nade sprite (no balance changes)
add: added combat flashlight box and also combat flashlight unique
sprite, tweaked desc to better convey that
add: added frag mortar shells to req asrs store
add: added qm fluff/spare items locker with some niche things
add: xm88 ammo packets and ammo box to req ammo vendor
add: added external webbings to req equipment vendor
add: added quartermaster beret to qm vendor
add: package wrapper now has more crate skins
add: metal foal grenade packets
add: req vendors now play small animation and sound, also they have
small vend delay to fit animation framing
add: added flashlight box to req vendor
add: m4a3 hp ammo boxes to asrs pool
add: HIDP, AGM-I, AGM-F grenade boxes to req vendor and asrs store
add: req clothing vendor now has different: uniforms, boots, backpacks
add: megaphone use sounds and inhands icons
add: Added flat icon support to spritesheets for boxes, ammo boxes, and
reagent containers so they display their overlays in vendors
qol: remade list in req clothing vendor
qol: lowered chance of ingridients crate to be sent by asrs
qol: qm jacket is now identical in stats and capabilities to service
jacket
balance: changed XM88 packets capacity from 90 to 100 (is it needed for
correct ammo box calculations)
balance: ASRS price of HPR holo target ammo is now the same as the
normal ammo
fix: fixed HPDP packets not being vendable by req equipment vendor
fix: fixed HPR ASRS ammo crate having incorrect sprite
fix: breaching slugs packets can now be refilled into req vendor
refactor: nade boxes icons refactor
maptweak: added some chairs, qm locker, lamp to qm's office
maptweak: added paper bins and some pens to main req area
maptweak: added some rack kits to req storage
maptweak: fixed incorrect wall smoothing near req vendor
/:cl:

---------

Co-authored-by: Drulikar <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants