update clothing vendor in squad prep to hold all clothing items and use scaling. #4065
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
to use scaling and move all the clothings items of the other vendors in squad preps to it. the idea is to have vendors with a designated purpose and category of items they hold.
|
tag me on discord if you have suggestion... |
added 2 commits
July 31, 2023 16:24
and empty medikit to vendors.
add three glasses to the uniform vendor.
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
cm13-github
removed
the
Merge Conflict
missing an indentation
add an empty to force rerun of test
on github...
morrowwolf
suggested changes
Aug 6, 2023
code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
Outdated
Show resolved
Hide resolved
code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
Outdated
Show resolved
Hide resolved
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
cm13-github
removed
the
Merge Conflict
added 2 commits
August 9, 2023 14:24
… into clear_vendor_roles
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
removed
the
Merge Conflict
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
added 3 commits
August 9, 2023 21:00
|
thanks this keep getting merge conflicts.... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the pull request
The idea is to move all the clothing items to the uniform vendor.
then turn the Armaments vendor into an utilities vendor and populate it with usefull item that you can find around the ship for free...
I am also adding welding google and high capacity blowtorch are people can loot them on the ship and their is plenty of them
no reason to make people loot maintenance or department to complete their favorite loadout if those are items are widely available....
Explain why it's good for the game
It regroup all the clothing items in a single vendor to avoid have multiple vendors selling the same item and refocus the utilities vendor toward another set of items...
Testing Photographs and Procedure
Screenshots & Videos
Put screenshots and videos here with an empty line between the screenshots and the
<details>tags.Changelog
🆑
code: added welding google to the com tech tool vendor.
code: added scaling based on round population to the ColMarTech Surplus Uniform like the other vendors.
code: Move every clothing items from ColMarTech Automated Armaments Squad Vendor to ColMarTech Surplus Uniform Vendor.
code: rename ColMarTech Automated Armaments Squad Vendor to ColMarTech Automated Utilities Squad Vendor and add in tools food and other utilities.
/:cl: