Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Less bsh cost #2838

Closed

Conversation

Tornado-Technology
Copy link
Contributor

No description provided.

Morb0 and others added 30 commits September 21, 2024 01:26
* Add files via upload

* Delete Resources/Textures/Corvax/icon.png

* MegaLore

* Loce NukPetr
* Add files via upload

* Delete Resources/Textures/Corvax/icon.png

* MegaLore

* Loce NukPetr

* RepairLore

* RepairLore_v2

* RepairLore_v3

* RepairLore_v4

* RepairLore_v5

* RepairLore_v5.1

* RepairLore_v5.2

* RepairLore_v5.3

* RepairLore_v5.6

* RepairLore_v5.7

* RepairLore_v5.8

* RepairLore_v5.8

* RepairLore_v5.9

* RepairLore_v5.9

* RepairLore_v5.9

* RepairLore_v5.9

* RepairLore_v5.9

* RepairLore_v5.9

* RepairLore_v5.9

* RepairLore_v5.9

* RepairLore_v5.9

* RepairLore_v5.9

* RepairLore_v5.9

* RepairLore_v5.9

* RepairLore_v5.9

* RepairLore_v5.9

* RepairLore_v5.9

* RepairLore_v5.9

* RepairLore_v5.9

* RepairLore_v6

* RepairLore_v6

* RepairLore_v6

* RepairLore_v6

* RepairLore_v6

* RepairLore_v6

* RepairLore_v6

* RepairLore_v6

* RepairLore_v6

* RepairLore_v6

* RepairLore_v6

* RepairLore_v7

* RepairLore_v7

* RepairLore_v7

* RepairLore_v7

* RepairLore_v7

* RepairLore_v8

* RepairLore_v8

* RepairLore_v8

* RepairLore_v8

* RepairLore_v8

* RepairLore_v8

* RepairLore_v8

* RepairPetr_v1

* EndPetrNuk

* WLBelts
* Update PULL_REQUEST_TEMPLATE.md

* Update PULL_REQUEST_TEMPLATE.md

* Update PULL_REQUEST_TEMPLATE.md
* Move discipline lock from T3 to T4

* MoveDisciplineLockToT4Proto

* Reverting Move discipline lock from T3 toT4

* Apply suggestions from code review

---------

Co-authored-by: AwareFoxy <135021509+AwareFoxy@users.noreply.github.com>
* Add basic chat highlighting

* Add saving of highlighted words

* Fix highlights not loading properly

* Major refactor

* highlights ftl, autofil, placeholders etc
highlight full word only
background to TextEdit

* fix conflicts

* text highlight russian localization

* corvax fixes

* russian localization

* Next adaptation

---------

Co-authored-by: VitusVeit <VitoPigno@gmail.com>
Co-authored-by: AwareFoxy <135021509+AwareFoxy@users.noreply.github.com>
Co-authored-by: FN <firenamefn@gmail.com>
* footprints

* blyat errorki

* errors fixes 2

* oops

* rename

* error fixes

* Renames

* Case files

* fix

* another one

* Fixes

* Apply suggestions from code review

---------

Co-authored-by: FN <firenamefn@gmail.com>
* First commit

* Improvements

* Fix

* Removed holo

* Edited items

* Starts and ends

* _corvaxnext

* Fix part 1

* Fix part 2
* Role Brigmedic

* Rename locale to _corvaxnext
* First commit

* Improvements

* Fix

* Removed holo

* Edited items

* Starts and ends

* _corvaxnext

* Fix part 1

* Fix part 2

* Ftl fix

* Added greeting

* Attribution

* ApiRule

* Reverted ThiefRule

* EndRound improvements

* Revert ThiefRuleSystem again

* .ftl changes
* [Feature] Система передачи из рук в руки (space-syndicate#780)

* up 1

* refactor

* Update alerts.yml

* fix popups

* Update SharedOfferItemSystem.cs

---------

Co-authored-by: Zack Backmen <backmen@bk.ru>

* sledi

* fixim govno

* Fixes

* Last fix

* apply suggestionges frome code reviewere

* icon locale

* rename + remove THE

* fix1

* fix 2

* fix linter

* Update Resources/Locale/ru-RU/alerts/alerts.ftl

* Update Resources/Locale/ru-RU/alerts/alerts.ftl

Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>

* Update Resources/Locale/ru-RU/alerts/alerts.ftl

Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>

* Apply suggestions from code review

* vzyat

* Apply suggestions from code review

---------

Co-authored-by: Zack Backmen <backmen@bk.ru>
Co-authored-by: FN <firenamefn@gmail.com>
Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>
Revert "Добавление лорных фракций v.2 (более корректная)"
corrected MIT and AGPL licenses in README.md
* shaverma

* fix images

* shaverma

* Update shaverma-unbaked.yml

* Update shaverma-baked.yml

* Update Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>

* Update Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>

* Update shaverma-baked.yml

* License updates

* Localisation?

* Localisation

* undo  something

* some codestyle fixes

* some codestyle fixes

* Discard changes to Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

* some codestyle fixes

* Delete Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma-unbaked.ftl

* Fix meta.json

* Update Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl

Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>

* Update Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl

Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>

* Update Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json

Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>

* fixed Recipes

* fixed Recipes

* Update Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json

Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>

* fixed Recipes... again

* pita texture

* moved locales

* moved locales

* no nl on end message removed

* removed pita.rsi

* fix

* Create meta.json

* Revert "Create meta.json"

This reverts commit 12b822c.

* пофиксил отступы

---------

Co-authored-by: = <support@onlyfans.com>
Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>
AwareFoxy and others added 13 commits December 6, 2024 03:05
* first

* fix govna

* forgot about using FUCK
* Sec always watching

* Убран статус "Подозревается"

* Wanted and Detained
* first

* fix

* fix

* Apply suggestions from code review

Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>

* fix

* Apply suggestions from code review

* fix

---------

Co-authored-by: AwareFoxy <135021509+AwareFoxy@users.noreply.github.com>
Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>
* Fix

* Delete Resources/Prototypes/_CorvaxNext/Catalog/uplink-catalog.yml

* lol
* Added artificial bluespace crystals

* Added transitor

* Updated locale & minor fixes

* Xddd

* Update Content.Client/_CorvaxNext/BluespaceHarvester/BluespaceHarvesterMenu.xaml.cs

Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>

* Update Resources/Prototypes/_CorvaxNext/Entities/Structures/Power/substations.yml

Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>

* Update Content.Server/_CorvaxNext/BluespaceHarvester/BluespaceHarvesterSystem.cs

Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>

* Rename reseted to reset

* Separated map count

* Update BluespaceHarvesterSystem.cs

---------

Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>
@Tornado-Technology Tornado-Technology deleted the less-bsh-cost branch December 9, 2024 12:48
@github-actions github-actions bot added S: Needs Review S: Untriaged size/L Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Shaders and removed S: Untriaged S: Needs Review size/L labels Dec 9, 2024
@Tornado-Technology Tornado-Technology restored the less-bsh-cost branch December 9, 2024 12:48
@Tornado-Technology Tornado-Technology deleted the less-bsh-cost branch December 9, 2024 12:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping Changes: Shaders Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design
Projects
None yet
Development

Successfully merging this pull request may close these issues.