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

command turtlenecks | corrected PR #2306

Merged
merged 21 commits into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
86f0438
finishing
Deenkaide Jun 18, 2024
8186547
Перекрасы по замечаниям
Deenkaide Jun 18, 2024
7e1ddee
Замена как в водолазке НР + версия мартышке
Deenkaide Jun 18, 2024
4a9185a
Изменение золота
Deenkaide Jun 19, 2024
a2409fb
Мартышки в водолазках
Deenkaide Jun 19, 2024
80da470
Исправления одного оттенка
Deenkaide Jun 19, 2024
c484080
Исправление ГП и обезьянки для других водолазок
Deenkaide Jun 19, 2024
788c574
Изменение юбки в руках и попытка решить конфликты
Deenkaide Jun 20, 2024
98546e2
Пропустил немного
Deenkaide Jun 20, 2024
88520fd
фикс мартышек и водолазки ГСБ
Deenkaide Jun 20, 2024
313caf9
фикс лодаута
Deenkaide Jun 20, 2024
d6afaf3
Точки?
Deenkaide Jun 20, 2024
41e927d
пробелы
Deenkaide Jun 20, 2024
9b6e4a7
suit а не skirt...
Deenkaide Jun 20, 2024
33b741f
может так?
Deenkaide Jun 20, 2024
d91203e
Да что с этими C не так!!!!
Deenkaide Jun 20, 2024
64f6ae2
снова C
Deenkaide Jun 20, 2024
d6dee0e
одежда в принтере
Deenkaide Jun 21, 2024
426ea03
Возвращение золота и немного исправил перевод
Deenkaide Jun 21, 2024
f79c98d
Merge branch 'master' into бэкап
lzk228 Jun 21, 2024
96fb09a
сказали свыше
Deenkaide Jun 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ ent-ClothingUniformJumpskirtPsychologist = юбка-костюм психоло
.desc = Я не теряю вещи. Я кладу вещи в места, которые потом ускользают от меня.
ent-ClothingUniformJumpskirtSchool = школьная юбка
.desc = Стильная и удобная школьная юбка.
ent-ClothingUniformJumpskirtCapTurtleneck = captain's turtleneck
.desc = True captain's turtleneck.
ent-ClothingUniformJumpskirtHoPTurtleneck = head's of personal turtleneck
.desc = Turtleneck of papers god.
ent-ClothingUniformJumpskirtHoSBlack = head's of security black skirt
.desc = Main villain's skirt.
ent-ClothingUniformJumpskirtRDFormal = research director's formal skirt
.desc = Evil genius skirt.
ent-ClothingUniformJumpskirtCapTurtleneck = юбка-водолазка капитана
.desc = Это водолазка с юбкой настоящего капитана.
ent-ClothingUniformJumpskirtHoPTurtleneck = юбка-водолазка главы персонала
.desc = Это водолазка с юбкой главы персонала.
ent-ClothingUniformJumpskirtHoSBlack = чёрная юбка-комбинезон главы службы безопасности
.desc = Это чёрный костюм с юбкой главы службы безопасности.
ent-ClothingUniformJumpskirtRDClassical = классическая юбка-костюм научного руководителя
.desc = Это классический костюм с юбкой научного руководителя.
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ ent-ClothingUniformJumpsuitCentcomOfficerBlack = униформа офицера
.desc = Чёрная униформа Офицера Специальных Операций, ничего такого. Хотя... Если у вас есть время читать это, то уже поздно...
ent-ClothingUniformJumpsuitCentcomAdmiral = униформа адмирала
.desc = Униформа, которую носят офицеры в звании адмирала флота Nanotrasen.
ent-ClothingUniformJumpsuitCapTurtleneck = captain's turtleneck
.desc = True captain's turtleneck.
ent-ClothingUniformJumpsuitHoPTurtleneck = head's of personal turtleneck
.desc = Turtleneck of papers god.
ent-ClothingUniformJumpsuitHoSBlack = head's of security black suit
.desc = Main villain's suit.
ent-ClothingUniformJumpsuitRDFormal = research director's formal suit
.desc = Evil genius suit.
ent-ClothingUniformJumpsuitCapTurtleneck = водолазка капитана
.desc = Это водолазка настоящего капитана.
ent-ClothingUniformJumpsuitHoPTurtleneck = водолазка главы персонала
.desc = Это водолазка главы персонала.
ent-ClothingUniformJumpsuitHoSBlack = чёрный комбинезон главы службы безопасности
.desc = Это чёрный костюм главы службы безопасности.
ent-ClothingUniformJumpsuitRDClassical = классический костюм научного руководителя
.desc = Это классический костюм научного руководителя.
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpskirtHoPTurtleneck
name: head's of personal turtleneck
description: Turtleneck of papers god.
name: head of personal's turtleneck
description: It's Head of Personal's turtleneck.
components:
- type: Sprite
sprite: Corvax/Clothing/Uniforms/Jumpskirt/hop_turtleneck.rsi
Expand All @@ -90,8 +90,8 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpskirtHoSBlack
name: head's of security black skirt
description: Main villain's skirt.
name: head of security's black skirt
description: It's Head of Security's black skirt.
components:
- type: Sprite
sprite: Corvax/Clothing/Uniforms/Jumpskirt/hos_black.rsi
Expand All @@ -100,11 +100,11 @@

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpskirtRDFormal
name: research director's formal skirt
description: Evil genius skirt.
id: ClothingUniformJumpskirtRDClassical
name: research director's classical skirt
description: It's Research Director's classical skirt.
components:
- type: Sprite
sprite: Corvax/Clothing/Uniforms/Jumpskirt/rd_formal.rsi
sprite: Corvax/Clothing/Uniforms/Jumpskirt/rd_classical.rsi
- type: Clothing
sprite: Corvax/Clothing/Uniforms/Jumpskirt/rd_formal.rsi
sprite: Corvax/Clothing/Uniforms/Jumpskirt/rd_classical.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitHoPTurtleneck
name: head's of personal turtleneck
description: Turtleneck of papers god.
name: head of personal's turtleneck
description: It's Head of Personal's turtleneck.
components:
- type: Sprite
sprite: Corvax/Clothing/Uniforms/Jumpsuit/hop_turtleneck.rsi
Expand All @@ -67,8 +67,8 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitHoSBlack
name: head's of security black suit
description: Main villain's suit.
name: head of security's black suit
description: It's Head of Security's black suit.
components:
- type: Sprite
sprite: Corvax/Clothing/Uniforms/Jumpsuit/hos_black.rsi
Expand All @@ -77,11 +77,11 @@

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitRDFormal
name: research director's formal suit
description: Evil genius suit.
id: ClothingUniformJumpsuitRDClassical
name: research director's classical suit
description: It's Research Director's сlassical suit.
components:
- type: Sprite
sprite: Corvax/Clothing/Uniforms/Jumpsuit/rd_formal.rsi
sprite: Corvax/Clothing/Uniforms/Jumpsuit/rd_classical.rsi
- type: Clothing
sprite: Corvax/Clothing/Uniforms/Jumpsuit/rd_formal.rsi
sprite: Corvax/Clothing/Uniforms/Jumpsuit/rd_classical.rsi
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# Jumpsuit
- type: loadout
id: ResearchDirectorJumpsuitFormal
equipment: ResearchDirectorJumpsuitFormal
id: ResearchDirectorJumpsuitClassical
equipment: ResearchDirectorJumpsuitClassical

