-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #304 from NeLepus/armbands-1
Armbands 1
- Loading branch information
Showing
40 changed files
with
398 additions
and
0 deletions.
There are no files selected for viewing
2 changes: 2 additions & 0 deletions
2
Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/boxes/security.ftl
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,2 @@ | ||
ent-LPPBoxArmband = armband box | ||
.desc = A box of armbands. |
12 changes: 12 additions & 0 deletions
12
...ces/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl
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,12 @@ | ||
ent-LPPArmbandRed = red armband | ||
.desc = A red armband. Smells like blood. I guess. | ||
ent-LPPArmbandGreen = green armband | ||
.desc = Green armband, reflecting affiliation with a specific patrol group. | ||
ent-LPPArmbandBlue = blue armband | ||
.desc = Blue armband. The color of this armband is said to make some officers twitch. | ||
ent-LPPArmbandYellow = yellow armband | ||
.desc = Yellow armband, reflecting affiliation with a certain patrol group. | ||
ent-LPPArmbandPurple = purple armband | ||
.desc = Purple armband, reflecting affiliation with a specific patrol group. Wearing this armband in combination with the red uniform is officially recognized as a violation of Article 106 of the current Corporation Law. | ||
ent-LPPArmbandWhite = white armband | ||
.desc = White armband, reflecting affiliation with a specific patrol group. |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/catalog/fills/boxes/security.ftl
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,2 @@ | ||
ent-LPPBoxArmband = Коробка нарукавных повязок | ||
.desc = Надпись мелким шрифтом гласит, что внутри должен быть набор нарукавных повязок. Не применять для остановки кровотечения. |
12 changes: 12 additions & 0 deletions
12
...ces/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl
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,12 @@ | ||
ent-LPPArmbandRed = Красная нарукавная повязка | ||
.desc = Красная нарукавная повязка. Пахнет кровью. Кажется. | ||
ent-LPPArmbandGreen = Зелёная нарукавная повязка | ||
.desc = Зелёная нарукавная повязка, отражающая принадлежность определенной патрульной группе. | ||
ent-LPPArmbandBlue = Синяя нарукавная повязка | ||
.desc = Синяя нарукавная повязка. Говорят, цвет этой повязки доводит некоторых сотрудников до нервного тика. | ||
ent-LPPArmbandYellow = Жёлтая нарукавная повязка | ||
.desc = Жёлтая нарукавная повязка, отражающая принадлежность определенной патрульной группе. | ||
ent-LPPArmbandPurple = Фиолетовая нарукавная повязка | ||
.desc = Фиолетовая нарукавная повязка, отражающая принадлежность определенной патрульной группе. | ||
ent-LPPArmbandWhite = Белая нарукавная повязка | ||
.desc = Белая нарукавная повязка, отражающая принадлежность определенной патрульной группе. |
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
34 changes: 34 additions & 0 deletions
34
Resources/Prototypes/_LostParadise/Catalog/Fills/Boxes/security.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,34 @@ | ||
- type: entity | ||
name: armband box | ||
parent: BoxCardboard | ||
id: LPPBoxArmband | ||
description: A box of armbands. | ||
components: | ||
- type: Item | ||
shape: | ||
- 0,0,1,1 | ||
- type: Storage | ||
grid: | ||
- 0,0,5,2 | ||
whitelist: | ||
tags: | ||
- LPPArmband | ||
- type: StorageFill | ||
contents: | ||
- id: LPPArmbandRed | ||
amount: 3 | ||
- id: LPPArmbandGreen | ||
amount: 3 | ||
- id: LPPArmbandBlue | ||
amount: 3 | ||
- id: LPPArmbandWhite | ||
amount: 3 | ||
- id: LPPArmbandYellow | ||
amount: 3 | ||
- id: LPPArmbandPurple | ||
amount: 3 | ||
- type: Sprite | ||
sprite: _LostParadise/Objects/Storage/boxes.rsi | ||
layers: | ||
- state: box_security | ||
- state: armband |
115 changes: 115 additions & 0 deletions
115
Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.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,115 @@ | ||
- type: entity | ||
abstract: true | ||
parent: ClothingNeckBase # Will be implemented as attachment instead of clothing later | ||
id: LPPArmband | ||
components: | ||
- type: Clothing | ||
quickEquip: false | ||
slots: | ||
- neck | ||
- head | ||
- type: Food | ||
requiresSpecialDigestion: true | ||
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 5 | ||
reagents: | ||
- ReagentId: Fiber | ||
Quantity: 5 | ||
- type: Tag | ||
tags: | ||
- LPPArmband | ||
- ClothMade | ||
- WhitelistChameleon | ||
- type: Item | ||
size: Tiny | ||
- type: Butcherable | ||
butcheringType: Knife | ||
spawned: | ||
- id: MaterialCloth1 | ||
amount: 1 | ||
|
||
- type: entity | ||
parent: LPPArmband | ||
id: LPPArmbandRed | ||
name: red armband | ||
description: | ||
components: | ||
- type: Sprite | ||
sprite: _LostParadise/Clothing/Uniforms/Armband/armband_red.rsi | ||
- type: Clothing | ||
sprite: _LostParadise/Clothing/Uniforms/Armband/armband_red.rsi | ||
- type: FlavorProfile | ||
flavors: | ||
- tomato | ||
|
||
- type: entity | ||
parent: LPPArmband | ||
id: LPPArmbandGreen | ||
name: green armband | ||
description: | ||
components: | ||
- type: Sprite | ||
sprite: _LostParadise/Clothing/Uniforms/Armband/armband_green.rsi | ||
- type: Clothing | ||
sprite: _LostParadise/Clothing/Uniforms/Armband/armband_green.rsi | ||
- type: FlavorProfile | ||
flavors: | ||
- apple | ||
|
||
- type: entity | ||
parent: LPPArmband | ||
id: LPPArmbandBlue | ||
name: blue armband | ||
description: | ||
components: | ||
- type: Sprite | ||
sprite: _LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi | ||
- type: Clothing | ||
sprite: _LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi | ||
- type: FlavorProfile | ||
flavors: | ||
- berry | ||
|
||
- type: entity | ||
parent: LPPArmband | ||
id: LPPArmbandWhite | ||
name: white armband | ||
description: | ||
components: | ||
- type: Sprite | ||
sprite: _LostParadise/Clothing/Uniforms/Armband/armband_white.rsi | ||
- type: Clothing | ||
sprite: _LostParadise/Clothing/Uniforms/Armband/armband_white.rsi | ||
- type: FlavorProfile | ||
flavors: | ||
- creamy | ||
|
||
- type: entity | ||
parent: LPPArmband | ||
id: LPPArmbandYellow | ||
name: yellow armband | ||
description: | ||
components: | ||
- type: Sprite | ||
sprite: _LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi | ||
- type: Clothing | ||
sprite: _LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi | ||
- type: FlavorProfile | ||
flavors: | ||
- cheesy | ||
|
||
- type: entity | ||
parent: LPPArmband | ||
id: LPPArmbandPurple | ||
name: purple armband | ||
description: | ||
components: | ||
- type: Sprite | ||
sprite: _LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi | ||
- type: Clothing | ||
sprite: _LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi | ||
- type: FlavorProfile | ||
flavors: | ||
- grape |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -167,3 +167,7 @@ | |
- type: Tag | ||
id: LPPCandy #Halloween | ||
|
||
# [Тэги экипировки] | ||
|
||
- type: Tag | ||
id: LPPArmband # Нарукавная повязка |
Binary file added
BIN
+428 Bytes
...es/_LostParadise/Clothing/Uniforms/Armband/armband_blue.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
+261 Bytes
...ures/_LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi/equipped-NECK.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
+265 Bytes
...rces/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_blue.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.
22 changes: 22 additions & 0 deletions
22
Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_blue.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,22 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Made by nelepus & miller4040", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "equipped-NECK", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "equipped-HELMET", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+430 Bytes
...s/_LostParadise/Clothing/Uniforms/Armband/armband_green.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
+261 Bytes
...res/_LostParadise/Clothing/Uniforms/Armband/armband_green.rsi/equipped-NECK.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
+266 Bytes
...ces/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_green.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.
22 changes: 22 additions & 0 deletions
22
Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_green.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,22 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Made by nelepus & miller4040", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "equipped-NECK", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "equipped-HELMET", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+435 Bytes
.../_LostParadise/Clothing/Uniforms/Armband/armband_purple.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
+258 Bytes
...es/_LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi/equipped-NECK.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
+271 Bytes
...es/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_purple.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.
22 changes: 22 additions & 0 deletions
22
Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_purple.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,22 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Made by nelepus & miller4040", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "equipped-NECK", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "equipped-HELMET", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+431 Bytes
...res/_LostParadise/Clothing/Uniforms/Armband/armband_red.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
+376 Bytes
...tures/_LostParadise/Clothing/Uniforms/Armband/armband_red.rsi/equipped-NECK.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
+269 Bytes
...urces/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_red.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.
22 changes: 22 additions & 0 deletions
22
Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_red.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,22 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Made by nelepus & miller4040", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "equipped-NECK", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "equipped-HELMET", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+268 Bytes
...tParadise/Clothing/Uniforms/Armband/armband_white.rsi/equipped-EYES-tajaran.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
+268 Bytes
...aradise/Clothing/Uniforms/Armband/armband_white.rsi/equipped-EYES-vulpkanin.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
+269 Bytes
...res/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/equipped-EYES.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.64 KB
...s/_LostParadise/Clothing/Uniforms/Armband/armband_white.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
+259 Bytes
...res/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/equipped-NECK.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
+320 Bytes
...ces/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.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.
Oops, something went wrong.