forked from space-wizards/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 156
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* shkaf * lockers * shkaff * mundir * bomber * beret * pilotdelta.yml * Update security_pilot.yml * ofmundir * veshi * Update Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/meta.json Co-authored-by: Kit0vras <[email protected]> * Update Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/meta.json Co-authored-by: Kit0vras <[email protected]> * Update Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/meta.json Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/SS220/VladIsLove/VladIsLove.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/SS220/VladIsLove/VladIsLove.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml Co-authored-by: Dexler <[email protected]> * Apply suggestions from code review Co-authored-by: Dexler <[email protected]> * Update Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml Co-authored-by: Kit0vras <[email protected]> * Delete Resources/Prototypes/SS220/VladIsLove/VladIsLove.yml * mundiri * armor * beret * meta * moodac * booomber --------- Co-authored-by: Kit0vras <[email protected]> Co-authored-by: Dexler <[email protected]>
- Loading branch information
1 parent
44c5e31
commit 325ccb1
Showing
35 changed files
with
236 additions
and
10 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
15 changes: 15 additions & 0 deletions
15
Resources/Prototypes/SS220/Entities/Clothing/Head/PilotBeret.yml
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
- type: entity | ||
parent: ClothingHeadBase | ||
id: ClothingHeadHatPilotBeret | ||
name: берет лётчика | ||
description: Берет с наушниками... Чтоб уши грели. | ||
components: | ||
- type: Sprite | ||
sprite: SS220/Clothing/Head/Hats/beret_pilot.rsi | ||
- type: Clothing | ||
sprite: SS220/Clothing/Head/Hats/beret_pilot.rsi | ||
- type: Tag | ||
tags: | ||
- ClothMade | ||
- HamsterWearable | ||
- WhitelistChameleon |
25 changes: 25 additions & 0 deletions
25
Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/ArmorBobmer.yml
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
- type: entity | ||
parent: ClothingOuterBase | ||
id: ClothingOuterArmorBobmer | ||
name: бронированный бомбер | ||
description: Настоящие лётчики носят и бронежилеты, и модные куртки. | ||
components: | ||
- type: Sprite | ||
sprite: SS220/Clothing/OuterClothing/Armor/secbomber.rsi | ||
- type: Clothing | ||
sprite: SS220/Clothing/OuterClothing/Armor/secbomber.rsi | ||
- type: Armor | ||
modifiers: | ||
coefficients: | ||
Blunt: 0.80 | ||
Slash: 0.80 | ||
Piercing: 0.65 | ||
Heat: 0.70 | ||
- type: Tag | ||
tags: | ||
- WhitelistChameleon | ||
- type: PressureProtection | ||
highPressureMultiplier: 0.02 | ||
lowPressureMultiplier: 1000 | ||
- type: TemperatureProtection | ||
coefficient: 0.001 |
11 changes: 11 additions & 0 deletions
11
Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Mundir.yml
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
- type: entity | ||
parent: UnsensoredClothingUniformBase | ||
id: ClothingUniformMundir | ||
name: солдатский мундир | ||
description: Отражение силы, дисциплины и патриотизма в статной форме. | ||
suffix: Ebent | ||
components: | ||
- type: Sprite | ||
sprite: SS220/Clothing/Uniforms/Mundir.rsi | ||
- type: Clothing | ||
sprite: SS220/Clothing/Uniforms/Mundir.rsi |
11 changes: 11 additions & 0 deletions
11
Resources/Prototypes/SS220/Entities/Clothing/Uniforms/OfficerMundir.yml
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
- type: entity | ||
parent: UnsensoredClothingUniformBase | ||
id: ClothingUniformOfficerMundir | ||
name: офицерский мундир | ||
description: Строгий и авторитетный наряд военного. | ||
suffix: Ebent | ||
components: | ||
- type: Sprite | ||
sprite: SS220/Clothing/Uniforms/OfficerMundir.rsi | ||
- type: Clothing | ||
sprite: SS220/Clothing/Uniforms/OfficerMundir.rsi |
This file contains 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
This file contains 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
Binary file added
BIN
+510 Bytes
...s/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/equipped-HELMET-hamster.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+750 Bytes
Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/equipped-HELMET.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+492 Bytes
Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+588 Bytes
Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+579 Bytes
Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions
30
Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/meta.json
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "equipped-HELMET", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "equipped-HELMET-hamster", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+1.49 KB
...res/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/equipped-OUTERCLOTHING.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+678 Bytes
Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+585 Bytes
...urces/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+582 Bytes
...rces/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions
27
Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/meta.json
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 and edited by wheremytea (Discord)", | ||
|
||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "equipped-OUTERCLOTHING", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+1.09 KB
...s/Textures/SS220/Clothing/Uniforms/Mundir.rsi/equipped-INNERCLOTHING-monkey.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.03 KB
Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/equipped-INNERCLOTHING.png
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.
Binary file added
BIN
+1.91 KB
Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.96 KB
Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions
31
Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/meta.json
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
{ | ||
"version": 1, | ||
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", | ||
"copyright": "Made by glek3197 (Discord) for SS220", | ||
|
||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "equipped-INNERCLOTHING", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "equipped-INNERCLOTHING-monkey", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+2.96 KB
...res/SS220/Clothing/Uniforms/OfficerMundir.rsi/equipped-INNERCLOTHING-monkey.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.29 KB
...s/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/equipped-INNERCLOTHING.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+2.26 KB
Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+2.4 KB
Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+706 Bytes
Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions
31
Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/meta.json
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
{ | ||
"version": 1, | ||
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", | ||
"copyright": "Made by glek3197 (Discord) for SS220", | ||
|
||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "equipped-INNERCLOTHING", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "equipped-INNERCLOTHING-monkey", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
} | ||
] | ||
} |
This file contains 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
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.