Skip to content

Commit

Permalink
Merge pull request #304 from NeLepus/armbands-1
Browse files Browse the repository at this point in the history
Armbands 1
  • Loading branch information
BL02DL authored Oct 27, 2024
2 parents 91cfd1c + 1f4b16b commit 91215f1
Show file tree
Hide file tree
Showing 40 changed files with 398 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-LPPBoxArmband = armband box
.desc = A box of armbands.
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-LPPBoxArmband = Коробка нарукавных повязок
.desc = Надпись мелким шрифтом гласит, что внутри должен быть набор нарукавных повязок. Не применять для остановки кровотечения.
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 = Белая нарукавная повязка, отражающая принадлежность определенной патрульной группе.
4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,8 @@
- id: HoSIDCard # Delta-V
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
#LPP
- id: LPPBoxArmband

- type: entity
id: LockerHeadOfSecurityFilled
Expand Down Expand Up @@ -365,6 +367,8 @@
- id: HoSIDCard # Delta-V
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
#LPP
- id: LPPBoxArmband

- type: entity
id: LockerFreezerVaultFilled
Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1204,6 +1204,13 @@
- CarpetPurple
- CarpetCyan
- CarpetWhite
# LPP
- LPPArmbandRed
- LPPArmbandGreen
- LPPArmbandBlue
- LPPArmbandWhite
- LPPArmbandYellow
- LPPArmbandPurple
- type: EmagLatheRecipes
emagStaticRecipes:
- ClothingHeadHatCentcomcap
Expand Down
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -712,3 +712,48 @@
completetime: 4
materials:
Cloth: 300

# [Armbands]

- type: latheRecipe
id: LPPArmbandRed
result: LPPArmbandRed
completetime: 1
materials:
Cloth: 100

- type: latheRecipe
id: LPPArmbandGreen
result: LPPArmbandGreen
completetime: 1
materials:
Cloth: 100

- type: latheRecipe
id: LPPArmbandBlue
result: LPPArmbandBlue
completetime: 1
materials:
Cloth: 100

- type: latheRecipe
id: LPPArmbandWhite
result: LPPArmbandWhite
completetime: 1
materials:
Cloth: 100

- type: latheRecipe
id: LPPArmbandYellow
result: LPPArmbandYellow
completetime: 1
materials:
Cloth: 100

- type: latheRecipe
id: LPPArmbandPurple
result: LPPArmbandPurple
completetime: 1
materials:
Cloth: 100

4 changes: 4 additions & 0 deletions Resources/Prototypes/_LostParadise/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167,3 +167,7 @@
- type: Tag
id: LPPCandy #Halloween

# [Тэги экипировки]

- type: Tag
id: LPPArmband # Нарукавная повязка
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,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
}
]
}
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,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
}
]
}
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,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
}
]
}
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,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
}
]
}
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

0 comments on commit 91215f1

Please sign in to comment.