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

Requisitons additions #6694

Merged
merged 36 commits into from
Aug 22, 2024
Merged

Requisitons additions #6694

merged 36 commits into from
Aug 22, 2024

Conversation

Blundir
Copy link
Contributor

@Blundir Blundir commented Jul 12, 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:

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 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.

dreamseeker_8HqT2gQSUK.mp4

Fixed incorrect wall smoothing near req vendors.

Before

StrongDMM_IGQg7eUei3

After
dreamseeker_ZwOp8phFgu

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

Screenshots & Videos

dreamseeker_MZ37WeLOCV

dreamseeker_CpCiruAFLt

dreamseeker_Ub8rWA0uB5

hLotkQil5n

Fw2QAWpN7w

dreamseeker_vrHglVFCbs.mp4

dreamseeker_ylaKHIC7Ek

dreamseeker_sScM1xFPkV

Changelog

🆑
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:

@Blundir Blundir requested a review from Nanu308 as a code owner July 12, 2024 13:51
@github-actions github-actions bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? Feature Feature coder badge Quality of Life Make the game harder to play Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Fix Fix one bug, make ten more Refactor Make the code harder to read labels Jul 12, 2024
@Git-Nivrak
Copy link
Contributor

add: added all spec weapons to req asrs store
Why?

@Git-Nivrak
Copy link
Contributor

Git-Nivrak commented Jul 12, 2024

Also your branch might revert the recent maplint stuff to almayer

@Blundir
Copy link
Contributor Author

Blundir commented Jul 12, 2024

add: added all spec weapons to req asrs store Why?

Dumbass specs without mh have a tendency to lose them and handicap themsevles, also specs can get undressed while healing, and lose it that way, happenened a bunch of times.

@Blundir
Copy link
Contributor Author

Blundir commented Jul 12, 2024

Also your branch might revert the recent maplint stuff to almayer

DMM merge conflict resolver hates me

@github-actions github-actions bot added the Sound Blast 5 minutes of bass boosted music to our players label Jul 12, 2024
@TheManWithNoHands
Copy link
Contributor

I love you

@Red-byte3D
Copy link
Contributor

add: added all spec weapons to req asrs store Why?

Dumbass specs without mh have a tendency to lose them and handicap themsevles, also specs can get undressed while healing, and lose it that way, happenened a bunch of times.

yeah whats exactly the problem with this? bad teammates, bad gameplay should be punishing

@Blundir
Copy link
Contributor Author

Blundir commented Jul 14, 2024

add: added all spec weapons to req asrs store Why?

Dumbass specs without mh have a tendency to lose them and handicap themsevles, also specs can get undressed while healing, and lose it that way, happenened a bunch of times.

yeah whats exactly the problem with this? bad teammates, bad gameplay should be punishing

SG kits are already available at ASRS for that, despite problem with sg being less common, i simply extended that to spec.
Having spec weapons in ASRS doesn't mean the situation isn't punishing, paying 8k$ because of an idiot without mh is already painful, just not painful as demoting spec into rifleman.

@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 Jul 18, 2024
@cm13-github
Copy link
Contributor

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

@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 Aug 6, 2024
@cm13-github
Copy link
Contributor

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

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

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

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

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

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

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

@harryob harryob added the Sprites Approved confirmed no stray pixels label Aug 22, 2024
@harryob harryob added this pull request to the merge queue Aug 22, 2024
Merged via the queue into cmss13-devs:master with commit a502538 Aug 22, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Aug 22, 2024
@Blundir Blundir deleted the req_fixes branch August 23, 2024 21:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Feature Feature coder badge Fix Fix one bug, make ten more Mapping did you remember to save in tgm format? Quality of Life Make the game harder to play Refactor Make the code harder to read Sound Blast 5 minutes of bass boosted music to our players Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants