diff --git a/Resources/Prototypes/White/Fluff/fluff.yml b/Resources/Prototypes/White/Fluff/fluff.yml index 4e027d7350..33499759b7 100644 --- a/Resources/Prototypes/White/Fluff/fluff.yml +++ b/Resources/Prototypes/White/Fluff/fluff.yml @@ -60,6 +60,7 @@ sprite: White/Fluff/Maury/chemshit.rsi # YouWellLeer + #- type: entity # parent: Crowbar # id: Sledgebar @@ -79,22 +80,22 @@ # types: # Blunt: 10 -- type: entity - parent: ClothingShoesBootsJack - id: LeerBoots - name: Дисциплина - description: Несогласные будут раздавлены. - components: - - type: Sprite - sprite: White/Fluff/YouWellLeer/hosboots.rsi - - type: Clothing - sprite: White/Fluff/YouWellLeer/hosboots.rsi +#- type: entity +# parent: ClothingShoesBootsJack +# id: LeerBoots +# name: Дисциплина +# description: Несогласные будут раздавлены. +# components: +# - type: Sprite +# sprite: White/Fluff/YouWellLeer/hosboots.rsi +# - type: Clothing +# sprite: White/Fluff/YouWellLeer/hosboots.rsi - type: entity parent: ClothingHeadBase id: LeerCap - name: Правосудие - description: Там, где правит совесть, законы не нужны. + name: старая фуражка + description: Реплика фуражки времен старого космоса. Согласно некоторым источникам, такую фуражку носили солдаты несколько столетий назад. components: - type: Sprite sprite: White/Fluff/YouWellLeer/hoscap.rsi @@ -110,22 +111,22 @@ - type: Sprite sprite: White/Fluff/YouWellLeer/hoscloak.rsi -- type: entity - parent: ClothingHandsGlovesCombat - id: LeerGloves - name: Наказание - description: Тактические перчатки из синтетических волокон с дополнительной защитой рук. - components: - - type: Sprite - sprite: White/Fluff/YouWellLeer/hosgloves.rsi - - type: Clothing - sprite: White/Fluff/YouWellLeer/hosgloves.rsi +#- type: entity +# parent: ClothingHandsGlovesCombat +# id: LeerGloves +# name: Наказание +# description: Тактические перчатки из синтетических волокон с дополнительной защитой рук. +# components: +# - type: Sprite +# sprite: White/Fluff/YouWellLeer/hosgloves.rsi +# - type: Clothing +# sprite: White/Fluff/YouWellLeer/hosgloves.rsi - type: entity parent: ClothingOuterHardsuitSecurityRed id: LeerHardsuit - name: Завет - description: Созданный на заказ, этот скафандр сочетает в себе хорошие показатели защиты и мобильности. + name: Первопроходец + description: Боевой скафандр десантников ВКФ, умело разобранный и модифицированный мастерами-любителями. components: - type: Sprite sprite: White/Fluff/YouWellLeer/hoshardsuit.rsi @@ -145,13 +146,12 @@ - type: Clothing sprite: White/Fluff/YouWellLeer/hoshelmet.rsi - type: PointLight - color: "#ff0000" - type: entity parent: ClothingUniformJumpsuitHoS id: LeerJumpsuit - name: комплект ФПУ - description: Форма Полевая Универсальная - отличный выбор для любителей боевых действий. + name: водолазка ВКФ + description: Комплект прочной одежды со страховочными ремнями. components: - type: Sprite sprite: White/Fluff/YouWellLeer/hosjumpsuit.rsi @@ -169,6 +169,17 @@ - type: Clothing sprite: White/Fluff/YouWellLeer/hosmask.rsi +- type: entity + parent: ClothingOuterCoatHoSTrench + id: LeerTrench + name: Офицерский китель + description: Бронежилет, поверх которого надет парадный китель офицера ВКФ. Погоны, кажется, сорваны. + components: + - type: Sprite + sprite: White/Fluff/YouWellLeer/hostrench.rsi + - type: Clothing + sprite: White/Fluff/YouWellLeer/hostrench.rsi + # merkkaa - type: entity parent: Bible diff --git a/Resources/Prototypes/White/Fluff/sponsor.yml b/Resources/Prototypes/White/Fluff/sponsor.yml index 38086c6b89..ef5c8737a2 100644 --- a/Resources/Prototypes/White/Fluff/sponsor.yml +++ b/Resources/Prototypes/White/Fluff/sponsor.yml @@ -18,16 +18,17 @@ sponsorOnly: true # YouWellLeer + #- type: loadout # id: SledgebarLoadout # entity: Sledgebar # sponsorOnly: true -- type: loadout - id: LeerBootsLoadout - entity: LeerBoots - sponsorOnly: true - whitelistedJobs: [HeadOfSecurity] +#- type: loadout +# id: LeerBootsLoadout +# entity: LeerBoots +# sponsorOnly: true +# whitelistedJobs: [HeadOfSecurity] - type: loadout id: LeerCapLoadout @@ -41,11 +42,11 @@ sponsorOnly: true whitelistedJobs: [HeadOfSecurity] -- type: loadout - id: LeerGlovesLoadout - entity: LeerGloves - sponsorOnly: true - whitelistedJobs: [HeadOfSecurity] +#- type: loadout +# id: LeerGlovesLoadout +# entity: LeerGloves +# sponsorOnly: true +# whitelistedJobs: [HeadOfSecurity] - type: loadout id: LeerHardsuitLoadout @@ -71,6 +72,12 @@ sponsorOnly: true whitelistedJobs: [HeadOfSecurity] +- type: loadout + id: LeerTrenchLoadout + entity: LeerTrench + sponsorOnly: true + whitelistedJobs: [HeadOfSecurity] + # мурка - type: loadout id: BibleNyaLoadout diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hoscap.rsi/equipped-HELMET.png b/Resources/Textures/White/Fluff/YouWellLeer/hoscap.rsi/equipped-HELMET.png index d6cc2f0325..c3a26d6d3f 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hoscap.rsi/equipped-HELMET.png and b/Resources/Textures/White/Fluff/YouWellLeer/hoscap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hoscap.rsi/icon.png b/Resources/Textures/White/Fluff/YouWellLeer/hoscap.rsi/icon.png index 880c8a5f5f..aad6186b14 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hoscap.rsi/icon.png and b/Resources/Textures/White/Fluff/YouWellLeer/hoscap.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hoscap.rsi/inhand-left.png b/Resources/Textures/White/Fluff/YouWellLeer/hoscap.rsi/inhand-left.png new file mode 100644 index 0000000000..e00890713e Binary files /dev/null and b/Resources/Textures/White/Fluff/YouWellLeer/hoscap.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hoscap.rsi/inhand-right.png b/Resources/Textures/White/Fluff/YouWellLeer/hoscap.rsi/inhand-right.png new file mode 100644 index 0000000000..9fe8c83f06 Binary files /dev/null and b/Resources/Textures/White/Fluff/YouWellLeer/hoscap.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hoscap.rsi/meta.json b/Resources/Textures/White/Fluff/YouWellLeer/hoscap.rsi/meta.json index d276aba24d..5e5a25b8b2 100644 --- a/Resources/Textures/White/Fluff/YouWellLeer/hoscap.rsi/meta.json +++ b/Resources/Textures/White/Fluff/YouWellLeer/hoscap.rsi/meta.json @@ -13,6 +13,14 @@ { "name": "equipped-HELMET", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hoscloak.rsi/equipped-NECK.png b/Resources/Textures/White/Fluff/YouWellLeer/hoscloak.rsi/equipped-NECK.png index cda7301661..07b0f04fd2 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hoscloak.rsi/equipped-NECK.png and b/Resources/Textures/White/Fluff/YouWellLeer/hoscloak.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hoscloak.rsi/icon.png b/Resources/Textures/White/Fluff/YouWellLeer/hoscloak.rsi/icon.png index 294d50abc7..662113d864 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hoscloak.rsi/icon.png and b/Resources/Textures/White/Fluff/YouWellLeer/hoscloak.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hoscloak.rsi/inhand-left.png b/Resources/Textures/White/Fluff/YouWellLeer/hoscloak.rsi/inhand-left.png index d4fd8db4ba..ca8465c082 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hoscloak.rsi/inhand-left.png and b/Resources/Textures/White/Fluff/YouWellLeer/hoscloak.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hoscloak.rsi/inhand-right.png b/Resources/Textures/White/Fluff/YouWellLeer/hoscloak.rsi/inhand-right.png index 1e1008748c..6d0866f94b 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hoscloak.rsi/inhand-right.png and b/Resources/Textures/White/Fluff/YouWellLeer/hoscloak.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hoshardsuit.rsi/equipped-OUTERCLOTHING-body-slim.png b/Resources/Textures/White/Fluff/YouWellLeer/hoshardsuit.rsi/equipped-OUTERCLOTHING-body-slim.png index 27122e6bab..4750458c94 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hoshardsuit.rsi/equipped-OUTERCLOTHING-body-slim.png and b/Resources/Textures/White/Fluff/YouWellLeer/hoshardsuit.rsi/equipped-OUTERCLOTHING-body-slim.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hoshardsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/White/Fluff/YouWellLeer/hoshardsuit.rsi/equipped-OUTERCLOTHING.png index 27122e6bab..4750458c94 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hoshardsuit.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/White/Fluff/YouWellLeer/hoshardsuit.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hoshardsuit.rsi/icon.png b/Resources/Textures/White/Fluff/YouWellLeer/hoshardsuit.rsi/icon.png index 3bb0966178..26f1dcdfcf 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hoshardsuit.rsi/icon.png and b/Resources/Textures/White/Fluff/YouWellLeer/hoshardsuit.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hoshardsuit.rsi/inhand-left.png b/Resources/Textures/White/Fluff/YouWellLeer/hoshardsuit.rsi/inhand-left.png index 2b5da34689..924812ce21 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hoshardsuit.rsi/inhand-left.png and b/Resources/Textures/White/Fluff/YouWellLeer/hoshardsuit.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hoshardsuit.rsi/inhand-right.png b/Resources/Textures/White/Fluff/YouWellLeer/hoshardsuit.rsi/inhand-right.png index a76acc62d7..2d2890c66b 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hoshardsuit.rsi/inhand-right.png and b/Resources/Textures/White/Fluff/YouWellLeer/hoshardsuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hoshelmet.rsi/icon-flash.png b/Resources/Textures/White/Fluff/YouWellLeer/hoshelmet.rsi/icon-flash.png index cac03e5bf2..cba451c0e2 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hoshelmet.rsi/icon-flash.png and b/Resources/Textures/White/Fluff/YouWellLeer/hoshelmet.rsi/icon-flash.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hoshelmet.rsi/icon.png b/Resources/Textures/White/Fluff/YouWellLeer/hoshelmet.rsi/icon.png index cac03e5bf2..cba451c0e2 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hoshelmet.rsi/icon.png and b/Resources/Textures/White/Fluff/YouWellLeer/hoshelmet.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hoshelmet.rsi/off-equipped-HELMET.png b/Resources/Textures/White/Fluff/YouWellLeer/hoshelmet.rsi/off-equipped-HELMET.png index ed42a685f9..c7061a5924 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hoshelmet.rsi/off-equipped-HELMET.png and b/Resources/Textures/White/Fluff/YouWellLeer/hoshelmet.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hoshelmet.rsi/on-equipped-HELMET.png b/Resources/Textures/White/Fluff/YouWellLeer/hoshelmet.rsi/on-equipped-HELMET.png index ed42a685f9..c7061a5924 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hoshelmet.rsi/on-equipped-HELMET.png and b/Resources/Textures/White/Fluff/YouWellLeer/hoshelmet.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/equipped-INNERCLOTHING-body-slim.png b/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/equipped-INNERCLOTHING-body-slim.png index 993a8da2be..8b1dd14e49 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/equipped-INNERCLOTHING-body-slim.png and b/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/equipped-INNERCLOTHING-body-slim.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/equipped-INNERCLOTHING-monkey.png deleted file mode 100644 index 0d26aebd26..0000000000 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/equipped-INNERCLOTHING.png index 993a8da2be..8b1dd14e49 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/icon.png b/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/icon.png index 0fea98912c..16cbb1e774 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/icon.png and b/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/inhand-left.png b/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/inhand-left.png index 2e4a7103ae..fae241190c 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/inhand-left.png and b/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/inhand-right.png b/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/inhand-right.png index 8d34f3244e..723e562f2c 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/inhand-right.png and b/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/meta.json b/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/meta.json index 8e7b451d37..a56dc8895f 100644 --- a/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/meta.json +++ b/Resources/Textures/White/Fluff/YouWellLeer/hosjumpsuit.rsi/meta.json @@ -18,10 +18,6 @@ "name": "equipped-INNERCLOTHING-body-slim", "directions": 4 }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hosmask.rsi/equipped-MASK.png b/Resources/Textures/White/Fluff/YouWellLeer/hosmask.rsi/equipped-MASK.png index c107a1297b..aec52196d1 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hosmask.rsi/equipped-MASK.png and b/Resources/Textures/White/Fluff/YouWellLeer/hosmask.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hosmask.rsi/icon.png b/Resources/Textures/White/Fluff/YouWellLeer/hosmask.rsi/icon.png index e421547c3d..4fefe80fce 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hosmask.rsi/icon.png and b/Resources/Textures/White/Fluff/YouWellLeer/hosmask.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hosmask.rsi/inhand-left.png b/Resources/Textures/White/Fluff/YouWellLeer/hosmask.rsi/inhand-left.png index e3cc8a8566..03ca25832c 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hosmask.rsi/inhand-left.png and b/Resources/Textures/White/Fluff/YouWellLeer/hosmask.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hosmask.rsi/inhand-right.png b/Resources/Textures/White/Fluff/YouWellLeer/hosmask.rsi/inhand-right.png index dd0740367b..2896d0cfaf 100644 Binary files a/Resources/Textures/White/Fluff/YouWellLeer/hosmask.rsi/inhand-right.png and b/Resources/Textures/White/Fluff/YouWellLeer/hosmask.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hostrench.rsi/equipped-OUTERCLOTHING-body-slim.png b/Resources/Textures/White/Fluff/YouWellLeer/hostrench.rsi/equipped-OUTERCLOTHING-body-slim.png new file mode 100644 index 0000000000..a014298c35 Binary files /dev/null and b/Resources/Textures/White/Fluff/YouWellLeer/hostrench.rsi/equipped-OUTERCLOTHING-body-slim.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hostrench.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/White/Fluff/YouWellLeer/hostrench.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..a014298c35 Binary files /dev/null and b/Resources/Textures/White/Fluff/YouWellLeer/hostrench.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hostrench.rsi/icon.png b/Resources/Textures/White/Fluff/YouWellLeer/hostrench.rsi/icon.png new file mode 100644 index 0000000000..29f71bd9dd Binary files /dev/null and b/Resources/Textures/White/Fluff/YouWellLeer/hostrench.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hostrench.rsi/inhand-left.png b/Resources/Textures/White/Fluff/YouWellLeer/hostrench.rsi/inhand-left.png new file mode 100644 index 0000000000..d7df6626cf Binary files /dev/null and b/Resources/Textures/White/Fluff/YouWellLeer/hostrench.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hostrench.rsi/inhand-right.png b/Resources/Textures/White/Fluff/YouWellLeer/hostrench.rsi/inhand-right.png new file mode 100644 index 0000000000..2ec0789a40 Binary files /dev/null and b/Resources/Textures/White/Fluff/YouWellLeer/hostrench.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Fluff/YouWellLeer/hostrench.rsi/meta.json b/Resources/Textures/White/Fluff/YouWellLeer/hostrench.rsi/meta.json new file mode 100644 index 0000000000..303bc9ff67 --- /dev/null +++ b/Resources/Textures/White/Fluff/YouWellLeer/hostrench.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "@youwellleer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}