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

[Feature] Colored Captain Coats #75

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
@@ -0,0 +1,4 @@
ent-ClothingOuterCoatCaptainWhite = белый китель капитана
.desc = Белый китель капитана, инкрустированный золотом.
ent-ClothingOuterCoatCaptainSheriff = китель шерифа
.desc = Китель шерифа, инкрустированный золотом.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ent-ClothingOuterCoatSecurityOvercoat = шинель службы безопас
.desc = Легкобронированная кожаная шинель, предназначенная для повседневной носки высокопоставленными офицерами. Имеет логотип компании Nanotrasen Security.
ent-ClothingOuterCoatLabSecurityMedic = лабораторный халат бригмедика
.desc = Костюм, защищающий от небольших разливов химикатов.
ent-ClothingOuterCoatCaptain = торжественная куртка капитана
.desc = Капитанская торжественная куртка, инкрустированная золотом.
ent-ClothingOuterCoatCaptain = китель капитана
.desc = Капитанский китель, инкрустированный золотом.
ent-ClothingOuterCoatHOP = куртка главы персонала
.desc = Деловая куртка главы персонала для создания профессионального вида.
AwareFoxy marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@
sprite: Corvax/Clothing/OuterClothing/Coats/captain.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.5
Slash: 0.5
Piercing: 0.6
Heat: 0.5
coefficients: # Corvax-Next-EDIT-CaptainCoats
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
coefficients: # Corvax-Next-EDIT-CaptainCoats
coefficients: # Corvax-Next-EditCaptainCoats

Blunt: 0.7
Slash: 0.7
Piercing: 0.7
Heat: 0.8

- type: entity
parent: ClothingOuterStorageBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@
ClothingHeadHatCapcapWhite: 1
ClothingNeckCloakRoyalCaptain: 1
ClothingNeckWhiteMantleCaptain: 1
ClothingOuterCoatCaptainWhite: 1
ClothingUniformJumpskirtWhiteCaptain: 1
ClothingUniformJumpsuitWhiteCaptain: 1
ClothingHandsGlovesCaptainWhite: 1
ClothingBeltWhiteSheath: 1
# Sheriff
ClothingHeadHatBeretSheriff: 1
ClothingHeadHatCapcapSheriff: 1
ClothingOuterCoatCaptainSheriff: 1
ClothingUniformJumpsuitSheriff: 1
ClothingHandsGlovesSheriff: 1
ClothingBeltSheriffSheath: 1
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
- type: entity
parent: ClothingOuterCoatCaptain
id: ClothingOuterCoatCaptainWhite
name: white captain's jacket
description: White captain formal jacket, inlaid with gold.
components:
- type: Sprite
sprite: _CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi
- type: Clothing
sprite: _CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi

- type: entity
parent: ClothingOuterCoatCaptain
id: ClothingOuterCoatCaptainSheriff
name: sheriff jacket
description: Sheriff formal jacket, inlaid with gold.
components:
- type: Sprite
sprite: _CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi
- type: Clothing
sprite: _CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi
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
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by orange6775 (discord) for SS14 | Edited by PuroSlavKing (Github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-digi",
"directions": 4
},
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
}
]
}
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
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by orange6775 (discord) for SS14.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-digi",
"directions": 4
},
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
}
]
}
Loading