From 67c05188c1a422953592fcc110803ba2fdb3199f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Fri, 28 Jun 2024 19:25:23 +0300 Subject: [PATCH 1/4] Update labeler-pr.yml --- .github/workflows/labeler-pr.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/labeler-pr.yml b/.github/workflows/labeler-pr.yml index 5e72630e4a3..6cc86067fa9 100644 --- a/.github/workflows/labeler-pr.yml +++ b/.github/workflows/labeler-pr.yml @@ -12,3 +12,5 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/labeler@v5 + with: + sync-labels: true From 88431ab9a0d4be0f370109bd1abf61536e6aecb7 Mon Sep 17 00:00:00 2001 From: nixsilvam404 <125667541+nixsilvam404@users.noreply.github.com> Date: Fri, 28 Jun 2024 20:53:01 +0300 Subject: [PATCH 2/4] Removed corvax sponsor (#23) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Описание PR **Медиа** **Проверки** - [x] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [ ] Я запускал локальный сервер со своими изменениями и всё протестировал. - [ ] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. **Изменения** no cl - remove: string "sponsorOnly: true" in Corvax sponsor content --------- Co-authored-by: Schrödinger <132720404+Schrodinger71@users.noreply.github.com> --- .../Mobs/Customization/Markings/cat_parts.yml | 4 - .../Mobs/Customization/Markings/fox_parts.yml | 1 - .../Customization/Markings/human_hair.yml | 10 --- .../Markings/slime_cat_parts.yml | 6 -- .../Markings/slime_fox_parts.yml | 1 - .../Prototypes/Corvax/Species/vulpkanin.yml | 1 - .../Mobs/Customization/Markings/cat_parts.yml | 2 - .../Mobs/Customization/Markings/cyberlibs.yml | 73 ------------------- 8 files changed, 98 deletions(-) diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/cat_parts.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/cat_parts.yml index c9a1093fe5e..a52dcb1cfef 100644 --- a/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/cat_parts.yml +++ b/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/cat_parts.yml @@ -3,7 +3,6 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [Human] - sponsorOnly: true # Corvax-Sponsors coloring: default: type: @@ -27,7 +26,6 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [Human] - sponsorOnly: true # Corvax-Sponsors coloring: default: type: @@ -51,7 +49,6 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [Human] - sponsorOnly: true # Corvax-Sponsors coloring: default: type: @@ -75,7 +72,6 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [Human] - sponsorOnly: true # Corvax-Sponsors coloring: default: type: diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/fox_parts.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/fox_parts.yml index c29be00c655..bc61cfe88b9 100644 --- a/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/fox_parts.yml +++ b/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/fox_parts.yml @@ -3,7 +3,6 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [Human] - sponsorOnly: true # Corvax-Sponsors sprites: - sprite: Corvax/Mobs/Customization/fox_parts.rsi state: ears_fox_outer diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/human_hair.yml index 33aeb0c590d..2f26d315ab0 100644 --- a/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/human_hair.yml +++ b/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/human_hair.yml @@ -114,7 +114,6 @@ id: HumanHairCotton bodyPart: Hair markingCategory: Hair - sponsorOnly: true # Corvax-Sponsors sprites: - sprite: Corvax/Mobs/Customization/human_hair.rsi state: cotton @@ -155,7 +154,6 @@ id: HumanHairFingerwave bodyPart: Hair markingCategory: Hair - sponsorOnly: true # Corvax-Sponsors sprites: - sprite: Corvax/Mobs/Customization/human_hair.rsi state: fingerwave @@ -172,7 +170,6 @@ id: HumanHairFortuneteller bodyPart: Hair markingCategory: Hair - sponsorOnly: true # Corvax-Sponsors sprites: - sprite: Corvax/Mobs/Customization/human_hair.rsi state: fortuneteller @@ -181,7 +178,6 @@ id: HumanHairFortunetellerAlt bodyPart: Hair markingCategory: Hair - sponsorOnly: true # Corvax-Sponsors sprites: - sprite: Corvax/Mobs/Customization/human_hair.rsi state: fortuneteller_alt @@ -326,7 +322,6 @@ id: HumanHairLongdtails bodyPart: Hair markingCategory: Hair - sponsorOnly: true # Corvax-Sponsors sprites: - sprite: Corvax/Mobs/Customization/human_hair.rsi state: longdtails @@ -359,7 +354,6 @@ id: HumanHairLooseSlicked bodyPart: Hair markingCategory: Hair - sponsorOnly: true # Corvax-Sponsors sprites: - sprite: Corvax/Mobs/Customization/human_hair.rsi state: loose_slicked @@ -408,7 +402,6 @@ id: HumanHairQuadcurls bodyPart: Hair markingCategory: Hair - sponsorOnly: true # Corvax-Sponsors sprites: - sprite: Corvax/Mobs/Customization/human_hair.rsi state: quadcurls @@ -441,7 +434,6 @@ id: HumanHairShy bodyPart: Hair markingCategory: Hair - sponsorOnly: true # Corvax-Sponsors sprites: - sprite: Corvax/Mobs/Customization/human_hair.rsi state: shy @@ -514,7 +506,6 @@ id: HumanHairSpicy bodyPart: Hair markingCategory: Hair - sponsorOnly: true # Corvax-Sponsors sprites: - sprite: Corvax/Mobs/Customization/human_hair.rsi state: spicy @@ -555,7 +546,6 @@ id: HumanHairWife bodyPart: Hair markingCategory: Hair - sponsorOnly: true # Corvax-Sponsors sprites: - sprite: Corvax/Mobs/Customization/human_hair.rsi state: wife diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/slime_cat_parts.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/slime_cat_parts.yml index 8a197146307..2d7efa2bd4b 100644 --- a/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/slime_cat_parts.yml +++ b/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/slime_cat_parts.yml @@ -3,7 +3,6 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [SlimePerson] - sponsorOnly: true # Corvax-Sponsors sprites: - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi state: ears_slime_cat_outer @@ -15,7 +14,6 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [SlimePerson] - sponsorOnly: true # Corvax-Sponsors sprites: - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi state: slime_tail_cat_wag # Corvax-Sponsors @@ -25,7 +23,6 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [SlimePerson] - sponsorOnly: true # Corvax-Sponsors sprites: - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi state: ears_slime_stubby_outer @@ -37,7 +34,6 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [SlimePerson] - sponsorOnly: true # Corvax-Sponsors sprites: - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi state: ears_slime_curled_outer @@ -49,7 +45,6 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [SlimePerson] - sponsorOnly: true # Corvax-Sponsors sprites: - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi state: ears_slime_torn_outer @@ -61,7 +56,6 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [SlimePerson] - sponsorOnly: true # Corvax-Sponsors sprites: - sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi state: slime_tail_cat_wag_stripes_prime diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/slime_fox_parts.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/slime_fox_parts.yml index ff03e4d9389..14cab4f784d 100644 --- a/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/slime_fox_parts.yml +++ b/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/slime_fox_parts.yml @@ -3,7 +3,6 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [SlimePerson] - sponsorOnly: true # Corvax-Sponsors sprites: - sprite: Corvax/Mobs/Customization/slime_fox_parts.rsi state: ears_slime_fox_outer diff --git a/Resources/Prototypes/Corvax/Species/vulpkanin.yml b/Resources/Prototypes/Corvax/Species/vulpkanin.yml index 03096f5b00d..b58098a379f 100644 --- a/Resources/Prototypes/Corvax/Species/vulpkanin.yml +++ b/Resources/Prototypes/Corvax/Species/vulpkanin.yml @@ -2,7 +2,6 @@ id: Vulpkanin name: species-name-vulpkanin roundStart: true - sponsorOnly: true # Corvax-Sponsors prototype: MobVulpkanin sprites: MobVulpkaninSprites defaultSkinTone: "#eb943d" diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml index 1898596fd97..ae0f5d6d283 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml @@ -3,7 +3,6 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [Human] - sponsorOnly: true # Corvax-Sponsors coloring: default: type: @@ -27,7 +26,6 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [Human] - sponsorOnly: true # Corvax-Sponsors coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/cyberlibs.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/cyberlibs.yml index 513230a1694..42138d1671f 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/cyberlibs.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/cyberlibs.yml @@ -4,7 +4,6 @@ bodyPart: RArm markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -19,7 +18,6 @@ bodyPart: LArm markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -34,7 +32,6 @@ bodyPart: RHand markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -49,7 +46,6 @@ bodyPart: LHand markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -64,7 +60,6 @@ bodyPart: RLeg markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -79,7 +74,6 @@ bodyPart: LLeg markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -94,7 +88,6 @@ bodyPart: LFoot markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -109,7 +102,6 @@ bodyPart: RFoot markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -124,7 +116,6 @@ bodyPart: Chest markingCategory: Chest speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -140,7 +131,6 @@ bodyPart: RArm markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -155,7 +145,6 @@ bodyPart: LArm markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -170,7 +159,6 @@ bodyPart: RHand markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -185,7 +173,6 @@ bodyPart: LHand markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -200,7 +187,6 @@ bodyPart: RLeg markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -215,7 +201,6 @@ bodyPart: LLeg markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -230,7 +215,6 @@ bodyPart: LFoot markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -245,7 +229,6 @@ bodyPart: RFoot markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -260,7 +243,6 @@ bodyPart: Chest markingCategory: Chest speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -276,7 +258,6 @@ bodyPart: RArm markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -291,7 +272,6 @@ bodyPart: LArm markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -306,7 +286,6 @@ bodyPart: RHand markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -321,7 +300,6 @@ bodyPart: LHand markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -336,7 +314,6 @@ bodyPart: RLeg markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -351,7 +328,6 @@ bodyPart: LLeg markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -366,7 +342,6 @@ bodyPart: LFoot markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -381,7 +356,6 @@ bodyPart: RFoot markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -396,7 +370,6 @@ bodyPart: Chest markingCategory: Chest speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -412,7 +385,6 @@ bodyPart: RArm markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -427,7 +399,6 @@ bodyPart: LArm markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -442,7 +413,6 @@ bodyPart: RHand markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -457,7 +427,6 @@ bodyPart: LHand markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -472,7 +441,6 @@ bodyPart: RLeg markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -487,7 +455,6 @@ bodyPart: LLeg markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -502,7 +469,6 @@ bodyPart: LFoot markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -517,7 +483,6 @@ bodyPart: RFoot markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -532,7 +497,6 @@ bodyPart: Chest markingCategory: Chest speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -549,7 +513,6 @@ bodyPart: RArm markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -564,7 +527,6 @@ bodyPart: LArm markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -579,7 +541,6 @@ bodyPart: RHand markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -594,7 +555,6 @@ bodyPart: LHand markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -609,7 +569,6 @@ bodyPart: RLeg markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -624,7 +583,6 @@ bodyPart: LLeg markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -639,7 +597,6 @@ bodyPart: LFoot markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -654,7 +611,6 @@ bodyPart: RFoot markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -670,7 +626,6 @@ markingCategory: Chest speciesRestriction: [ Human, Dwarf, Arachnid ] sexRestriction: Male - sponsorOnly: true coloring: default: type: @@ -686,7 +641,6 @@ markingCategory: Chest speciesRestriction: [ Human, Dwarf, Arachnid ] sexRestriction: Female - sponsorOnly: true coloring: default: type: @@ -702,7 +656,6 @@ bodyPart: RArm markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -717,7 +670,6 @@ bodyPart: LArm markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -732,7 +684,6 @@ bodyPart: RHand markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -747,7 +698,6 @@ bodyPart: LHand markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -762,7 +712,6 @@ bodyPart: RLeg markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -777,7 +726,6 @@ bodyPart: LLeg markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -792,7 +740,6 @@ bodyPart: LFoot markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -807,7 +754,6 @@ bodyPart: RFoot markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -822,7 +768,6 @@ bodyPart: Chest markingCategory: Chest speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -838,7 +783,6 @@ bodyPart: RArm markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -853,7 +797,6 @@ bodyPart: LArm markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -868,7 +811,6 @@ bodyPart: RHand markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -883,7 +825,6 @@ bodyPart: LHand markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -898,7 +839,6 @@ bodyPart: RLeg markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -913,7 +853,6 @@ bodyPart: LLeg markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -928,7 +867,6 @@ bodyPart: LFoot markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -943,7 +881,6 @@ bodyPart: RFoot markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -958,7 +895,6 @@ bodyPart: Chest markingCategory: Chest speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -974,7 +910,6 @@ bodyPart: RArm markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -989,7 +924,6 @@ bodyPart: LArm markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -1004,7 +938,6 @@ bodyPart: RHand markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -1019,7 +952,6 @@ bodyPart: LHand markingCategory: Arms speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -1034,7 +966,6 @@ bodyPart: RLeg markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -1049,7 +980,6 @@ bodyPart: LLeg markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -1064,7 +994,6 @@ bodyPart: LFoot markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -1079,7 +1008,6 @@ bodyPart: RFoot markingCategory: Legs speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: @@ -1094,7 +1022,6 @@ bodyPart: Chest markingCategory: Chest speciesRestriction: [ Human, Dwarf, Arachnid ] - sponsorOnly: true coloring: default: type: From 0b0aa7c5e08f995071ccd43f6b5b9012577679c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Fri, 28 Jun 2024 21:14:40 +0300 Subject: [PATCH 3/4] Update auto_cl.py --- Tools/ATD/auto_cl.py | 47 ++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/Tools/ATD/auto_cl.py b/Tools/ATD/auto_cl.py index a6cae9c20f7..35f086c8a4d 100644 --- a/Tools/ATD/auto_cl.py +++ b/Tools/ATD/auto_cl.py @@ -91,34 +91,38 @@ def fetch_pr_data(token, repo, pr_number): def fetch_single_pr(number): try: pr_info = get_pr_info(token, repo, number) - + # Проверяем, что PR был замержен if not pr_info.get('merged_at'): return None - + body = pr_info.get('body', '') - - # Находим строку, которая начинается с :cl: author = pr_info['user']['login'] - for line in body.splitlines(): - if line.strip().startswith(':cl:'): - potential_author = line.strip()[4:].strip() # Убираем :cl: и пробелы + changes = [] + + lines = [line.strip() for line in body.splitlines()] + for line in lines: + if line.lower().startswith('no cl'): + return None + + if line.startswith(':cl:'): + potential_author = line[4:].strip() if potential_author: author = potential_author - break - - changes = [] - for line in body.splitlines(): - line = line.strip() - if line.startswith('- add:'): - changes.append({"message": line[len('- add:'):].strip(), "type": "Add"}) - elif line.startswith('- remove:'): - changes.append({"message": line[len('- remove:'):].strip(), "type": "Remove"}) - elif line.startswith('- tweak:'): - changes.append({"message": line[len('- tweak:'):].strip(), "type": "Tweak"}) - elif line.startswith('- fix:'): - changes.append({"message": line[len('- fix:'):].strip(), "type": "Fix"}) - + continue + + change_types = { + '- add:': "Add", + '- remove:': "Remove", + '- tweak:': "Tweak", + '- fix:': "Fix" + } + + for prefix, change_type in change_types.items(): + if line.startswith(prefix): + changes.append({"message": line[len(prefix):].strip(), "type": change_type}) + break + if changes: return { "author": author, @@ -127,6 +131,7 @@ def fetch_single_pr(number): } except requests.exceptions.RequestException as e: logging.error(f"Failed to fetch PR #{number}: {e}") + return None with ThreadPoolExecutor(max_workers=10) as executor: From 63b115b5edc6573f84f99f73790f12c9d1ad8181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Sun, 30 Jun 2024 13:06:55 +0300 Subject: [PATCH 4/4] add comments --- Resources/Prototypes/Reagents/gases.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml index 82195de96ff..7cc5c8a6dd3 100644 --- a/Resources/Prototypes/Reagents/gases.yml +++ b/Resources/Prototypes/Reagents/gases.yml @@ -14,10 +14,10 @@ conditions: - !type:OrganType type: Human - - !type:Oxygenate + - !type:Oxygenate #Start-ADT conditions: - !type:OrganType - type: Drask #ADT + type: Drask #End-ADT - !type:Oxygenate conditions: - !type:OrganType