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.

Sign up for GitHub

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

Jump to bottom

Fix crlf #2955

Closed
wants to merge 226 commits into from
Closed

Fix crlf #2955

wants to merge 226 commits into from

Conversation

Vonsant
Copy link
Collaborator

@Vonsant Vonsant commented Jan 26, 2025

Починка тестов

Morb0 and others added 30 commits September 21, 2024 01:26
@Morb0
AGPL v3
1a21807
@Morb0
Merge branch 'space-syndicate:master' into master
7011e9f
@Crazzy-pingvin
Lore branch (#8)
487f742 
* Add files via upload

* Delete Resources/Textures/Corvax/icon.png

* MegaLore

* Loce NukPetr
@Morb0
Revert "Lore branch (#8)" (#10)
c90af7f 
This reverts commit 487f742.
@Morb0
Merge branch 'space-syndicate:master' into master
ec9096d
@Crazzy-pingvin
Добавление лорных фракций v.2 (более корректная) (#12)
417f9dc 
* 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
@Vonsant
Merge branch 'space-syndicate:master' into master
0047169
@Vonsant
Merge branch 'space-syndicate:master' into master
270fbab
@FireNameFN
Обновить темплейт описаний к ПРам (#22)
2d88815 
* Update PULL_REQUEST_TEMPLATE.md

* Update PULL_REQUEST_TEMPLATE.md

* Update PULL_REQUEST_TEMPLATE.md
@TasiWeynad @AwareFoxy
Move discipline lock from T3 to T4 (#19)
7a6e411 
* Move discipline lock from T3 to T4

* MoveDisciplineLockToT4Proto

* Reverting Move discipline lock from T3 toT4

* Apply suggestions from code review

---------

Co-authored-by: AwareFoxy <[email protected]>
@TokenStyle @VitusVeit
@AwareFoxy @FireNameFN
Подсветка текста в фильтрах QOL (#14)
9933ab1 
* 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 <[email protected]>
Co-authored-by: AwareFoxy <[email protected]>
Co-authored-by: FN <[email protected]>
@AwareFoxy @FireNameFN
Footprints (#28)
9031a52 
* 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 <[email protected]>
@FireNameFN
Update PULL_REQUEST_TEMPLATE.md (#34)
11c317a
@FireNameFN
Добавить АПИИ (#30)
aac693d 
* First commit

* Improvements

* Fix

* Removed holo

* Edited items

* Starts and ends

* _corvaxnext

* Fix part 1

* Fix part 2
@Zekins3366
Роль бригмедика (#31)
5ad3646 
* Role Brigmedic

* Rename locale to _corvaxnext
@AwareFoxy
Merge branch 'space-syndicate:master' into master
3eeb970
@AwareFoxy
Merge branch 'space-syndicate:master' into master
2b2ee49
@AwareFoxy
brigmedic spawn roles (#36)
bd06ed9
@FireNameFN
АПИИ 2 (#38)
199dc73 
* 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
@AwareFoxy @Rxup @FireNameFN
[Feature] Система передачи из рук в руки (#29)
c396a36 
* [Feature] Система передачи из рук в руки (space-syndicate#780)

* up 1

* refactor

* Update alerts.yml

* fix popups

* Update SharedOfferItemSystem.cs

---------

Co-authored-by: Zack Backmen <[email protected]>

* 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 <[email protected]>

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

Co-authored-by: FN <[email protected]>

* Apply suggestions from code review

* vzyat

* Apply suggestions from code review

---------

Co-authored-by: Zack Backmen <[email protected]>
Co-authored-by: FN <[email protected]>
Co-authored-by: FN <[email protected]>
@FireNameFN
Revert "Добавление лорных фракций v.2 (более корректная) (#12)"
e6bbe08 
This reverts commit 417f9dc.
@Tornado-Technology
Merge pull request #40 from space-syndicate/revert-12-Lore_branch
b883f4f 
Revert "Добавление лорных фракций v.2 (более корректная)"
@ksen0morph
Update README.md (#45)
1caf015 
corrected MIT and AGPL licenses in README.md
@FireNameFN
Possible TTS fix (#46)
ae0fa71
@jailedfish @onlyfans12 @FireNameFN
shaverma (#39)
9ed74fd 
* shaverma

* fix images

* shaverma

* Update shaverma-unbaked.yml

* Update shaverma-baked.yml

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

Co-authored-by: FN <[email protected]>

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

Co-authored-by: FN <[email protected]>

* 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 <[email protected]>

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

Co-authored-by: FN <[email protected]>

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

Co-authored-by: FN <[email protected]>

* fixed Recipes

* fixed Recipes

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

Co-authored-by: FN <[email protected]>

* 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: = <[email protected]>
Co-authored-by: FN <[email protected]>
@ksen0morph
Revert "shaverma (#39)" (#48)
a3f519e 
This reverts commit 9ed74fd.
@PuroSlavKing
[Port] Operative UI Style (#55)
828bc25
@PuroSlavKing
[Tweak] Operative UI Adaptation (#61)
7c15f5d 
Bwomp
@PuroSlavKing
[Port] Advanced Body Bags (#57)
83f1c80
@PuroSlavKing
[Tweak] OfferItem Folder (#64)
3af71ea
FireNameFN and others added 16 commits January 14, 2025 19:42
@FireNameFN
Revert "Merge remote-tracking branch 'corvax/master' into Upstream5"
192848c 
This reverts commit 5e0c70b, reversing
changes made to f910609.
@FireNameFN
PDA fix
07ecbef
@FireNameFN
Merge remote-tracking branch 'next-origin/master' into Upstream5
9315850
@Vonsant
Upstream
823db62 
Upstream5
@Ko4ergaNext @Ko4ergaPunk
next map pool (#236)
4a68755 
Co-authored-by: Ko4ergaPunk <[email protected]>
@FireNameFN
Fix Corvax maps
6dfb223
@Vonsant
FixCorvaxMaps
b0eb3e7 
Fix Corvax maps
@FireNameFN
Merge remote-tracking branch 'corvax/master' into Upstream6
34ef573
@Vonsant
Upstream6
4aec70b 
Upstream6
@Ko4ergaNext @Ko4ergaPunk
fix paper (#243)
1a51a1f 
Co-authored-by: Ko4ergaPunk <[email protected]>
@kvant8
[Maps] Outpost update (#241)
3019263 
* Outpost update

* Add Surgeon

* Hot fix

---------

Co-authored-by: kvant8 <[email protected]>
@Ko4ergaNext @Ko4ergaPunk
[Maps] Bagel update #1 (#239)
31fc123 
* bagel update

* adds surgeon

* fix invalids

* here we go again

---------

Co-authored-by: Ko4ergaPunk <[email protected]>
@Ko4ergaNext
[Maps] Tushkan update #1 (#246)
fe31720 
* update

* id
@SonicHDC
Next marathon (#238)
1e9cab2 
* map

* Proto

* Update next_marathon.yml
@Aireki
[Maps] Omega update #1 (#244)
0411e0e 
* omega-update

* omega-update

* omega-update
@Vonsant
Fix CRLF
3f36373
@Vonsant
Copy link
Collaborator Author

Vonsant commented Jan 26, 2025

Wrong repo

@Vonsant Vonsant closed this Jan 26, 2025
@github-actions github-actions bot added 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 Changes: Audio labels Jan 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ko4ergaPunk Ko4ergaPunk Awaiting requested review from Ko4ergaPunk Ko4ergaPunk is a code owner

@ficcialfaint ficcialfaint Awaiting requested review from ficcialfaint ficcialfaint is a code owner

@Morb0 Morb0 Awaiting requested review from Morb0 Morb0 is a code owner

Assignees
No one assigned
Labels
Changes: Audio 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 S: Needs Review S: Untriaged size/M
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.