diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl index b2144756896..52b43cb8b89 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl @@ -61,3 +61,6 @@ ent-ADTClothingHeadHairPin = золотая заколка ent-ADTClothingHeadPovar = Поварской колпак-берет шеф-повара .desc = Обязательный головной убор уважающего себя шеф-повара, а так-же чтобы на еду не попали волосы. + +ent-ADTClothingHeadHelmetHungerGamesCapitols = Шлем Капитолия + .desc = Шлем компании "Космических Голодных Игр". diff --git a/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/Armor/blueshield_armor.ftl b/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/Armor/blueshield_armor.ftl index 03a844b5b3b..bd54ec62889 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/Armor/blueshield_armor.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/Armor/blueshield_armor.ftl @@ -1,2 +1,5 @@ ent-ADTClothingBlueshieldArmor = бронежилет офицера "Синего Щита" .desc = Бронежилет третьего класса защиты, предназначенный для офицеров "Синего Щита". Дает приемлемую защиту от ударов и среднюю - от огнестрельного оружия. + +ent-ADTClothingHungerGamesArmorCapitols = Броня Капитолия + .desc = Броня компании "Космических Голодных Игр". diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl index 68b7fd5fcc7..2501b41ffdf 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl @@ -218,3 +218,7 @@ ent-ADTJumpsuitSerious = серьезная форма ent-ADTJumpskirtBlackShortDress = чёрное короткое платье .desc = Легкое платье с открытой спиной из чёрной шелковой ткани с золотыми лентами, для элегантных распутных дам. Производство компании "Modeling Agency Dar-Vaxed". .suffix = { "" } + +ent-ADTClothingUniformJumpsuitHungerGames = Комбинезон Капитолия + .desc = Комбинезон компании "Космических Голодных Игр". + .suffix = { "" } diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 419a8c8c15e..70a844cb400 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -40,7 +40,7 @@ components: - type: Storage maxItemSize: Huge - maxTotalWeight: 9000 + maxTotalWeight: 40 - type: StorageFill contents: - id: ClothingOuterHardsuitSyndieElite diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml index e4b98000a9d..f3c0ff22cca 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml @@ -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 + diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hunger_games.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hunger_games.yml new file mode 100644 index 00000000000..1e7f15dd678 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hunger_games.yml @@ -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 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml index d3d30b1d1b8..f114ff2478c 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml @@ -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 diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/helmet_capitols.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Helmets/helmet_capitols.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..b1e06b858cd Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/helmet_capitols.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/helmet_capitols.rsi/icon-flash.png b/Resources/Textures/ADT/Clothing/Head/Helmets/helmet_capitols.rsi/icon-flash.png new file mode 100644 index 00000000000..60a6dd30dc4 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/helmet_capitols.rsi/icon-flash.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/helmet_capitols.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Helmets/helmet_capitols.rsi/icon.png new file mode 100644 index 00000000000..b03b8d81c84 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/helmet_capitols.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/helmet_capitols.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Helmets/helmet_capitols.rsi/meta.json new file mode 100644 index 00000000000..c28bb7f7a07 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Helmets/helmet_capitols.rsi/meta.json @@ -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 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/helmet_capitols.rsi/off-equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Helmets/helmet_capitols.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000..b1e06b858cd Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/helmet_capitols.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/helmet_capitols.rsi/on-equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Helmets/helmet_capitols.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..668e5c622f3 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/helmet_capitols.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/armor_capitols.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/armor_capitols.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..30d79b492a1 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/armor_capitols.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/armor_capitols.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/armor_capitols.rsi/icon.png new file mode 100644 index 00000000000..8f3059d228c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/armor_capitols.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/armor_capitols.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/armor_capitols.rsi/meta.json new file mode 100644 index 00000000000..712c779d03c --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/armor_capitols.rsi/meta.json @@ -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 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_capitols.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_capitols.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..ac85fdcf993 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_capitols.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_capitols.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_capitols.rsi/icon.png new file mode 100644 index 00000000000..26ee4aeb9d4 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_capitols.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_capitols.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_capitols.rsi/meta.json new file mode 100644 index 00000000000..5bf0f2b863d --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_capitols.rsi/meta.json @@ -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 + } + ] +}