Add some extra descs for leg clothing #49218
Merged
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
Currently, .travis.yml has a 'development' branch specified as one to run tests for; the current equivalent is the 0.F-dev branch.
* Moved mine_entrance OMT from the list of hardcoded locations to industial locations Also removed mine_shaft OMT and replaced it with mine_shaft_middle and mine_shaft_lower OMTs. Also added mine_entrance_roof OMT. * Added mine_entrance and mine_shaft to the list of obsoleted terrains * Added a zombie miner and its death drops * Created a json-version of mine entrance and its roof * Created a json-version of mine shaft (middle and lower variants) * Changed overmap special definition of a mine to include new json chunks * Applied migration of hardcoded mine_entrance and mine_shaft OMTs to new json variants * Made hardcoded mine chunks generate to the west of lower section of new mine shaft OMT Also removed mine_entrance and mine_shaft from the list of hardocoded mapgen. * Completely removed build_mine_room function as all mine rooms are now defined in json Also removed hardcoded generation of mine entrance and mine shaft. * Removed mentions of mine rooms from mapgen.h * Updated alt_map_key mod * Updated graphical overmap mod * Added missing harvest * Appease clang and constify * Quickfix * Appease clang one more time
(Getting 0.F-dev working with Travis appears to require additional settings by someone with permissions.) This change enables both pushes and pull requests of 0.F-dev to get checked by the General Matrix. As it is, if one bases a PR off of 0.F-dev, it doesn't get checked by Github.
* Added mine_materials item group * Added Trolley vehicle * Expanded and tweaked above-ground and underground levels of mine entrance
ZhilkinSerg
requested review from
BrettDong,
I-am-Erk,
John-Candlebury,
KorGgenT,
Maleclypse and
Mom-Bun
as code owners
ZhilkinSerg
removed request for
John-Candlebury,
BrettDong,
KorGgenT,
Fris0uman,
Mom-Bun,
I-am-Erk and
Maleclypse
ZhilkinSerg
pushed a commit
that referenced
this pull request
Jun 14, 2021
ZhilkinSerg
pushed a commit
that referenced
this pull request
Jun 14, 2021
ZhilkinSerg
pushed a commit
that referenced
this pull request
Jun 21, 2021
ZhilkinSerg
pushed a commit
that referenced
this pull request
Jul 3, 2021
anothersimulacrum
pushed a commit
to anothersimulacrum/Cataclysm-DDA
that referenced
this pull request
Jul 3, 2021
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.
Summary
Content "Snippets for 3 pants items"
Purpose of change
To give some surface-level variation to common items.
Describe the solution
A simple aesthetic change. Added snippets categories to
jeansdenim_shorts&army_pants.Describe alternatives you've considered
I had a idea to ask for a bunch of descriptions on Discord or Reddit and add the best 3-5 for each item. I did not want to make new social-media accounts though for various reasons but am open to another doing the same thing.
Testing
style-json'd and loaded game. went in to the item list and clicked through the new descriptions for all new items. Everything seems to be in order.
Additional context
I know some of these are not good so i am very open to criticism here. If we do not want to add many of these that is fine, I think the military pants are the strongest of the bunch though..
Edit: I think this will finally work. My repo was/is a mess and i was afraid of wiping my pending pulls. Sorry for all that.