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

Armbands 1 #304

Merged
merged 25 commits into from
Oct 27, 2024
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
55f6627
Added armband sprites
NeLepus Oct 21, 2024
3f54e20
Added armband entities
NeLepus Oct 21, 2024
68014df
Added translation files
NeLepus Oct 21, 2024
a6e9d0e
Replaced icon placeholders
NeLepus Oct 22, 2024
7b1b6d1
Added armband box entity
NeLepus Oct 22, 2024
c1ac0c1
Fixed uppercase letters in armband translations
NeLepus Oct 22, 2024
d8221a1
Made armbands single storage cell items
NeLepus Oct 22, 2024
906dd7d
Added an abstract parent for the armbands
NeLepus Oct 23, 2024
4a8b851
Added armband box sprite
NeLepus Oct 23, 2024
489a241
Added armband tags for the box whitelist
NeLepus Oct 23, 2024
ede1f81
Added armbands box to the HoS locker contents
NeLepus Oct 23, 2024
efb8c6b
Added clothing lather recipes for armbands
NeLepus Oct 23, 2024
54ee526
Rearranged armband lists
NeLepus Oct 23, 2024
1c75623
Changed palette for better contrast
NeLepus Oct 25, 2024
3b72100
Made armbands also work as blindfolds
NeLepus Oct 25, 2024
33fbcc9
Replaced EYES slot with HEAD
NeLepus Oct 26, 2024
0f63de3
Added flavors for moth consumption
NeLepus Oct 26, 2024
22eeaea
Disabled quick equip due to slot conflicts
NeLepus Oct 26, 2024
836786d
Merge remote-tracking branch 'origin/master' into armbands-1
NeLepus Oct 26, 2024
7d0888f
Moved translation files
NeLepus Oct 26, 2024
ed64ec6
Switched EN and RU translations
NeLepus Oct 26, 2024
f682e1c
Update Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entiti…
NeLepus Oct 27, 2024
3452864
Update Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalo…
NeLepus Oct 27, 2024
8e6834c
Fixed en-US translations
NeLepus Oct 27, 2024
1f4b16b
Merge branch 'master' into armbands-1
Evgencheg Oct 27, 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
@@ -0,0 +1,2 @@
ent-LPPBoxArmband = armband box
.desc = A box of armbands.
NeLepus marked this conversation as resolved.
Show resolved Hide resolved
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 = Белая нарукавная повязка, отражающая принадлежность определенной патрульной группе.
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
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 = red armband
.desc = A red armband. Smells like blood. I guess.
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
ent-LPPArmbandGreen = green armband
.desc = Green armband, reflecting affiliation with a specific patrol group.
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
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 = Magenta armband
.desc = Magenta 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.
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
ent-LPPArmbandWhite = White armband
.desc = White armband, reflecting affiliation with a specific patrol group.
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
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
BL02DL marked this conversation as resolved.
Show resolved Hide resolved

- 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
NeLepus marked this conversation as resolved.
Show resolved Hide resolved
- 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
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
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
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
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
}
]
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
}
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
}
]
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
}
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",
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
},
{
"name": "equipped-HELMET",
"directions": 4
}
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
]
}
BL02DL marked this conversation as resolved.
Show resolved Hide resolved
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
Loading