From 6ac03d13858119461aa5ce7ac6ab57378584f8c3 Mon Sep 17 00:00:00 2001 From: d1nazewwr Date: Mon, 29 Jul 2024 23:22:37 +0300 Subject: [PATCH 1/7] salvage loadout Update --- .../ru-RU/ss220/clothing/Head/bandanas.ftl | 2 + .../ru-RU/ss220/clothing/Head/hardhats.ftl | 2 + .../Locale/ru-RU/ss220/clothing/Head/hats.ftl | 4 ++ .../ss220/clothing/Jumpsuit/jumpsuit.ftl | 3 +- .../ru-RU/ss220/clothing/Masks/bandanas.ftl | 2 + .../loadout-groups/salvagespecialist.ftl | 1 + .../Catalog/Fills/Lockers/wardrobe_job.yml | 6 ++- .../Prototypes/Loadouts/loadout_groups.yml | 1 + .../Prototypes/Loadouts/role_loadouts.yml | 3 +- .../SS220/Entities/Clothing/Head/bandanas.yml | 6 ++- .../SS220/Entities/Clothing/Head/hardhats.yml | 10 ++++ .../SS220/Entities/Clothing/Head/hats.yml | 17 ++++++ .../Entities/Clothing/Masks/bandanas.yml | 16 ++++++ .../Clothing/Uniforms/Jumpsuit/jumpsuits.yml | 14 ++++- .../Jobs/Cargo/salvage_specialist.yml | 50 ++++++++++++++++++ .../SS220/Loadouts/loadout_groups.yml | 10 ++++ .../Bandanas/salvage.rsi/equipped-HELMET.png | Bin 0 -> 578 bytes .../Bandanas/salvage.rsi/equipped-MASK.png | Bin 0 -> 407 bytes .../Head/Bandanas/salvage.rsi/icon.png | Bin 0 -> 515 bytes .../Head/Bandanas/salvage.rsi/icon_mask.png | Bin 0 -> 402 bytes .../Head/Bandanas/salvage.rsi/inhand-left.png | Bin 0 -> 400 bytes .../Bandanas/salvage.rsi/inhand-right.png | Bin 0 -> 429 bytes .../Head/Bandanas/salvage.rsi/meta.json | 33 ++++++++++++ .../Head/Hardhats/violet.rsi/icon.png | Bin 0 -> 402 bytes .../Head/Hardhats/violet.rsi/light-icon.png | Bin 0 -> 209 bytes .../Head/Hardhats/violet.rsi/meta.json | 41 ++++++++++++++ .../violet.rsi/off-equipped-HELMET.png | Bin 0 -> 575 bytes .../Hardhats/violet.rsi/off-inhand-left.png | Bin 0 -> 326 bytes .../Hardhats/violet.rsi/off-inhand-right.png | Bin 0 -> 324 bytes .../violet.rsi/on-equipped-HELMET.png | Bin 0 -> 594 bytes .../Hardhats/violet.rsi/on-inhand-left.png | Bin 0 -> 340 bytes .../Hardhats/violet.rsi/on-inhand-right.png | Bin 0 -> 339 bytes .../equipped-HELMET-hamster.png | Bin 0 -> 700 bytes .../Hats/salvagehat.rsi/equipped-HELMET.png | Bin 0 -> 670 bytes .../flipped-equipped-HELMET-hamster.png | Bin 0 -> 780 bytes .../flipped-equipped-HELMET.png | Bin 0 -> 734 bytes .../salvagehat.rsi/flipped-inhand-left.png | Bin 0 -> 436 bytes .../salvagehat.rsi/flipped-inhand-right.png | Bin 0 -> 573 bytes .../Head/Hats/salvagehat.rsi/icon.png | Bin 0 -> 352 bytes .../Head/Hats/salvagehat.rsi/icon_flipped.png | Bin 0 -> 377 bytes .../Head/Hats/salvagehat.rsi/inhand-left.png | Bin 0 -> 464 bytes .../Head/Hats/salvagehat.rsi/inhand-right.png | Bin 0 -> 692 bytes .../Head/Hats/salvagehat.rsi/meta.json | 41 ++++++++++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1194 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1738 bytes .../Jumpsuit/flannel_salvage.rsi/icon.png | Bin 0 -> 580 bytes .../flannel_salvage.rsi/inhand-left.png | Bin 0 -> 860 bytes .../flannel_salvage.rsi/inhand-right.png | Bin 0 -> 833 bytes .../Jumpsuit/flannel_salvage.rsi/meta.json | 30 +++++++++++ 49 files changed, 287 insertions(+), 5 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss220/clothing/Head/hardhats.ftl create mode 100644 Resources/Prototypes/SS220/Entities/Clothing/Head/hardhats.yml create mode 100644 Resources/Textures/SS220/Clothing/Head/Bandanas/salvage.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Bandanas/salvage.rsi/equipped-MASK.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Bandanas/salvage.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Bandanas/salvage.rsi/icon_mask.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Bandanas/salvage.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Bandanas/salvage.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Bandanas/salvage.rsi/meta.json create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/light-icon.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/meta.json create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/off-equipped-HELMET.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/off-inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/off-inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/on-equipped-HELMET.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/on-inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/on-inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/equipped-HELMET-hamster.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/flipped-equipped-HELMET-hamster.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/flipped-equipped-HELMET.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/flipped-inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/flipped-inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/icon_flipped.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/meta.json create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ss220/clothing/Head/bandanas.ftl b/Resources/Locale/ru-RU/ss220/clothing/Head/bandanas.ftl index e7af0aba0365..e19e6da1594e 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Head/bandanas.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Head/bandanas.ftl @@ -1,2 +1,4 @@ ent-ClothingHeadBandBlueBotany = ботаническая бандана .desc = Ботаническая бандана из натуральных волокон, чтобы выглядеть круто. +ent-ClothingHeadBandSalvage = бандана утилизатора + .desc = Бандана, которая поможет вам спастись от шахтерской пыли. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss220/clothing/Head/hardhats.ftl b/Resources/Locale/ru-RU/ss220/clothing/Head/hardhats.ftl new file mode 100644 index 000000000000..0134c98ed715 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/clothing/Head/hardhats.ftl @@ -0,0 +1,2 @@ +ent-ClothingHeadHatHardhatViolet = фиолетовая каска + .desc = Каска, окрашенная в фиолетовый цвет, используется в опасных условиях работы для защиты головы. Поставляется со встроенным фонариком. diff --git a/Resources/Locale/ru-RU/ss220/clothing/Head/hats.ftl b/Resources/Locale/ru-RU/ss220/clothing/Head/hats.ftl index 7367caeb0110..df563e83a420 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Head/hats.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Head/hats.ftl @@ -20,3 +20,7 @@ ent-ClothingHeadPilotCapCap = фуражка пилота .desc = Поймайте высоту! ent-ClothingHeadWarehouseman = кепка заведующего складом .desc = Не самая заурядная кепка главного распределителя станции. Вышита по личному заказу, вас никогда не волновала политика корпорации касаемо конкретного цвета униформы. +ent-ClothingHeadHatSalvage = кепка утилизатора + .desc = Зачем они носят кепки, если работают в пещерах? +ent-ClothingHeadHatSalvageFlipped = кепка утилизатора + .desc = Зачем они носят кепки, если работают в пещерах? diff --git a/Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl b/Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl index c60369d38596..aca3bf48fc22 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl @@ -28,4 +28,5 @@ ent-ClothingUniformJumpsuitTrustedLawyer = костюм доверенного .desc = Шикарный костюм для тех, кто следит за безупречным исполнением законов компании. Говорят, что вы способны навязать свои требования даже самому Богу. ent-ClothingUniformJumpsuitWarehouseman = рабочий комбинезон заведующего складом .desc = Практичный, удобный, не стесняющий движения и главное стильный комбинезон. У вас с ним связаны плохие воспоминания о прошлом начальнике - +ent-ClothingUniformJumpsuitFlannelSalvage = одежда пустотного труженика + .desc = Рубашка в стиле кантри для опытного снабженца. Несмотря на то, что она не соответствует корпоративной форме, руководство закрывает на это глаза из-за высокой производительности её носителя. diff --git a/Resources/Locale/ru-RU/ss220/clothing/Masks/bandanas.ftl b/Resources/Locale/ru-RU/ss220/clothing/Masks/bandanas.ftl index 1f3cfa4cd8db..da562f22bc68 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Masks/bandanas.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Masks/bandanas.ftl @@ -1,2 +1,4 @@ ent-ClothingMaskBandBlueBotany = ботаническая бандана .desc = Ботаническая бандана из натуральных волокон, чтобы выглядеть круто. +ent-ClothingMaskBandSalvage = бандана утилизатора + .desc = Бандана, которая поможет вам спастись от шахтерской пыли. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss220/loadout-groups/salvagespecialist.ftl b/Resources/Locale/ru-RU/ss220/loadout-groups/salvagespecialist.ftl index a753ad2ae2e7..4a72a5510269 100644 --- a/Resources/Locale/ru-RU/ss220/loadout-groups/salvagespecialist.ftl +++ b/Resources/Locale/ru-RU/ss220/loadout-groups/salvagespecialist.ftl @@ -1 +1,2 @@ loadout-group-salvage-specialist-jumpsuit = Утилизатор, комбинезон +loadout-group-salvage-specialist-head = Утилизатор, голова diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml index a44ec69a8e99..10f5ba1cdfad 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml @@ -186,11 +186,15 @@ components: - type: StorageFill contents: - - id: ClothingBackpack + - id: ClothingBackpackSalvage + - id: ClothingBackpackSatchelSalvage + - id: ClothingBackpackDuffelSalvage - id: ClothingShoesBootsSalvage amount: 2 - id: ClothingUniformJumpsuitSalvageSpecialist amount: 2 + - id: ClothingHeadBandSalvage + - id: ClothingHeadHatSalvage - type: entity id: WardrobeAtmosphericsFilled diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index dd54ebeca5c6..539e1e69f7b3 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -606,6 +606,7 @@ - SalvageBoots - CargoWinterBoots + # Engineering - type: loadoutGroup id: ChiefEngineerHead diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 37e749795013..ab2a7effc9df 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -172,8 +172,9 @@ - type: roleLoadout id: JobSalvageSpecialist groups: - - SalvageSpecialistBackpack + - SalvageSpecialistHead - SalvageSpecialistJumpsuit #SS220-MoreTurtleneck + - SalvageSpecialistBackpack - SalvageSpecialistOuterClothing - SalvageSpecialistShoes - Glasses diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/bandanas.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/bandanas.yml index ec5cf3677ed2..aaf732e8e491 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Head/bandanas.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Head/bandanas.yml @@ -4,4 +4,8 @@ id: ClothingHeadBandBlueBotany name: blue botany bandana - +# Карго +- type: entity + parent: [ClothingHeadBandBase, ClothingMaskBandSalvage] + id: ClothingHeadBandSalvage + name: Salvage bandana diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/hardhats.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/hardhats.yml new file mode 100644 index 000000000000..2d376d6ed9b5 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Clothing/Head/hardhats.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingHeadHatHardhatBase + id: ClothingHeadHatHardhatViolet + name: violet hard hat + description: A hard hat, painted in violet, used in dangerous working conditions to protect the head. Comes with a built-in flashlight. + components: + - type: Sprite + sprite: SS220/Clothing/Head/Hardhats/violet.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Hardhats/violet.rsi \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml index a779f5043948..f6c25ef46d9f 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml @@ -216,3 +216,20 @@ sprite: SS220/Clothing/Head/Hats/qm_warehouseman.rsi - type: Clothing sprite: SS220/Clothing/Head/Hats/qm_warehouseman.rsi + + # Утилизатор +- type: entity + parent: ClothingHeadHeadHatBaseFlippable + id: ClothingHeadHatSalvage + name: salvage cap + description: "Why they wear caps if they dig in caves?" + components: + - type: Sprite + sprite: SS220/Clothing/Head/Hats/salvagehat.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Hats/salvagehat.rsi + +- type: entity + parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatSalvage] + id: ClothingHeadHatSalvageFlipped + name: salvage cap \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Masks/bandanas.yml b/Resources/Prototypes/SS220/Entities/Clothing/Masks/bandanas.yml index b91e98f2006b..835aba692d04 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Masks/bandanas.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Masks/bandanas.yml @@ -13,3 +13,19 @@ tags: - ClothMade - WhitelistChameleon + +# Карго +- type: entity + parent: ClothingMaskBandanaBase + id: ClothingMaskBandSalvage + name: salvage bandana + description: A bandana that helps protect you from mine dust. + components: + - type: Sprite + sprite: SS220/Clothing/Head/Bandanas/salvage.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Bandanas/salvage.rsi + - type: Tag + tags: + - ClothMade + - WhitelistChameleon \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml index f338b4fede04..e27589fbb6c1 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml @@ -206,6 +206,18 @@ - type: Clothing sprite: SS220/Clothing/Uniforms/Jumpsuit/qm_warehouseman.rsi + # Утилизатор +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitFlannelSalvage + name: void salvage clothes + description: A country-style shirt worn by an experienced supply department worker. It is actually a violation of the uniform rules, but the corporation turns a blind eye to it because of the benefit it brings to the wearer. + components: + - type: Sprite + sprite: SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi + - type: Clothing + sprite: SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi + # Syndicate - type: entity @@ -217,4 +229,4 @@ - type: Sprite sprite: SS220/Clothing/Uniforms/Jumpsuit/syndicate_diplomatist.rsi - type: Clothing - sprite: SS220/Clothing/Uniforms/Jumpsuit/syndicate_diplomatist.rsi + sprite: SS220/Clothing/Uniforms/Jumpsuit/syndicate_diplomatist.rsi \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/Cargo/salvage_specialist.yml index 03aaec9d8f1f..c59273fb52ae 100644 --- a/Resources/Prototypes/SS220/Loadouts/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/SS220/Loadouts/Jobs/Cargo/salvage_specialist.yml @@ -8,6 +8,16 @@ role: JobSalvageSpecialist time: 108000 # 30 hrs +# Flannel Salvage Time +- type: loadoutEffectGroup + id: UniformJumpsuitFlannelSalvage + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobSalvageSpecialist + time: 252000 # 70 hrs + # Jumpsuit - type: loadout id: UniformJumpsuitSalvageSpecialist @@ -29,3 +39,43 @@ id: SalvageSpecialistJumpsuitTurtleneck equipment: jumpsuit: ClothingUniformJumpsuitSalvageSpecialistTurtleneck + +- type: loadout + id: UniformJumpsuitFlannelSalvage + equipment: UniformJumpsuitFlannelSalvage + effects: + - !type:GroupLoadoutEffect + proto: UniformJumpsuitFlannelSalvage + +- type: startingGear + id: UniformJumpsuitFlannelSalvage + equipment: + jumpsuit: ClothingUniformJumpsuitFlannelSalvage + +# Head +- type: loadout + id: ClothingHeadHatSalvage + equipment: ClothingHeadHatSalvage + +- type: startingGear + id: ClothingHeadHatSalvage + equipment: + head: ClothingHeadHatSalvage + +- type: loadout + id: ClothingHeadBandSalvage + equipment: ClothingHeadBandSalvage + +- type: startingGear + id: ClothingHeadBandSalvage + equipment: + head: ClothingHeadBandSalvage + +- type: loadout + id: ClothingHeadHatHardhatViolet + equipment: ClothingHeadHatHardhatViolet + +- type: startingGear + id: ClothingHeadHatHardhatViolet + equipment: + head: ClothingHeadHatHardhatViolet \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml b/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml index 79c4e39bc542..d396ae433126 100644 --- a/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml @@ -280,6 +280,16 @@ loadouts: - UniformJumpsuitSalvageSpecialist - SalvageSpecialistJumpsuitTurtleneck + - UniformJumpsuitFlannelSalvage + +- type: loadoutGroup + id: SalvageSpecialistHead + name: loadout-group-salvage-specialist-head + minLimit: 0 + loadouts: + - ClothingHeadHatSalvage + - ClothingHeadBandSalvage + - ClothingHeadHatHardhatViolet # Wildcards diff --git a/Resources/Textures/SS220/Clothing/Head/Bandanas/salvage.rsi/equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Bandanas/salvage.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..3b08ef4888d62690f2494145ffb066e4878c7240 GIT binary patch literal 578 zcmV-I0=@l-P)Px${7FPXRCt{2+A(OJH0)pbuDP(P-gM&9@I0#59Lc2t8{2a;)MHKIayWqk9w}b@V`@Wa= zlI8mVB5h+gl_YerSVwtP1RI@74FFVWHcxaCZ5r z(R?f4u~itmsr-Hdn(Y4CYy0Q>UwQHHv)sNC5fKp)5fKp)5fKs5KQyYR#l9o=9(0gr zLH(?(3Y^RiTdB`^b|k7I3;_MX1mC~@!1H%swBu{_2Y7ZQvG2&NI068ShEsGqH`Q6w zuv)3rjonmKMY!9sFd9w)0JGuQ#+s<6kfkMKv@+4u<}!&7HAqbi=UT2 zq52h?#9nBCDo3Bp4mZ@|)qNA*WaS9acI;$z&rW2Wh=Njonr%s;S)O;D!g!J|uSKk}CB*!e)|Tw!tG ziGUL~cDD9CPjbrCuK0Ob>~Gz+<~z32PpAH}RbpWH6Fu$Z;YR7q-!~>&yj**h+ji;Z zNUiho+ugFKt-POSX*75Fr&+yE4!sk9Z1mMT*X+xbyzO(6Z00VP=3koGDE)F3dtF4@ zr23y4>fZtl=cRCWPS(0@Fnxc`Rc8%b!~K1}@xS+q?U;D)s~pfb5YRA-HE+pWzw-Bs z4VGWNsy1K!_{!b)9IvuIT9WR&skP_o xf>%NN&BB`BFY9?*zVuIqbbP(|R;WAv=*DX;pOwY9?DPx$y-7qtR9J=Wls!wsP!xuric29bg|>o1Fhd3fMMNSv6%?Et1P6x>?UKP?AP#-PE&CAvK#r{$Qw)f8QK1ynN;|E_W)R0P7fsxFd9`n zGpPW-k@{$A65ILaqP$I3(Q%q$5N#kr21@xE=||X({|r8RC#$GqdMgX2Vacqb1912- z7pOB5Ccd*WC6|`d+*&2Fir(>c8v<~e0=rSgG%V>f1y8jb4j<+creVn**8?FL*jbs9 zvx^yCpUwjf);&S7aM~)yz48PHg%30}Nq#?ta4UT?99jcm;y&%20C0J|4nR)T$*Eg1 ztLULm5NP1)d7hjq@ZYhUx+gk{?(^M4OD%MCfj+(=bLtkRVac<{&7LOuc0t`6ys~|S zTS*AF0>Ikzk?hr?p+y+hR^8D9*o|u7{-F5~Y9Po&FY#fCG>G~Q7`OHX5UJ`T8~D3S zYN>_5!*-*JTl?bp{%v4kpS}n6@r}SCGEBrVF)=aS`~aK^vn`RB-=6>g002ovPDHLk FV1n_+<9Yx9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Bandanas/salvage.rsi/icon_mask.png b/Resources/Textures/SS220/Clothing/Head/Bandanas/salvage.rsi/icon_mask.png new file mode 100644 index 0000000000000000000000000000000000000000..811589cf3527facc0778e7b28aee887dd13f1863 GIT binary patch literal 402 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^TWX4=ID81M&j|US(DDBC|*r6_LQHK<*{{6W8(>d4;Qlj>YrcT7T#;o zFLik3^XL`wOmb0c|DRQ3x{Qxm`?;Y>ACYL zXzfrtmi2%82C>u`=JvB4=df3Y?DKRRp8O@ tJUl6F3|n>7r5~)C;C4_$g7palgZZ_lOEM94>cBu|@O1TaS?83{1OOP^tg-+A literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Bandanas/salvage.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Bandanas/salvage.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d4ff074ae678772d874f883c6079dcd74db9d9b7 GIT binary patch literal 400 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zy*ynULn`LH zy|po`IY5N%!TzPmbEVZ456iw|e!*NK_)6r2u|*nR>!hRXCvK>pcp#(kh106+WkLG^ z*}0-d^Zdj#8_kM%uKv5P_TuBb$48(3V-SRbiMwnxQ&0T$irol?xl-SZ?7-^vbM78R@ke5Pix;U*y$S_ z?Xmsk^X*Hca+MHZQQ+*5eGg)uKND0-4|>=&KjVqul~0V*mrZpKu$0?xa@OXM2K$1U n?h+}rLn`LH zy|p*1IY5T>!{tkc=Xxhkc*s|-`+~V-;}y*b=>=zGxKz9OCm7Z?q!sXq{9<`~Z7D1J z!@hG|lKJY*tyk9H3VZrT&2^p3`ue$i4lYo@a-Z{Sefo=_#m_&^4d{Luv)f4GsM-#r z3rSYjd(9N%zjW{X=kt2{%To_dAG&+$<=+sX)b6Q^yPt>7)IX&c)zgDG(tP6X$EO@_FKeIqwdeP1^SLR43=T^JU+(&BWxhXFr~ml2mkaYJPq439 zH)H#$?a~R7Oj^APN2NAeCCKMZND-W*)0EmVU-jLL)Q;qBwL2Ww@J&eKof?+D*7Vdm zo|2Dlx2LS(f^cxrp=Yh}g%dZdnAi5KG`?_4z?wPK>o?C?FbXRj(JnI1g;n)#EO+kGqM(yem06-(GUIyz3(GBHa``(3c- S$OmBfGkCiCxvXPx$Oi4sRR9J=Wl)p>EKorNnijy?8bg6L(?QoQ?g*ZFeA(Kn-FYu3W?%xtbaLQn( z?18LO-jHyMu|q@11vg2jL>p~$hl0y})_3o{&%OHrXfztlKXas-Fq|VMT-umWVH6oYFO-G*l93J%Z{!lvI6;>1s;*b3=DinK$vl=HlH+5FwN7&F(ktM?L|jE2Ll1t3;tQ5<%eu7TZAtN zJXhR!Ipx9`)~HU_|GEGE_!!M*6ciNv8@Eg{S7Ppqj%Dj6y;qs}%rzxfb;qZ7ySk=j zyJ@av{U&!~*Mx=YRbQBrxhm@S{AW^9`X%syW%g>tlPX(;X8~ BM+X1^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/meta.json new file mode 100644 index 000000000000..aeb89940a86e --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "220 CLA", + "copyright": "sprited by dinazewwr (Discord) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "light-icon" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/off-equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..bfcd506a5a269fe80e23b53d217dc9e003cbfe43 GIT binary patch literal 575 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%ze|ow&hE&XX zduwB!u%iIm1AB+ooJg+Lwcm3=cF`JSo=V+PVKi+v%B_y+)x#qs*kwPnnttuH) zo}Mxo?L4M@cDj0D%Yu8Z7V?jImaouBxA688R7+<0s%PhaKkM;o z-$x#%|IE$pjDlX@-22vyVL_nSpK1OUhHSoqHfHAyeSNkGe13d*Z9J>^{))dc<-A)z z=GQP?oBYo*>7w4e1aW(127{Z@H;z18-xL2}bEOgz_%**``ovFDANCWG)L?sgs`3^}xHNLHujrwwFL< z>W+669x^em_UkRMi!*n7quk@f^47t4>8bVY)*Ook%FVdQ I&MBb@06z8phyVZp literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/off-inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/off-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..4ca0fcb1fc83ef63b86a905798ad219160fcebdd GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`7zg--xNh|j zx>u(2V!E5Dxm|2*N|zFYx|Uu}lowDQ$N&neNdy78Kq(Kc)^zjLb0|Mtdmll%Jzf1=);T3K0RW1V BheiMZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/off-inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/off-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..667274ab50dc50ea10c35b4faf0e3323e22d4c33 GIT binary patch literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`7zg--xNh|j zx>u(2V!E5Dxm|2*N|zFYx|Uu}lowDQ$N&neNdy78Kq(Kc)^zjLbd(E{-7)t#7Ygd7m>#}&n5Z2C@xgUJeQSje^A8A%Zfg1{@3fE~=voF(S3j3^P6VB+y~aSW-L z^Y)g0j&Pt1`-k@&U0c#Rwl&3G((%8N_jZzMb`Z0u>6HmwO*0ajcJ7?%cjc_k%(+es z%8VPmza8J;qac+f=x<^vaGdkpm!{f|cjY@}C%nB|Hv7SE&#ZU1e($~i{@&`Jf72#7 z?lv=cne85Lp1#TE^}5H=|5wCHODtazpta&hlt5;MaILoMgddrakMExr+7l9B(Q_@Z zzOw6ZhV0U&rr?nJT4Qt1sk_-2yjZ^;SFgN(tai43|6xI?seEnwy0?aFN5suJe5+e@ z&;8PiD@s0`tWK7`f6GE9GIsx&soQ(B%6&`A7#SXjh}Nx4w#l_F->%N7Z((lD>ef?YlbuvfN}o{vnNp+a6gBNhX9ohjsGqd6cgh=<`>x(v zH&?T4I?oer&!DF!?;_=Vzt#L=hNbP5 z>9d|C)T?ioY;6838yufCYue>z^O?u^lxo-hWLe$i`RNiDyTJC<_kW(>csKs&r$;h! zVe_AD60YmBpLITdU*h8Z?demm7kb<56ua#y_?nTElf_5fv~6FtorGb3??1V1zgL^} zZ&5lqyFf1gux?1Y_=OcE0xp-8Ji70=Eo1ClQfT2+RFL>$_s&0>UNxQ(lm1?xWufli ef&|3>vZ;Unv5EJ}k44ofy`glX(f`*aY~5xNh|j zx>u(2V!E5Dx!vYf6T6fc=1!}AdvASgY|7%yQBt>jlTtX6h`H{`}uR ztEX!nTW*NJlY83_72SHHI`f=-8WRJLRXbl0{2m}rCOkZ}WEn%2+ z_|^p0tc{JjdnYhV+ZDN0l3nq0)7fYHz9rYmd`QZheYje`gPGw#cmsFv-c8r{{y!WB O((UQ$=d#Wzp$P!t9FZFU literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/on-inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/on-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..1e55b34d4cb834a3e8f233c02f8f38c2a9e2b143 GIT binary patch literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`*aY~5xNh|j zx>u(2V!E5Dx!vYf6T6fc=1!}AdvASgY|7%#zb3>xHJJZ>>1)Jo*2> zwDZg*Tb@O!2HUFdvlJUB9eG)2D9p&jQpfGEWbvyl`>x8)z@*8H% zzNNZ{Dek><)M*=z1FP@ecwQ>dvGc7w|4nxP4}a7g);?C+|6W$$hyMe{%s-p1f4;F< Q6X;+DPgg&ebxsLQ02d68H~;_u literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/equipped-HELMET-hamster.png b/Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..23746ffd7376b697de582f8e05c04cb3ae2dd641 GIT binary patch literal 700 zcmV;t0z>_YP)Px%c1c7*RCt{2noVdEK@`XTBL-^73JNw=3Tb=T(lj7mq#!*>z}^JCc zLkkjwrqF|j9>t3adTGI%f_MxBOGzzhOP8{`p#4Z72RB#*VLaFkZj&aRm$ehj`#~U? z4OogsOp*68An39K7^gzU;Ua``3Si&=aVx%%!-e|YuaTvfefL;T}hBGo|m^JNjGcE4FC{#ZO zIr8)4iMrR|j%(rV+7#)bj%0KrJ|km>iD<;c;}4ew06e<>Ne*4Ti-Fh~P2^@77pWjYlW9vBp$S3`S03e!Om^P#DkDu!F7z(EVO#6Q0xEA^U0Sv=148t%C i!!QiPFbu6yvptvym0CO0000Px%SV=@dRCt{2+CNAeQ5*;G?-c_!cm*BQ79pD9#OP9l;^NRD&}`CnZkJL7p@V}% zySOw%$8MD_?O>O*I0~Hwu>>80;!#cyqWL4-&^sbU;dQBhPA|5<7w$d({66Em-0%JF zo4ZRcF95sQ4C)R-2uzL@L{EoxJXQ;AbeS_o{=0Kh*dUh<&2f>a`7_q6@#=GlJnt=P zbGhMsXmSAP>9DZ6`$D|Vrm5w~&K~^H{Ok6tc>ipKT(3>0iNEhSCZ49SP;lY-?_|nI zaece#ct)ZgIRM8i!tsij$|m8s`{=!!#Mjan0Kolw5*|APL~g5>>Gh;8f$8yt(cO1?*G|;SflMi~YNa8y ztr@9Lf&PI(+%e72_%Gkb_SWV};TS&!E<&AGDgYT#jZtg05^6J2mw*a!9BdTw_W%`C z9XxPJ18C(QKy@htP>BQ3-GFW!fbIr#Qx<^AJ39rR0lFK|P1&=6DzX10cHM9Qx*O1q z1JK=oZXAH_26W>9bT^{ z;f}n+qs&{8GA*24qaS+k66w@!EHCZF8p6tlhr)69v9U528m|R5T;Imx`Ww!;rLF287(71h zhmy}DU*mX1*wt_9mX#P|j4{R-V~jDz7-Nhv#@H3|2LqS3LgE?qhX4Qo07*qoM6N<$ Ef`Ldwr2qf` literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/flipped-equipped-HELMET-hamster.png b/Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/flipped-equipped-HELMET-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..1eecf31a6ed44b7e8db8918ab7e8d3dbeec4cb02 GIT binary patch literal 780 zcmV+n1M~ceP)Px%#z{m$RCt{2nm=e0Q5?s=CkARr1ReTE3TZMVvz3a8+_kn}s zy?4Lg@4oNe?|1JwfMFPhVVG`3p$ry6001V!Nzv!>*V=dYRgCy&mH1)-ilP`^bE+Wg zYziR^{a<%KQxczxP2<~fi5kpt=K#>>@?%w<74zdEsyQ;zV8YOUZYw6HBR;ad%hU@r zU2WMuLUu35(TwBaV-G$iHB|JM(zeI~6f0R$yV(>gSrjW-Oh%k2Y6s{aaNn-Cj1tG+V$Ezp7 zwqs-tN(@xN$z{+EI=wlWGJGKf=oFb8L{5V9;~~Ts3r+3sr^96DGE7H&7`@wTnmw`r zb6*d!FnY(ZZ%;o&{L~?}C!Z;yf56$$CR>4|szAFeY&VoDU}_mWFIc)6`rlvy><++g zSOB{Nup1V@?f~qj>jkiAi-E; zq`nC*zrHVu+5y&<-{8fUn+gCtfACH0?yJyr6`xjTI=0(thO4t!-(S7?K9|42@9@2+ z@OiEvohlptq;V2bWiXv8BcCbNf&kEPZZ*gK<})RvQ)MYzq$M!q4b-M%*ck&b)6lQ! zs-^!4w6dMsieYWzEdYo)ZvZ%hO&-HA48t%C!!QiPFbu;m7n8pzENameKy;-50000< KMNUMnLSTYc3SoHw literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/flipped-equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/flipped-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..375620d2f46df0f0b4c4086339d14900daa15e45 GIT binary patch literal 734 zcmV<40wMj0P)Px%m`OxIRCt{2nm=e0Q5?s=CkEP(6YP*y30%!^(j|=V@RqZUaoa#8oaD(=NfZOPJ3^VOniWT#DjN`4s@*+GTz{ZUg3X`$|0V z#r0aF!k+*ycQV_``lkqcxuXI*KLL#3`$!p!GZCd$<=5jjpjK@Kx+apvnTQfk98dis z8kJ@stw5uIr(g)9z~q&yxS*;h>U?t?9DLq)ZR4r!HwjTU6BYv-2LCt60NDx1h71rT z6vi}IYJA36-{aZ6w6A)DI*!Np3%vre6Oaw}RCr}JgN3znPxM5AR973b^@{qG!yjV zwDI?Eoks{aKqPKviZ(Jd0|xPPxd?{-J7DMy2=offWs5z1*m4Zyr`LTiuFgU}U0|B3 z_mm&)QQ(1lHMsTs1~aWT_O@P}xL$7>up9&LcOUoF4DvVI5jRs$n5OFJ-Xkz|{UMUt zC^k0^dp2r#!QBHkHx5y&wqQ5i_X&hWy(|8Yj}0^`QEnaIJwTh(JCAKDdf&BPx$Zb?KzRCt{2+P_NzVHm*i=ORHumloTi1_RHn!ImJfAh#$QZ8c~J+FGO~cY~my zC4v_F5BdunB!wtA;>gj(B`KodX%G(uGpkqY>idC%mwWHtd)^;+9Pj&z000000000O zHdPf>_0pL{L9@w<4&&J)CJSp-qFp9Y(0tnNn%7Or&S@kRH5pb~)c5MOx=$J?^tC%S*fU zlDPGfY%Pt6TYZvz+SbF%8FA|+lc9QyHo$v9ekS;}_?2~j7toV(Sfu65C78d&=-S|*rRb>Ke eIspIx{HQmam3p){Yux|<0000b@?P)Px$_en%SRCt{2*}YG~KokJ*cgBGboWTi5OpU^>qY0AeW{i^wIBLRQpaXGHHxif_ z+#UQ_{R3EZAb|u-=+K0XE-a83QTh4uhGX_tmlU zUZr)bphS*oF5LpH{RxrvAUro7OxrUPpmnRJ7x%hcxfNZQjhL-;a_z5P!ZU;)~*kKhR#L-d8CQYwd z$|j+dO+qZbX?Ga2O%Bq@F;AnvQ_LhF8dDs{B>f{$s2E)RneQ|=?%+IMmrmouw*Uhs zKy(12VFE-4Ae!$JFt?8(FVqRF@cj(H1c(kmG~XvcNPSDx0x8wEfRH-CqPS6Suu}(E z%6b5A9bmxr8o*P5wR;V>Nwo$nile{6qnVuCMsN32cx_%uvwOn*Ef5YVQ|Es7;-yFe zR{}2g<5ZVm%X}8wcPScEhEskkc*bm_b*rFuUZj`-2qAYcy|4wBIJ?1hMFdZX*LAxKsUO?!%*>joQlR?>5lc`~98H;kDwgS4`$s zQF;0xa=pFdq=#20>+^s>l93J1bie&c7XNixbxwB{HSB4+Rj=vkY4QK&=jR3A&d;~s z@T&6TAHj<^XFt(!DB}THI9-3jg&$vj8XrE)zTHFbMn}bP0l+XkKt5T5> literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/icon_flipped.png b/Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/icon_flipped.png new file mode 100644 index 0000000000000000000000000000000000000000..f2cacc22cd4af9a06b5b0f4e5560fa87400d72d7 GIT binary patch literal 377 zcmV-<0fzpGP)Px$Gf6~2R9J=Wld(#}Kp4k=6`=}u4js~_6eAsO$RLQQuh79s@C^iK7Z(?oK7`=l z?hE(=g1&%5CL>~6-Ar(eQ^HkpF_#K1_nQvByYKtue>reC9FBjcV|(EA;5Ikat{#uA z`&k{BgwuTAKQz|oS!6BKSYQ%P^FS*4LN(ey&!R>WD@_IT#!cu8ReN0ptF{6riJ!^L zvxqqTUDiq;G;DNuy%L;j-Hj{;cGU@vy`wQN)cEEtg(wbE|H(eZEj!15{@8-C5 z{I7v=r+%kfNzT#!U;8d^_K~^ivM~Ff#i1a%1J7P9ES}o`+%q%tc7{oBW0s9HyHM|o z6U$HetpytLJNx=6;TfT^7q)a=NVcBj9iDj2PGC0w<7Gux4c#xBoR`|Veg1(r<_j;H zSRD%ulylIFz3TTqswi?6vsXNW(+{4|4ZE*g>U;h7s=?Yv4v$?9fBt9q>&WWc|F7D^ z+}g2+wXF8!ULCV_OE+}B;bE0z{_vaW&$su?GiIsX=)NoS_Gh!%=>u#Ju4zvQ{4YBt zzt68Jdv?tdmSyYMZDQAW7d>XV*unQ*vgzAq&cCyEnLl{=PxR~b@`$tVj9CuPk>{x4 z7ZB9Z(PM7-ToQh$djC1owMsp|av!|!1lr&9Q2O+zR=?Jj=|aFLV(@hJb6Mw<&;$U% CoY?6A literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..5532eb9974396ef065a8d180f3859bfa7e1f5bfa GIT binary patch literal 692 zcmV;l0!#ggP)Px%Zb?KzRCt{2+P`ZPVHgMS?}>pD64&UYS*~CTZkk1?wt{Ygu5}U`5G=TLDI(}3 zfeJze7cFFI{sVF9;tzr?RE2N^1A^KigAqj{JPzf;dGEc+-Fxrdz4o3DWXK!t?s=Z~ z$NdVx7-Nhv#u#IaF~(S~SpEhgLZjZMO3B8(muH0E0bq5ps^#FvPZX85TiJZC<@f+_ z#NTkG_JArSTiXHBL_|W{^0_TqU#dyB5efhR-+pv4vaaIw#{77Xmrvgp_imU*y-jNi zyW=?57IvvpvhksNR~q|Ke?xE3L2uB(txHAp`oFNgRHMf)X3-mTl8RfK{;&(+px1$e zj`X$%5ejf^?w!?g3iNcR4D9>?FoWMSd$@DHV6AK>5w5@_^b15L&}b z0TYw=YHp8ktXv*{|2`a||0(!X710_9Ja(=Qwz}C9;FdSW~2o;?1{UC z0<@e0;N&BDK;xC*|B4HcbpTo80%RRP)?(cZg{AZU-D}dbzOWJ>0ZApV3r~SK8{dAu z7uf#j#$24;rb>AP$daG-n`x8^keB-e#$uTCe9k1fKMh7M01^GuyY6@Y2hek+mNcbT zV_veMZdn$HNa*qw%L=PF~%5U ax%U^JUdfEgBf&}l0000Px(WJyFpRCt{2noVdMM-<2Z8`7>~OHN}e*-ID3C+#gF%p7s!Q#I z@ukH*x##p^a!?@TWJAD*mSR(Iz#t0kO(9JVp*YYla4}tilnuozRcatw#g=fw>%m!J z$(Fpcs^fml4+b&o)%@O!->hKY00MzPAP@)y0>Qp8H9=FcWtyFc($4F%6H%IqEfZ4{ z)a<+eRR0kkdDXWH(>8GGj317SsR=rD#t+jrQ1z|ipcbLgACDwS4>5{Il5P2qy1j8k zABSlhxS(A@SWjatI)mE)jYVe=)<4As?FwK4y24=OQv5UI^gF)BKCj>P0(@sKq3T-& zEZ{PLht{_+aw$CQ9;)@%HWrY1I_P0~-u!DD3%mNfe%D*T$fYE?G6+4ukTEx*2N;-| zsO!s>K^VD|#5p(5{<9sEZTnp>fD?pi8vp>)HelpZXy_lvi|4t zfFrlo&6-8))wiSV-2eMT)N~Qtq;E5S@X;^$2Eg_GL#Tu6S3uP|P$(84%f7nnvg|{l zSb(Z^xEjan^P!c$c(e;2$4|ST%qzIIz`q5aEx?rl|3$Ex203D zWm>u#qg&|#=m7?=i@=4VD9&mVQxmi@KV0j#GcIQaP&|^PmHA=kR0zc*Nm3N$;7*7* zU++Di*FvOYpuLHolXXL^?H6O%G3nH-9tDoT|&m(#QC0SFg4+IIJ|iG ztZVQ2o@r#vO&pglA>2LGmY2IW=e~@jia|K3nVOtS7rBqxI_O5A|c+vZyPt zeJ%h1#@;UC^Phbv*)|?$f8#2Tw_O-icCng9R* literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..2e581aa9aefccc05c2f17ecefc8febaceb2c3005 GIT binary patch literal 1738 zcmV;*1~vJKP)Px*gh@m}RCt{2nonpHR~*N`Q?)b3T_GWx%xZ9A4kJlcD5NC46q-V5z$MD|&_pPU ze~JYUt=gM~AQ-A3v^@kO6-wwq#TtmDV2Nm3PfZ($xEfq!&4i>gM%lp5u1!WAYfTg_!glO_6G5X-L{HlwY4nNM{U(AIVLMuD zqUdWMD7g~~>04X3`df<;*SQ!b<#EiUM*!@~wlZ-0@mT=K>o;b?%W@!ufMJ+5^%u5` zVp8^|zpewig?>nC9D-j&A{hdZL~BhHoxv~wWLp^kCctJw5E?}QQ3#D9;>xJo`!}8N z#e2UL)Sr~S>#ykmk&lpj(p3P!^wMQ0${Z3>mtzDZq*}z4QKXoEu#>!tL~_b=6zmIr zVurGlzO{9$zor9nf1F)g3#O+n;H+*^ugj&c$#~x@v})&cy)KdJcJ7eQWDhzvyic07O25#d!^ECWLOGA0i(?x6ltZ z6T;%W29b|Y8{k&IrLM!)y49zS07c&G7y*jBT#*Pc^b<+gTDSUC5l~xSkLz>WkkXPk zcIFUbGtY4B%ps(-B(BeGLv4LMwE<4Fh+@J1;b|3H-UeR0{?pbDPpbugw-!`S=pR07 zCs(F906l!NSOYxI-t3E)FUZRlh*Lbu2N z1mvzc<8vh`fi|dfFh@nQkNaCrBoG)?0l_MltZ6t7eMyhz}UhMW;imSJXg4& z&fx75wM{c$M70I2YoqhYmMXh z^|@_SWB#ukP!6gN*k}VbnoaKjSN{b7;PQ{>ap7XpJk6c>{2LqyzfV0*@4=6$zJLGz z-}rU>J}z85?Rb4DnWP%ewF64Ut+C%WRDaVifpVYR5SuCf?Mxv;t$Rygi8Gr%0;&#h z^CO{IBt30|Wl4j(p{H$-2+g7^d#HB-k&lp;nhqm5N}>mE;rF{=LsH|o{rGIzpDDn~ z4f{oW@ZlwljP;rcQkI{h&PCEj0BNb~z)X4s*B+h2OnL+(W4$^G1lxgwWSM008J~AE;OaST$*9JQvz+kias-ab=Xb29T4xG+cXhuI%Y?Ao~nR zB&T4}%$9X$_l z>E>Z7aW`DLc^Er-9$00NtWUu?(AB>(^b07*qoM6N<$f=*5{hyVZp literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi/icon.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7e5c8e7f725e05600dd60ee8542b406237ce5c5a GIT binary patch literal 580 zcmV-K0=xZ*P)Px${z*hZR9J=Wl|5_QP!xtAm4X~24>ne;e1KvPH~3>K)KiBHg+eoF2xKrCvt{Vg z(#(c-DflNeONW4`7786Ybj~JP;=#5cR3bJC1XFBExE*ALv<>vSWN1Opa&?XlNAG!c zbpnreLqhx>{2P*o7bzMvx@ux0NeEQc+77k%2`>~wPFP*SggvI79UuuB+}Z*(9GzF)RKANVs6&89034`GP0JCUnqwz>4LjDHjf59AWKIL!BMJ)6Mq@<+$6Z`;MCdjzh SZmNI)0000U>5UqaSW-L z^LD1ahjgOEvH9z_-B_V0p*8*V1@FG1gU9?1+Fw}e%*Dkw=|NCeQY?%6@(Tw&cXKxd ztBRBeK5vrURkEpR%hse7^-4)D-4~8UIZxc)tftcR%)9tU<(Iz)1wYl@Ib41I``y~< zHVlUic#zOk2NwmUGitX^emc4$v|lvq=PtnwT=!4E6cFrbXuauTEqXobtAtK`PuFYl z^Sdif6rAQ0ZnJuJ!X(CEuON%GvTE|Ohfd4Q+=Od&gQ9@Miz~-~a;jewl3A9SGhHr7 zT#@Ye?v=`hqYWiytPB~KcW315SA3ay)6p|FrLD&`ci!V>h_LlbDpFK2&7RD?P-ySE4;H#<&rW`E3s@t5 z>G8HTOwnNu#j*Bgm-b(bxz2w$cj4!U5_ec*uasJ7%he9??POWj4dEwe0Y<96RB-OK*6dr4+d-MLxgXKRo+7{Xe{8p z_kUOa;>C*(ML0V%&%2VJT=i6B>(=t4*Pca1?sYI|iFvnVOW40WaoqT)`$J3Q6z0*AVWhe7Iz0cCg(U{ON&-O?2_4)k|1^Xx7n%(}i z`yqSnfo}KG89&R|8CPx%`$OD z&`G-sf}4awUBtOyhwiB$rB)(nOpyv&92#qLgS-y*Y%bB{cNf$1@O_qWzsvpd?%lil zg?j*Fj4{R-V~jDz7-NqY5rK%Xo*5!Nl%j!f>SoLwS0nn(ws}nDryKDS5!8r|^~?}e zjtzuU&_gMz9Iy7IdSGsNgEZ9#Eto*GCt=yAsXmM-i?lq|-@3DMV0o$^Bg!Ias?RbW z?MXljCZMT4%nfhcdWC8dP%P~O00zTj*g4;(!QM0g;C1pdRqlUi%(%=r2Yb`k@rTDO z`>RR_88^9c-`~Yf+?6Z|2ndM7^KAgv z87r3d@&4;86ifRsGkkcyjevk?@%h-&Ox*328v z6N$!P80Cg>pL{Qh>iKIb0DxHAy+Yxr0021qaRvY=92Ky(dxe>Jn|NqdU>If0#M|n| z4cz|VuBiYgnz{1TzwM*~?2xH|rY2+#IavknL(>)Db({dV18^HB!0iCs*53Fla_l_8 zAJWqK=qrFR#u#Ia)#J6Uu^rNXg}vA{mLZ)0uXc?akxGD9yT&r4E5NH=<3^+s;MK0N z45=3)UhNv+8#lYgttR~p@M_n%5vhCD&8~5)*?A}Exvnu|j5YEH+Y40`0|EE~00000 LNkvXXu0mjfu~dp8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi/meta.json b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi/meta.json new file mode 100644 index 000000000000..23ad21cf2f22 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "sprited by dinazewwr (Discord) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From a789b3e70acc12f172282e5607da3522bf31319a Mon Sep 17 00:00:00 2001 From: d1nazewwr Date: Wed, 31 Jul 2024 23:20:29 +0300 Subject: [PATCH 2/7] Fix salvage loadout Update --- .../Catalog/Fills/Lockers/wardrobe_job.yml | 7 ++++--- .../Head/Bandanas/salvage.rsi/meta.json | 2 +- .../Head/Hardhats/violet.rsi/meta.json | 2 +- .../Head/Hats/salvagehat.rsi/meta.json | 2 +- .../equipped-INNERCLOTHING-monkey.png | Bin 1194 -> 1212 bytes .../equipped-INNERCLOTHING.png | Bin 1738 -> 1761 bytes .../Jumpsuit/flannel_salvage.rsi/icon.png | Bin 580 -> 590 bytes .../flannel_salvage.rsi/inhand-left.png | Bin 860 -> 848 bytes .../flannel_salvage.rsi/inhand-right.png | Bin 833 -> 849 bytes 9 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml index 10f5ba1cdfad..58e4c1aa731d 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml @@ -186,15 +186,16 @@ components: - type: StorageFill contents: - - id: ClothingBackpackSalvage + - id: ClothingBackpackSalvage #SS220-Salvage-Loadouts-Update-Begin - id: ClothingBackpackSatchelSalvage - - id: ClothingBackpackDuffelSalvage + - id: ClothingBackpackDuffelSalvage #SS220-Salvage-Loadouts-Update-End - id: ClothingShoesBootsSalvage amount: 2 - id: ClothingUniformJumpsuitSalvageSpecialist amount: 2 - - id: ClothingHeadBandSalvage + - id: ClothingHeadBandSalvage #SS220-Salvage-Loadouts-Update-Begin - id: ClothingHeadHatSalvage + - id: ClothingHeadHatHardhatViolet #SS220-Salvage-Loadouts-Update-End - type: entity id: WardrobeAtmosphericsFilled diff --git a/Resources/Textures/SS220/Clothing/Head/Bandanas/salvage.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Bandanas/salvage.rsi/meta.json index 9276b5eaaf76..8b0c89abd6f2 100644 --- a/Resources/Textures/SS220/Clothing/Head/Bandanas/salvage.rsi/meta.json +++ b/Resources/Textures/SS220/Clothing/Head/Bandanas/salvage.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "220 CLA", + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", "copyright": "sprited by dinazewwr (Discord) for SS220", "size": { "x": 32, diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/meta.json index aeb89940a86e..b4645b8e27b1 100644 --- a/Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/meta.json +++ b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "220 CLA", + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", "copyright": "sprited by dinazewwr (Discord) for SS220", "size": { "x": 32, diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/meta.json index f976cd06ca99..1842cf76ae9a 100644 --- a/Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/meta.json +++ b/Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "220 CLA", + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", "copyright": "sprited by dinazewwr (Discord) for SS220", "size": { "x": 32, diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi/equipped-INNERCLOTHING-monkey.png index 68923b2707f68adb018de750f404bbb44531c5d3..c2a4425d36925c68f1e6671de8692f374058f6ac 100644 GIT binary patch delta 1179 zcmV;M1Z4ZF3A_oAF@JVRL_t(|ob8%#NE>Gy$G=zH5;SSCo+f9D7sEK$#24*4nwEmC zFN8q*W_dGxA<{B%uN-~Zy$OAhjnY>N!d`5MGO!@XUi4i`SA`-gZ0?0a7Dm#@@RFVi z^-@iy^4kk{M-r2G&t>ZVJRf*Cp3CL={GMN)=K}XTfWzT%IDZ@thr>A(#T%jF&m zvw|bv4cVxULFKDj{E9*kA5GEHa*7^4 znj*iVP_rnKaZRnp>ML)CztWM_0oYgppI&t1`CAF!PL1Nb*>8}`<=|rl2Z z{7nuwTrQV+wClILXNU-&_xb7h+YaP%IcRH|`B|&j3YW`;n@ubDBA%={rXW~TR{AB& z{TX$|9DnTEwHsvktvUc3E5MMet7+3Bwafd_HXZ(bBC47ME6cZ%xSOD-P!{h}lz6XojZmhiE+B1=+2@P7;_Cu(&>E7Dl5J=WzGVIKqJ#HH+f0 zC8AjrDIAE=-8Z_VwF<7jd#a?>@)kQ4 zZ=^1-?T4bR4L$Imy^J%$btKc3zof?T1JpeZ{v(`9saYI>+&+! z1`XcO3nVx8kAM%0>tpz1Z_joh03ZqP6o2&!6|d2D=kaF!1%}`&i{XeltVVCVFW{9r zY`qik;ng7giek2MClSFbb-;Kh;qQ7sfVnp4>+GV_ZZ|%;n8)MaL;(90+f7|ZyCeyz zS1G8g=~9V>THUS44g9!}GW!{I<-la5b{U<%POPdbop$fP7XSeL@2%nMpPks$b$`4{ z{mN7xue&f}Odf!+s;YSUY|hp=OFyY_IGkpy#M5VUSXEU35H@ukxm?a}*d})F0m7!P zQ%0@)R~3BUS64u_s5W*+-NL5612C*;16w!2LLrZdUjQIge46Y8P>pJPxlqU(E@*{3 tv^DLoDE6wZ91e%W;cz${4(A|$0u;eizR1swQ9=L!002ovPDHLkV1g8dOKJcB delta 1161 zcmV;41a|wp391Q@F@I!9L_t(|ob8%TXd6cq$NwABu3}40V=LKRCwOI1#*O4dQkN)@ zL+yh>kX))u?St{9#XY&_^kQ;QAmn62z=xJ%Q*gi_3hhlHO%9$iaKh`sSz*bRytAs~e#{RBG3(X*-i+U@VBY`&fj}S-2!8|u!M-pxK~u41nw^N! z&g-)iQJRV^6H^n^?7RO|{}CQ})wc@MHgM{UAC8Qv2|9Jg57RbK^{wKd7NOA}k0ePC zF^Wf$ZTXM7y>UbzhiMzQpj|;&Ph%`PgWCX&MQ0G!Kg9*@3Sa@c!eHc5{4?bAJHEy~ zuiy0od}l79>VI1WEZ{PLht{_+aw$CQ9;)@%HWrY1I_P0~-u!DD3%mNfe%D*T$fYE? zG6+4ukTEx*2N;-|sO!s>K^VD|#5p(5{<9sEZTnp>fD?pi8vp>)HelpZXy_lva2C+$s0^Pd564FG>J_ zw~igd%YW0X=6CA=JY;|)x7N*?MeEhKqwU=P`$W`q5!|G2Gk@^WFZc$)_5DMrgX>p7 z)jCip79h*My6dv+L!nrJs&%*;$LsTz@n!~z_4 z0Ef;0egOmmfj}S-2m}IwKp+sfBOXcas?oR02Y<3$*Lawnh*CU~^b`;G3z2vvNqT_c zR(b$SS7S64TRyb6rBktGTDlseTj>Gl0S2#&z=fhH&T11=6SOivTby&1j*IE&eBynvzjhVSo zjDP6kwIXdkpFhy*bR)#n1SyI_EAzw7>U++Di*FvOYpuLHolXXL^?H6O%G3nH-9tDo zT|&m(#QC0SFg4+IIJ|iGtZVQ2o@r#vO&pglA>2LGmY2IW=;#P_;f!X9C{47)6+|T5EI?5mc=Y z&Y6V2>wExrZ7|e7KwW_VJ~~&y?MFcX+ZEfAZKGGyr0nA?taYSX?T99R5t?k8~yZ5nfSpXoFY#Zfr*=yJ}ygUP>l5JDY+WV&}`c9~=fLhUP?3}fM zlD!3RWVC~)hhVi@!I!@RKz8S4@)AHZn(gIkwc@x?s8&!Y7G6d1vT5cB1OkCTAP@)y byZH<0bF*v=OA06e0000J(DUMYrxH!G6 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 delta 543 zcmV+)0^t451jGc8FnH4fMKX zXhF|%b&d{4?|F4~1t}>hDJlO0omQQlS{q?GveT+dVL9^p{eSEEom!httFGMpj%wir z$XUi?dEG!aefFA15@4@+Bz4ngdEH=^@wfo_r(O#S*gy2JbAoEtrD89!cIi+u1dnQM zSuzA`mkt$siE7rx&I$GpJ!JuRRf;yso3fg9`SR^Guo|xcy#IUv@N*uQjq;`hv|AI9 zOxBMYKtwg`a({ni8z5c-fDh=?26jmRE2YCrb8%q5}ZEu&V(Qn#?jDAN@D< z!Y%-_j0fbCSoz_g=)m)b6(FAQ>~w-YZLnqUA}oh3dw&;w+TiSTa^+A`uY$4z0KKqF z7?f{xAPl}=#fzY1SH4(GE@i$@;5>?W_Vg8xw;%BC?I&Kmd_s~>dY+HRwUs(=6h002ovPDHLkV1jq<_hSG6 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi/inhand-left.png index 98d3de09883dd04e4221ee1264ec6354f7780d62..eb62676c263b4039f8e4509fbf3c11d94570f48e 100644 GIT binary patch delta 812 zcmV+{1JnH62G9nOF@Fk4L_t(|ob8&;OB+EL#(z^SHfjilT8)Qp5=w%^o`N4xC_PwE z@E{3ZN>QvA!IOCM)RXpD5Cl(^P|%D2fjtzZhhhb35mEe#h?ZD{Hr5)fOb;4K1kI*d zoi3dpge5cV!@JMCyU8REXfzs)Mx)VaG#ZUYqtR$IntYH_B7dc1ahX;9yTfGa1wBzqy1L<<#5ViCfYERv7>w0V?lSviEK8{0Pt;DiUW!=hXAm7<7k<7+*ZO zR1XllJ8}LQ1O8QR>=|HZv;nFMP>nV~bpfi;27jn7KsDL`)di?V8=$%X)o24$7oZw# zfa(HNQ}BI17Se-|( zodIBNe!zAHSe+lR%~#UHY5K8sEh3Y0000c86_(VZE5Ai(^Q|oVPRWJ){#Qj?G`c?Zyg439ad;FL?JA9X#fD(Eh?wXD%+j zNe_a$l44ohmtQ#OxtqHwSXHD%@OhK$u98hnTec>xs8>pI>Ar9*%6a1UW;K zD!=?aDEO)F&f)6w-|yB=w_!MJz=MRQI=Cn(ovBy5b@J2E6`}p2SwD9PZs59q`lWzi zPebcX7i-b$QC}r=;(NMYi=W?JaiZWfpKzPivlAvU273irq?J{Zmpyb^ZssOjs~Z#r zBwk!O29#6%nvl%0%$(_RLE?&Jzjv=xHXLmzF=J)OxV(E~%?_8`e-;c0Cciqnj%!~% zJ^%i*{`&bZU)@!GTo$mEQPI|K^>I%IhoZgW%gmdOp0O!yJ+8U)9yddTtzS}+qKawu zWbTDRd)Ixi&`o=G@{3!*8u3eyx2<7{4s$4uwKu!8|6NoKR=Y<*&Z5nUb%RG z*rIUVQ0WJP0@Cf?4Cm6+=K4N-dwse`dhm(!PmVnlvSD(nZ;i9e3)lW&vx|)(sh+*0 z@K{6LoA+lPEdQa=wm2_yZ}|I7N%hBTSKj+@*_4r?JAc*Ndu->n>w38~FUgdO+$X`P za9Uj1_p*i{?=2K4ae0g_8uEBKcgI9{gzRK~lxmSHiEfsE7wq5bP!eHwh zSH1E@A@8+T?d$L0*j0ajL1O{$z5l!V7cX9XD8kv9dES-$#bh?o0q30+hA`| z)k-;ri8p;8ACo8uo@jVrT6)9eMCK6l1yW`XrOd04ne}MGvsV2V*{hdQcl$s0|G!)b zK-mDzsY@;zS)5}yaL?q{M7A3<-K@_s?7p0FT$16&Y&kGH`S>1=rz=%@r+N0vPUd-f zpQV$dF`;9g?T_Z`^ZOqP_D{SuyZveRL-yJO-R`9`ewMK_xKyqFbNE8xb_T@&f}9c)I$ztaD0e0ssjld;b6c diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi/inhand-right.png index 95cbcaa1ddcd3bd05bf3fb649734d418b82773c8..d134a07cd114fe26c7d480fe2110fd9c3b0140ee 100644 GIT binary patch delta 814 zcmV+}1JV4!2GItPFnLoYc>g2Yb2A5bVA zQc!S^1eYR;brGDz$*GfeEC_;AB@}e=Kd?hlIut8Ni%3LGQly1ggf`aZu<~@UXLE^q zZzAz>_4BCU&L=G2jz~nc_Q#PMJRVX->v+Ck4pVNO*X=xUs# z>4Dbrt*Qjm1Fh(4oFr9o7{+}KA*k*URKJA|{?tmv+5O+ZZwA2n_H}xAWwS!QcestU$gW~iX z#&uTw?k`eI+_?-1a0!UrgEauB8B1lh@FD#QsmvDi41ez)tidH9%DkSUTqW-6+@1b# z8~{Xm52R-j82h&!M0#%?KgCBe8g`a@O-1Ps$MN!QMx^(g7sfsMG%f&O^^NgZLq>=Q zUSEKoJvhee&qr{HN7(lxI!To@kj#mdSmhR1tR=W=0oJp)b4mb}PvDmCtc z3h*>5G!(4DyI=QlczAd=S6^R`Cv{&iw{e1+nmZL&0h*RIjr-fzlz9aJ5OW(RNF);g zfc@|L0Dwd?fw_$n3SoLwS0nn(ws}nD zryKDS5!8r|^~?}ejtzuU&_gMz9Iy7IdSGsNgEZ9#Eto*GCt=yAsXmM-i?lq|-@3DM zV0o$^Bg!Ias?RbW?MXljCZMT4%nfhcdWC8dP%P~O00zTj*g4;(!QM0g;C1pdRqlUi z%(%=r2Yb`k@qdTMEc>fj5)ccgY40)%0LUIpKno_2JK3bs_!4CgCIA3?mszZA#r}W2 z*Riq{v&20bU!vT}CTYP0D&vlY(=~C|R6t+nG!Bcu(bqW*)vsgZ`65)mZW%YZao^v? zPTZ9&2?z*?!}Dzb*BL98_VNDfD-=unFf)93zKwu@Xn*nf*wReg?Ufso$vgmv(_>I| zCV^?39>2p+@kz`l{VhK!J0_EPy!lWPr^o&~&*-2ULMsQ@RMx$@P&?SG^K?2xH|rY2+#IavknL(>)Db({dV z18^HB!0iCs*53Fla_l_8AJWqK=qrFR#u#Ia)#J6Uu^rNXg}vA{mLZ)0uXc?akxGD9 zyT&r4E5NH=<3^+s;MK0N45=3)UhNv+8#lYgttR~p@M_n%5vhCD&8~5)*?A}Exvnu| cj2AWX2ipr(6axYH0ssI207*qoM6N<$f@jo)^Z)<= From 05b178d9234b0f4ddae6d5a523964c1408150c68 Mon Sep 17 00:00:00 2001 From: d1nazewwr Date: Wed, 31 Jul 2024 23:42:21 +0300 Subject: [PATCH 3/7] Fix 2 salvage loadout Update --- Resources/Prototypes/Loadouts/role_loadouts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index ab2a7effc9df..4fb3c93c01ef 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -172,9 +172,9 @@ - type: roleLoadout id: JobSalvageSpecialist groups: - - SalvageSpecialistHead + - SalvageSpecialistHead #SS220-Salvage-Loadouts-Update - SalvageSpecialistJumpsuit #SS220-MoreTurtleneck - - SalvageSpecialistBackpack + - SalvageSpecialistBackpack #SS220-Salvage-Loadouts-Update - SalvageSpecialistOuterClothing - SalvageSpecialistShoes - Glasses From cd5f078af50902ccdc91e5f0d51eca0f38355613 Mon Sep 17 00:00:00 2001 From: d1nazewwr Date: Wed, 7 Aug 2024 00:19:27 +0300 Subject: [PATCH 4/7] fix 3 --- .../Textures/SS220/Clothing/Head/Hardhats/violet.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/meta.json index b4645b8e27b1..fc261a46756c 100644 --- a/Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/meta.json +++ b/Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/meta.json @@ -10,7 +10,7 @@ { "name": "icon" }, - { + { "name": "light-icon" }, { From 18f1b72129fcc1f3c9e9ad0118ed091cd794bec0 Mon Sep 17 00:00:00 2001 From: d1nazewwr Date: Wed, 7 Aug 2024 17:35:55 +0300 Subject: [PATCH 5/7] Fix 4 salvage loadout Update --- .../Clothing/Head/Hats/salvagehat.rsi/meta.json | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/meta.json index 1842cf76ae9a..7ead201e2499 100644 --- a/Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/meta.json +++ b/Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/meta.json @@ -18,15 +18,23 @@ "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-HELMET-hamster", "directions": 4 }, { - "name": "inhand-right", + "name": "flipped-equipped-HELMET", "directions": 4 }, { - "name": "flipped-equipped-HELMET", + "name": "flipped-equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", "directions": 4 }, { @@ -39,3 +47,4 @@ } ] } + From 87f1052e7cfad945cb74209b155608ba7659ff52 Mon Sep 17 00:00:00 2001 From: stalengd Date: Mon, 19 Aug 2024 19:49:05 +0300 Subject: [PATCH 6/7] Migrate salvage loadout to new prototypes --- .../Loadouts/Jobs/Cargo/salvage_specialist.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/Cargo/salvage_specialist.yml index 7ce10a90317f..2c9d76f58be7 100644 --- a/Resources/Prototypes/SS220/Loadouts/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/SS220/Loadouts/Jobs/Cargo/salvage_specialist.yml @@ -34,40 +34,24 @@ - type: loadout id: UniformJumpsuitFlannelSalvage - equipment: UniformJumpsuitFlannelSalvage effects: - !type:GroupLoadoutEffect proto: UniformJumpsuitFlannelSalvage - -- type: startingGear - id: UniformJumpsuitFlannelSalvage equipment: jumpsuit: ClothingUniformJumpsuitFlannelSalvage # Head - type: loadout - id: ClothingHeadHatSalvage - equipment: ClothingHeadHatSalvage - -- type: startingGear id: ClothingHeadHatSalvage equipment: head: ClothingHeadHatSalvage - type: loadout - id: ClothingHeadBandSalvage - equipment: ClothingHeadBandSalvage - -- type: startingGear id: ClothingHeadBandSalvage equipment: head: ClothingHeadBandSalvage - type: loadout - id: ClothingHeadHatHardhatViolet - equipment: ClothingHeadHatHardhatViolet - -- type: startingGear id: ClothingHeadHatHardhatViolet equipment: head: ClothingHeadHatHardhatViolet \ No newline at end of file From 2de5417a168c5505009d9e54c94c6681f984f294 Mon Sep 17 00:00:00 2001 From: stalengd Date: Tue, 20 Aug 2024 20:21:42 +0300 Subject: [PATCH 7/7] Remove empty new line in loadout_groups.yml --- Resources/Prototypes/Loadouts/loadout_groups.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index ee90a996c889..8f4093251d98 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -689,7 +689,6 @@ - SalvageBoots - CargoWinterBoots - # Engineering - type: loadoutGroup id: ChiefEngineerHead