CIC Vendor Expansion (Part 2) #6301

SpypigDev · 2024-05-17T09:49:24Z

About The Pull Request

Follow up PR to #4707. Aims to expand XO vendors to bring them up to date with modern combat meta, as well as clean up my SO vendor update in the process.

Added gear specializations to the XO weapons vendor, offering the essentials set of either a Medic or Engineer
Adds a Magharn to rail attachments section in the XO weapons vendor
Expanded belt/pouch options in the XO weapons vendor
Added the 'other gear' section in the XO vendor, with various combat supplies

Misc.

Fixed XO/SO vendor code so that selecting the autoinjector pouch gives you a full one, rather than empty
~~Increased XO policing skillset from 1, to 2, so they can actually use the MP belt they are offered~~ (Already done in Increases XO Police skill by 1 #6781 )
Unified the SO armory vendor code into the regular SO vendor file, rather than having two seperate

Explain why it's good for the game

The XO gear vendors have sat untouched in the code for quite some time, and have been left to fall behind the quickly changing meta of CM. With a more updated selection of modern gear, XOs will no longer be significantly out-geared by their Staff Officers when it comes to organizing their combat kits, especially during hijack.

XOs will be brought up to par with the gear diversity that SOs have enjoyed for some months now.

Testing Photographs and Procedure

Select photos of the updated XO vendor menus, where changes have been made

Changelog

🆑
refactor: SO armory vendor code refactored into the main SO gear vendor code
balance: XO weapon and clothing vendors fitted with a more modernized equipment set
balance: XO weapon vendor now offers Medic or Engineer essentials sets
fix: Vending an autoinjector pouch as SO or XO now produces a full pouch, rather than empty
balance: SO's mod88 removed from cryo spawn and moved to their vendor instead
/:cl:

github-actions · 2024-05-25T01:03:31Z

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

Nanu308

mapping itself is fine

maps/map_files/USS_Almayer/USS_Almayer.dmm

github-actions · 2024-06-07T01:08:33Z

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

Drulikar · 2024-06-12T02:57:37Z

Stale exempt until it can be balance/code reviewed. Sorry just a lot going on right now.

SpypigDev · 2024-06-15T07:10:11Z

Stale exempt until it can be balance/code reviewed. Sorry just a lot going on right now.

No worries, take your time

cm13-github · 2024-07-09T23:46:04Z

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

SpypigDev · 2024-07-10T08:41:10Z

Guessing this is an issue with #6496 not using the refactored code. Will fix shortly

into vendor-expansion

…ev/ComTweak into vendor-expansion" This reverts commit 5bc3e43, reversing changes made to 1a0348d.

…Dev/ComTweak into vendor-expansion" This reverts commit 5b88401.

SpypigDev · 2024-07-15T06:26:30Z

Sorry, that was stupid. Fixed the issue

cm13-github · 2024-07-19T03:26:48Z

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

Drulikar

Feel free to undraft when you're happy with the vendor contents. If both are going to have essential kits, likely their vendors should be very similar just minus anything XO might get in their other vendor.

Drulikar

Mentioned in DMs:

Consider adding /obj/item/storage/belt/gun/utility/full to XO since SO is offered it.
Consider adding /obj/item/attachable/bayonet to XO since SO is offered it.
Consider removing /obj/item/storage/belt/gun/m4a3/mod88 from SO cryo spawn to instead offer it with with their other pistol belt options in their vendor.

deathrobotpunch · 2024-07-24T05:06:04Z

one thing I would like to see is a flash added to the SO vendor like every other head of staff.

github-actions · 2024-08-01T01:05:45Z

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

code/game/machinery/vending/vendor_types/crew/senior_officers.dm

code/game/machinery/vending/vendor_types/crew/staff_officer.dm

SpypigDev added 5 commits May 17, 2024 15:18

Cleaned up my old SO armory code

50f693a

Minor change to SO vendor contents

ebcf5a9

Expanded XO vendor, with kit specializations

f158f28

XO Skill Tweak

5d960eb

Bug Fix

1a0348d

SpypigDev requested a review from Nanu308 as a code owner May 17, 2024 09:49

github-actions bot added Mapping did you remember to save in tgm format? Refactor Make the code harder to read Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Fix Fix one bug, make ten more labels May 17, 2024

github-actions bot added the Stale beg a maintainer to review your PR label May 25, 2024

Drulikar removed the Stale beg a maintainer to review your PR label May 30, 2024

Nanu308 reviewed May 30, 2024

View reviewed changes

maps/map_files/USS_Almayer/USS_Almayer.dmm Outdated Show resolved Hide resolved

Nanu308 added the Mapping Approved adds 500 new dict keys label May 30, 2024

github-actions bot added the Stale beg a maintainer to review your PR label Jun 7, 2024

Drulikar added Stale Exempt PR can't go stale and removed Stale beg a maintainer to review your PR labels Jun 12, 2024

cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jul 9, 2024

SpypigDev closed this Jul 15, 2024

SpypigDev force-pushed the vendor-expansion branch from 1a0348d to 90a6fdd Compare July 15, 2024 06:18

SpypigDev added 3 commits July 15, 2024 16:19

Merge branch 'vendor-expansion' of https://github.com/SpypigDev/ComTweak

5bc3e43

into vendor-expansion

Revert "Merge branch 'vendor-expansion' of https://github.com/SpypigD…

5b88401

…ev/ComTweak into vendor-expansion" This reverts commit 5bc3e43, reversing changes made to 1a0348d.

Reapply "Merge branch 'vendor-expansion' of https://github.com/Spypig…

d95dfb6

…Dev/ComTweak into vendor-expansion" This reverts commit 5b88401.

SpypigDev added 2 commits July 19, 2024 14:21

Removed docu pouch from SO vend

563866d

Minor SO vendor tweaks

bf8fdec

Drulikar requested changes Jul 19, 2024

View reviewed changes

Drulikar marked this pull request as draft July 19, 2024 05:16

SpypigDev added 2 commits July 19, 2024 17:43

Touchups to XO and SO vendor contents

f673e30

Sorted XO clothing options a little better

84b80ea

SpypigDev marked this pull request as ready for review July 19, 2024 07:54

Drulikar requested changes Jul 19, 2024

View reviewed changes

Drulikar added Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. and removed Stale Exempt PR can't go stale labels Jul 19, 2024

Drulikar marked this pull request as draft July 19, 2024 21:07

Drulikar mentioned this pull request Jul 23, 2024

Increases XO Police skill by 1 #6781

Merged

github-actions bot added the Stale beg a maintainer to review your PR label Aug 1, 2024

SpypigDev added 2 commits August 3, 2024 00:00

Applied suggestions

51c9a5c

Mod88 re-added to SO vendor

5116b68

Drulikar removed the Stale beg a maintainer to review your PR label Aug 3, 2024

Drulikar approved these changes Aug 3, 2024

View reviewed changes

Drulikar marked this pull request as ready for review August 3, 2024 04:34

Merge branch 'master' into vendor-expansion

29a2968

Drulikar approved these changes Aug 3, 2024

View reviewed changes

code/game/machinery/vending/vendor_types/crew/senior_officers.dm Outdated Show resolved Hide resolved

code/game/machinery/vending/vendor_types/crew/staff_officer.dm Outdated Show resolved Hide resolved

Add mention of (Full) to some belts

9a82913

Drulikar enabled auto-merge August 3, 2024 04:43

Drulikar added this pull request to the merge queue Aug 3, 2024

Merged via the queue into cmss13-devs:master with commit 3ffcf5e Aug 3, 2024
27 checks passed

cm13-github added a commit that referenced this pull request Aug 3, 2024

Automatic changelog for PR #6301 [ci skip]

1beda3b

SpypigDev deleted the vendor-expansion branch August 3, 2024 05:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CIC Vendor Expansion (Part 2) #6301

CIC Vendor Expansion (Part 2) #6301

SpypigDev commented May 17, 2024 •

edited by Drulikar

Loading

github-actions bot commented May 25, 2024

Nanu308 left a comment

github-actions bot commented Jun 7, 2024

Drulikar commented Jun 12, 2024

SpypigDev commented Jun 15, 2024

cm13-github commented Jul 9, 2024

SpypigDev commented Jul 10, 2024

SpypigDev commented Jul 15, 2024

cm13-github commented Jul 19, 2024

Drulikar left a comment

Drulikar left a comment

deathrobotpunch commented Jul 24, 2024

github-actions bot commented Aug 1, 2024

CIC Vendor Expansion (Part 2) #6301

CIC Vendor Expansion (Part 2) #6301

Conversation

SpypigDev commented May 17, 2024 • edited by Drulikar Loading

About The Pull Request

Explain why it's good for the game

Testing Photographs and Procedure

Changelog

github-actions bot commented May 25, 2024

Nanu308 left a comment

Choose a reason for hiding this comment

github-actions bot commented Jun 7, 2024

Drulikar commented Jun 12, 2024

SpypigDev commented Jun 15, 2024

cm13-github commented Jul 9, 2024

SpypigDev commented Jul 10, 2024

SpypigDev commented Jul 15, 2024

cm13-github commented Jul 19, 2024

Drulikar left a comment

Choose a reason for hiding this comment

Drulikar left a comment

Choose a reason for hiding this comment

deathrobotpunch commented Jul 24, 2024

github-actions bot commented Aug 1, 2024

SpypigDev commented May 17, 2024 •

edited by Drulikar

Loading