Апстрём плюс фиксики #7
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
* Adds silk clothing for arachnids Adds silk clothing for arachnids * Remove equipped-NECK-line.png from web poncho * Create web_neck_clothing.yml * Removes neck slot from entity yml slot: neck was throwing an error. Removing the slot and basing on the parent of clothingneckbase worked in testing. Let's give it a try. * Requested changes as requested Adjusted entity names for consistency with Frontier standards. Adjusted sprite folder names for consistency with Frontier standards. Addressed floating pixels with hand held sprites. Adjusted hand held sprites to ensure proper sizing. * "classic web poncho" consistency --------- Co-authored-by: Whatstone <[email protected]> Co-authored-by: Dvir <[email protected]>
* Fix price * Use dynamic price
* Fixup * All button: add as much as you can * MarketSystem: better comments * disable market purchase button on empty cart * MarketMenu: set PurchaseCart disabled after SetUi * Push existingCart into branch it's used in --------- Co-authored-by: Whatstone <[email protected]>
…1801) * Give parrots the ability to repeat learned phrases * ParrotNF entity, merge with neck item, add crate * parrot cage: remove suffix --------- Co-authored-by: Whatstone <[email protected]>
* Delete Resources/Maps/_NF/Shuttles/Expedition/praeda.yml Removing the Praeda * Delete Resources/Prototypes/_NF/Shipyard/Expedition/praeda.yml Removing the prototype for the Praeda
* initial * linking * finish up spawning * first few conversion * to list * linq correction * full conversion * NfAdventureRuleSystem suggestions * no linq, prefer shuffle to pickandtake * AdventureRuleComponent: remove unused vars * Update Resources/Prototypes/_NF/PointsOfInterest/cove.yml Co-authored-by: Whatstone <[email protected]> * Update Resources/Prototypes/_NF/PointsOfInterest/omnichurch.yml Co-authored-by: Whatstone <[email protected]> * Update Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs Co-authored-by: Whatstone <[email protected]> * Update Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs Co-authored-by: Whatstone <[email protected]> * Update Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs Co-authored-by: Whatstone <[email protected]> * min/max range * PirateFrontierOutpost->SpawnableFrontierOutpost * AdventureRuleComponent: restore members * on round started game rule event * Resolve merge conflicts for AdventureRuleComponent * NfAdventureRuleSystem: cleanup * Actually rotate Trade Depot * Update Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs Co-authored-by: Whatstone <[email protected]> * alternative depot and lab * lighter shade of brown to stand out better on radar * cargodepotalt: add CargoMarketData component * Fixup * Mybad * Random POI rotation, append letters to cargo depot --------- Co-authored-by: Whatstone <[email protected]> Co-authored-by: Dvir <[email protected]> Co-authored-by: Whatstone <[email protected]> Co-authored-by: Dvir <[email protected]>
* Add missing ActionToggle prototypes * Fix NoRot having a Rot * Remove action toggles * DevMap: restore magboots, invalid transit uid chks --------- Co-authored-by: Whatstone <[email protected]>
…ntiers-14#1823) * Add ResultCount to MicrowaveMealRecipePrototype * Add new 'Raisins' reagent * Rename chocolate chips bag to cocoa powder bag * Update cookie recipes, add raisin recipe * Update cak recipe * Increase raisin requirement * Make raisins recognizable * Decapitalise raisins * raisin->raisins, Frontier comments --------- Co-authored-by: Whatstone <[email protected]>
* Update dev_map.yml * Update dev_map.yml * PublicTransitSystem: use priority dock tag * bolt down the bus jukebox * Update publicts.yml * Update PublicTransitSystem.cs --------- Co-authored-by: Whatstone <[email protected]>
* PacifiedZone * PacifiedlZoneGeneratorSystem.cs->PacifiedZone... * Keep track of naturally pacified entities * Comment cleanup * PacifiedZone * Update pacified_zone.yml * Update pacified_zone.yml * PacifiedZone: handle only non-pacified entities * NetEntity->EntityUid (running locally on server) * NextUpdate: not a DataField * PacifiedZone: override alert * fix meta Clarification of the meta at the author's request. * Whatstone fixup for hairballs * Added zones --------- Co-authored-by: Whatstone <[email protected]> Co-authored-by: Dvir <[email protected]> Co-authored-by: Dvir <[email protected]>
github-actions
bot
added
FTL
C#
UI
Map-Dungeon
Map-Outpost
Map-Shuttle
Map-POI
Sprites
labels
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.
Всякое разное