Upstream merge 39 #526
Merged
Upstream merge 39 #526
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
* DB texture on back changed * cheese * test * CR20 Syndie Sling * NT slings implemented * finished SMGS, starting on Laser Weapons * added more laser slings * laser weapons done * small changes to laser weapons and pie cannon slings * added chinalake and l6 slings * finished launcher catagory, almost finished rifle catagory * almost done, just missing the heavy sniper * Replaced L6, Chinalake and Heavy Sniper resprite because my old heavy sling was ugly af * all slings done * added copyright to the .meta files * Revert "cheese" This reverts commit a1f7ac7. * fixed sln file, in theory at least
* Add cotton plant * Adddescription and tag to cotton bal allow moth eat it * Fix typo. Add cotton seed into MegaSeed * Fix typo * Fix typo * Fix cottonbol component typo * Fix the amount of cotton that bol gives * Adding correct component to make cotton bol edible * Change cotton bol parent to see if it is edible * Adding flavor to cotton bol, and fix typo * Replace image * fixing plant image position * Increase the Megaseed restock crate price to avoid money farming loop hole
* Remove bad substitutions from dwarf accent As per discussion in https://discord.com/channels/310555209753690112/1170959598153375815 These phrases are common pain-points and often don't make gramatical sense in most conversation I feel accents (especially ones tied to species) should favour intelligibility over flavour where the trade-off arises * Remove duplicate entry in dwarven accent For -> fer already exists at accent-dwarf-words-82
…pace-wizards#21547) * Remove bad substitutions from dwarf accent As per discussion in https://discord.com/channels/310555209753690112/1170959598153375815 These phrases are common pain-points and often don't make gramatical sense in most conversation I feel accents (especially ones tied to species) should favour intelligibility over flavour where the trade-off arises * Remove duplicate entry in dwarven accent For -> fer already exists at accent-dwarf-words-82 * Revert removal of Hey -> Oye, opting for Hey -> Oi instead * Revert removal of Hey -> Oye, opting for Hey -> Oi instead
* Oh well * Minor fixing up * HOLY BINGLE I DID IT * TOGGLE!
* Update animals.yml * Update * ANOTHER UPDATE change mobcat meleeweapon from brute to piercing, deleting extra lines * oops * Update npc.yml * Update npc.yml * Update animals.yml
* boirg stuff * gaming * modules shits * mini welder is too lmao * pro * cheaper recipes, fix mob state thresholds, remove silly crayon, rename module * generic borg 6 module * literacy module shityourself
* Add dead states to borgs * this? * ack
Generators were discharged in the admin arena,
* Cat cake. A small update. * up1 * up2
…t state through UpdateMobStateEvent (space-wizards#21741)
Co-authored-by: DrSmugleaf <[email protected]>
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…on-14 into upstream-merge-39
DexlerXD
approved these changes
Nov 25, 2023
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.
Описание PR
Мерж обновлений от оффов
Медиа
Проверки
Изменения
cl от оффов