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

update5 #111

Merged
merged 5 commits into from
Nov 11, 2023
Merged
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
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,6 @@ ent-ADTClothingHeadHairPin = золотая заколка

ent-ADTClothingHeadPovar = Поварской колпак-берет шеф-повара
.desc = Обязательный головной убор уважающего себя шеф-повара, а так-же чтобы на еду не попали волосы.

ent-ADTClothingHeadHelmetHungerGamesCapitols = Шлем Капитолия
.desc = Шлем компании "Космических Голодных Игр".
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
ent-ADTClothingBlueshieldArmor = бронежилет офицера "Синего Щита"
.desc = Бронежилет третьего класса защиты, предназначенный для офицеров "Синего Щита". Дает приемлемую защиту от ударов и среднюю - от огнестрельного оружия.

ent-ADTClothingHungerGamesArmorCapitols = Броня Капитолия
.desc = Броня компании "Космических Голодных Игр".
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -218,3 +218,7 @@ ent-ADTJumpsuitSerious = серьезная форма
ent-ADTJumpskirtBlackShortDress = чёрное короткое платье
.desc = Легкое платье с открытой спиной из чёрной шелковой ткани с золотыми лентами, для элегантных распутных дам. Производство компании "Modeling Agency Dar-Vaxed".
.suffix = { "" }

ent-ADTClothingUniformJumpsuitHungerGames = Комбинезон Капитолия
.desc = Комбинезон компании "Космических Голодных Игр".
.suffix = { "" }
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
components:
- type: Storage
maxItemSize: Huge
maxTotalWeight: 9000
maxTotalWeight: 40
- type: StorageFill
contents:
- id: ClothingOuterHardsuitSyndieElite
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,3 +205,42 @@
coefficients:
Radiation: 0.95
Caustic: 0.85

- type: entity
parent: ClothingHeadLightBase
id: ADTClothingHeadHelmetHungerGamesCapitols
name: Capitols helmet
description: An atmos tech's best friend. Provides some heat resistance and looks cool.
components:
- type: Sprite
sprite: ADT/Clothing/Head/Helmets/helmet_capitols.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Helmets/helmet_capitols.rsi
##quickEquip: true
- type: IngestionBlocker
- type: IdentityBlocker
- type: PointLight
enabled: false
color: "#30d5c8"
radius: 7
energy: 1
- type: Armor
modifiers:
coefficients:
Blunt: 0.65
Slash: 0.65
Piercing: 0.65
Heat: 0.8
- type: ExplosionResistance
damageCoefficient: 0.7



# - type: LightBulb
# color: "#0000FF"
# lightEnergy: 6
# lightRadius: 15
# lightSoftness: 0.9
# BurningTemperature: 1000
# PowerUse: 12

Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
- type: entity
parent: ClothingOuterArmorBasic
id: ADTClothingHungerGamesArmorCapitols
name: ArmorCapitols
description: A Type III heavy bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent.
components:
- type: Sprite
sprite: ADT/Clothing/OuterClothing/Armor/armor_capitols.rsi
- type: Clothing
sprite: ADT/Clothing/OuterClothing/Armor/armor_capitols.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.6
Slash: 0.6
Piercing: 0.6
Heat: 0.8
- type: ExplosionResistance
damageCoefficient: 0.88
#- type: Matchbox
- type: Storage
maxItemSize: Small
maxTotalWeight: 2
- type: ContainerContainer
containers:
storagebase: !type:Container
ents: []
- type: UserInterface
interfaces:
- key: enum.StorageUiKey.Key
type: StorageBoundUserInterface
# to prevent bag open/honk spam
- type: UseDelay
delay: 0.5
11 changes: 11 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -503,3 +503,14 @@
sprite: ADT/Clothing/Uniforms/Jumpsuit/serious_suit.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/serious_suit.rsi

- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformJumpsuitHungerGames
name: jumpsuit Capitols
description: A stately blue jumpsuit to represent Capitols
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_capitols.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_capitols.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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:dd",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-flash"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "off-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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:Human",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:dd",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
}
]
}