diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/satchels.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/satchels.ftl index b2f21d3f2e7..e8294651af5 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/satchels.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/satchels.ftl @@ -1,2 +1,5 @@ ent-ADTClothingBackpackSatchelBlueshield = сумка офицера синего щита .desc = Крайне вместительная черно-синяя сумка с яркими белыми эмблемами щита, предназначенная для хранения охранного и медицинского арсенала Офицеров Синего Щита. + +ent-ADTClothingCentComBackpack = сумка центком + .desc Зелёная сумка. Пахнет свежестью. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl index f1f7212c2b0..dbba684d97b 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl @@ -2,7 +2,7 @@ ent-ADTClothingOuterCoatLabPathologist = халат патологоанатом .desc = { ent-ClothingOuterCoatLab.desc } ent-ADTClothingOuterApronPathologist = фартук патологоанатома .desc = Фартук для работы с трупами. -ent-ADTClothingKadet = шинель для Кадетов СБ +ent-ADTClothingKadet = шинель для кадетов сб .desc = шинель, сшитая для новобранцев службы безопасности. Она очень похожа на шинели младших чинов РИА ent-ADTClothingOuterGraySweatshirtTop = серая толстовка-топка @@ -24,3 +24,6 @@ ent-ADTClothingOuterCoatInvestigator = бушлат следователя Сл ent-ClothingOuterAtmosianBomberJacket = куртка-бомбер атмосианина .desc = Плотная, поношенная куртка-бомбер атмосианина. + +ent-ADTClothingOuterCoatCentCom = пальто центком + .desc = Зеленое пальто с золотыми вставками. На спине выгравирована золотая буква N. Такое пальто носят только важные персоны... diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml index 91803f42f20..ac911eb96c1 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml @@ -14,3 +14,13 @@ components: - type: Sprite sprite: ADT/Clothing/Back/pathologist_satchel.rsi + +# Сумка ЦентКом +- type: entity + parent: ClothingBackpackSatchel + id: ADTClothingCentComSatchel + name: centcom satchel + description: Green satchel. He smells fresh + components: + - type: Sprite + sprite: ADT/Clothing/Back/centcom_satchel.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml index 6bfbc649fbe..98eb531b82b 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml @@ -141,3 +141,30 @@ sprite: ADT/Clothing/OuterClothing/Coats/atmosian.rsi - type: Clothing sprite: ADT/Clothing/OuterClothing/Coats/atmosian.rsi + +#Пальто ЦентКом +- type: entity + parent: ClothingOuterBase + id: ADTClothingOuterCoatCentCom + name: centcom coat + description: A green coat with gold inserts. The golden letter N is emblazoned on the back. Only the big shots wear this coat... + components: + - type: Storage + grid: + - 0,0,3,1 + maxItemSize: Normal + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/centcom_coat.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/centcom_coat.rsi + - type: StorageFill + contents: + - id: RubberStampCentcom + - id: PenCentcom + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.6 + Heat: 0.7 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml index 68665ae7fcc..e8a863eefa8 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml @@ -18,3 +18,5 @@ ClothingOuterCoatExpensive: 1 ClothingNeckScarfStripedCentcom: 3 ClothingNeckCloakCentcom: 3 + ADTClothingOuterCoatCentCom: 3 #ADT-Tweak + ADTClothingCentComSatchel: 3 #ADT-Tweak diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml index 2d3e6bd0fed..1ba54288313 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml @@ -14,3 +14,12 @@ id: MusicianWintercoat equipment: outerClothing: ClothingOuterWinterMusician + +- type: loadoutEffectGroup + id: SuperSynthesizerInstrument + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: Musician + time: 72000 #20 hrs diff --git a/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..d6772087902 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/icon.png new file mode 100644 index 00000000000..0034b8730a3 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/inhand-left.png new file mode 100644 index 00000000000..84341566f1d Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/inhand-right.png new file mode 100644 index 00000000000..a6f88692dd0 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/meta.json new file mode 100644 index 00000000000..c166df646be --- /dev/null +++ b/Resources/Textures/Clothing/Back/Satchels/centcom_satchel.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..1e3c211dd24 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/icon.png new file mode 100644 index 00000000000..041fa555671 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/inhand-left.png new file mode 100644 index 00000000000..0e80eddfcb1 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/inhand-right.png new file mode 100644 index 00000000000..cf05f5f2043 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/meta.json new file mode 100644 index 00000000000..e482264df5f --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Coats/centcom_coat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}