- type: startingGear
id: ResearchDirectorJumpsuitFormal
id: ResearchDirectorJumpsuitClassical
equipment:
jumpsuit: ClothingUniformJumpsuitRDFormal
jumpsuit: ClothingUniformJumpsuitRDClassical

- type: loadout
id: ResearchDirectorJumpskirtFormal
equipment: ResearchDirectorJumpskirtFormal
id: ResearchDirectorJumpskirtClassical
equipment: ResearchDirectorJumpskirtClassical

- type: startingGear
id: ResearchDirectorJumpskirtFormal
id: ResearchDirectorJumpskirtClassical
equipment:
jumpsuit: ClothingUniformJumpskirtRDFormal
jumpsuit: ClothingUniformJumpskirtRDClassical
56 changes: 56 additions & 0 deletions Resources/Prototypes/Corvax/Recipes/Lathes/clothing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,59 @@
materials:
Cloth: 100
Durathread: 50

- type: latheRecipe
id: ClothingUniformJumpsuitCapTurtleneck
result: ClothingUniformJumpsuitCapTurtleneck
completetime: 4
materials:
Cloth: 300

- type: latheRecipe
id: ClothingUniformJumpskirtCapTurtleneck
result: ClothingUniformJumpskirtCapTurtleneck
completetime: 4
materials:
Cloth: 300

- type: latheRecipe
id: ClothingUniformJumpsuitHoSBlack
result: ClothingUniformJumpsuitHoSBlack
completetime: 4
materials:
Cloth: 300

- type: latheRecipe
id: ClothingUniformJumpskirtHoSBlack
result: ClothingUniformJumpskirtHoSBlack
completetime: 4
materials:
Cloth: 300

- type: latheRecipe
id: ClothingUniformJumpsuitHoPTurtleneck
result: ClothingUniformJumpsuitHoPTurtleneck
completetime: 4
materials:
Cloth: 300

- type: latheRecipe
id: ClothingUniformJumpskirtHoPTurtleneck
result: ClothingUniformJumpskirtHoPTurtleneck
completetime: 4
materials:
Cloth: 300

- type: latheRecipe
id: ClothingUniformJumpsuitRDClassical
result: ClothingUniformJumpsuitRDClassical
completetime: 4
materials:
Cloth: 300

- type: latheRecipe
id: ClothingUniformJumpskirtRDClassical
result: ClothingUniformJumpskirtRDClassical
completetime: 4
materials:
Cloth: 300
8 changes: 8 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1111,6 +1111,14 @@
- ClothingHeadHatCapHoS
- ClothingHeadHatBeretSecurityMedic
- ClothingHeadHatCapWardenAlt
- ClothingUniformJumpsuitCapTurtleneck
- ClothingUniformJumpskirtCapTurtleneck
- ClothingUniformJumpsuitHoSBlack
- ClothingUniformJumpskirtHoSBlack
- ClothingUniformJumpsuitHoPTurtleneck
- ClothingUniformJumpskirtHoPTurtleneck
- ClothingUniformJumpsuitRDClassical
- ClothingUniformJumpskirtRDClassical
# Corvax-Clothing-End
- type: EmagLatheRecipes
emagStaticRecipes:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -772,8 +772,8 @@
- ResearchDirectorJumpsuit
- ResearchDirectorJumpskirt
# Corvax-Loadouts-Start
- ResearchDirectorJumpsuitFormal
- ResearchDirectorJumpskirtFormal
- ResearchDirectorJumpsuitClassical
- ResearchDirectorJumpskirtClassical
lzk228 marked this conversation as resolved.
Show resolved Hide resolved
# Corvax-Loadouts-End

- type: loadoutGroup
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
Expand Down
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
{
"name": "equipped-INNERCLOTHING-reptilian",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
{
"name": "equipped-INNERCLOTHING-reptilian",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
{
"name": "equipped-INNERCLOTHING-reptilian",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
{
"name": "equipped-INNERCLOTHING-reptilian",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
Expand Down
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Loading