Upstream new-frontiers-14/frontier-station-14#23
Closed
WsWiss wants to merge 3057 commits intoAdventureTimeSS14:masterfrom
Closed
Upstream new-frontiers-14/frontier-station-14#23WsWiss wants to merge 3057 commits intoAdventureTimeSS14:masterfrom
WsWiss wants to merge 3057 commits intoAdventureTimeSS14:masterfrom
Conversation
* Geode Tweaks - Organised and filthy * updated price to 50k * tweak interior layout, update price, booze is back on the menu * wrangling github ignore my wrangling --------- Co-authored-by: dustylens <54123313+dustylens@users.noreply.github.com> Co-authored-by: Alice "Arimah" Heurlin <30327355+arimah@users.noreply.github.com>
* Increased the Ship scan speed by 3x * roll back and new values
* Crate machine: Charge market transaction fee * Crate machine: Display insufficient funds notification The market crate machine used to abort the purchase method early when it determined that the user's BankAccountComponent did not have enough spesos. This would close the UI, but not spawn a crate or emit an error sound nor message. We're still not showing a message when we determine ahead of time that the user doesn't even have a bank account. I think this is only really an issue for cyborgs. --------- Co-authored-by: Alice "Arimah" Heurlin <30327355+arimah@users.noreply.github.com>
* Remove audio alarm for high level PA. * Disable via cvar instead. * Update ParticleAcceleratorSystem.ControlBox.cs * empty lines --------- Co-authored-by: blackknight954 <40075385+blackknight954@users.noreply.github.com>
* dusty destroys frontier part 8 * AU * a valuable lesson * f... fix? * what's in a name * gold is gold * seed packet update --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Alice "Arimah" Heurlin <30327355+arimah@users.noreply.github.com>
Removes an exploit to remove DRM from a board
* Added Hotdogs * Removed unnecessary syntax * Added casings to vends for those lucky to find one * Re-removed improper syntax (How is it back-) * Added localization message in en-US * For real this time.. * Update meta.json * Remove duplicate * Update Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml Co-authored-by: Bonaout <bonaoutgneugneu@gmail.com> * Update Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml Co-authored-by: Bonaout <bonaoutgneugneu@gmail.com> * Hotdogs have been bread * Syntax updated * For realsies this time * Corrected hotdog.yml ftl name --------- Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com> Co-authored-by: Bonaout <bonaoutgneugneu@gmail.com>
Cer rifle has .20 in it's case now.
* Remove duplicate upstream chem barrels. * Edit
* Update Investigator.xml Wrong fuel type and generator, it's fixed now * Update Investigator.xml readded sidenotes with correct info
Contributor
github-actions
bot
added
UI
C#
Audio
Docs
FTL
YML
DB Migration
and removed
size/L
labels
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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
Похоже на апстрим (пока с багами, текстурок нет, но работает, запускается, а я уже вырубаюсь)
Почему / Баланс
Ссылка на заказ, предложение или баг-репорт
Всё во имя работки
Чейнджлог
no cl, no fun