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

Add Supplies Component #451

Merged
merged 11 commits into from
Sep 7, 2020
Merged

Add Supplies Component #451

merged 11 commits into from
Sep 7, 2020

Conversation

Mike-MF
Copy link
Member

@Mike-MF Mike-MF commented Aug 20, 2020 •
edited
Loading

COMPATS:
CUP Recruit Compat
AMP Breaching Charge Compat

ADDED:

  • TAC Mission Items category.
  • Supplies, Electronics & Contraband sub categories. (Relevant for items in GT Armory)
  • Theseus Launchers box.
  • Theseus Medic box.
  • Theseus Engineer box.
  • Armory Box now has an UI image.

Engineer Box: Will have an EOD Bot (on To Do list), UAV Terminal, breaching charges, demolition blocks and satchels.

Medical Box: Will automatically be an Arsenal with all relevant items.

Launchers Box: 3 of each Launcher taught on Olympus, 6x rockets for each (with exception of single-use.)

Recruit Box: 5 Suppressors for 5.56 & 5.45 and 5 AN-PVS 14 NVGS.

CHANGED:

  • Armory Box now falls under "Supplies" subcategory.
  • Medical Arsenal is only available to medics, Saline is present inside the box for regular contractors to grab.

@Mike-MF
Initial Push
b05922b 
- Added TAC - Mission Items category & relevant sub-categories.
- Added Theseus Launchers box.
- Added Theseus Medic box.
- Added Theseus Engineer box.
@Mike-MF Mike-MF added the WIP label Aug 20, 2020
@jonpas jonpas modified the milestones: 1.21.0, 1.22.0 Aug 20, 2020
jonpas
jonpas requested changes Aug 20, 2020
View reviewed changes
Mike-MF and others added 2 commits August 20, 2020 22:22
@Mike-MF
Code review
5fec787 
- Code review
- Changed Medic/Engineer inheritance.
@JoramD0
Made medical arsenal into proper function
78fff81
jonpas
jonpas requested changes Aug 27, 2020
View reviewed changes
@Mike-MF
Final Push
3d49c42 
Added:
- EditorPreviews to all boxes.
- Recruit box compat (CUP NVG/Suppressors)
- Engineer box compat (Breaching charge)
- Joram as Author

Changed:
- Converted to GVAR.
- New fancy textures for boxes.
@Mike-MF Mike-MF requested a review from jonpas August 28, 2020 01:48
@Mike-MF Mike-MF removed the WIP label Aug 28, 2020
@Mike-MF Mike-MF changed the title (WIP) Crates - Add Crates Component Supplies - Add Supplies Component Aug 28, 2020
@Mike-MF
Use EGVAR
22a9ec7 
- Compats use EGVAR.
@Mike-MF Mike-MF marked this pull request as ready for review August 28, 2020 02:06
jonpas
jonpas requested changes Aug 31, 2020
View reviewed changes
@Mike-MF @jonpas
Apply suggestions from code review
59ce8e0 
Co-authored-by: jonpas <jonpas33@gmail.com>
@Mike-MF
Remove CUP Launcher, Change RPG Ammo
40b2a12 
- Removed CUP M136
- Changed HE round to HEAT.
jonpas
jonpas requested changes Sep 7, 2020
View reviewed changes
@jonpas jonpas changed the title Supplies - Add Supplies Component Add Supplies Component Sep 7, 2020
@jonpas jonpas merged commit 1770f29 into master Sep 7, 2020
@jonpas jonpas deleted the additionalBoxes branch September 7, 2020 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonpas jonpas jonpas approved these changes

Assignees
No one assigned
Labels
feature request
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.
3 participants
@Mike-MF @jonpas @JoramD0