From 1ba25a1e4d7a2b45f57884510da5cd5b50b2c093 Mon Sep 17 00:00:00 2001 From: NIKforest <139044671+NIKforest@users.noreply.github.com> Date: Sat, 23 Mar 2024 20:57:47 +0300 Subject: [PATCH 1/9] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20puller?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 1ec3e52c9a9..af9974d77a9 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1072,8 +1072,6 @@ layer: - MobLayer - type: Physics - - type: Puller - needsHands: false - type: Inventory speciesId: kangaroo templateId: kangaroo @@ -1231,8 +1229,6 @@ spawned: - id: FoodMeat amount: 3 - - type: Puller - needsHands: false - type: CanHostGuardian - type: NPCRetaliation attackMemoryLength: 10 @@ -2746,8 +2742,6 @@ heatDamageThreshold: 423 coldDamageThreshold: 0 - type: PressureImmunity - - type: Puller - needsHands: false - type: InteractionPopup successChance: 0.7 interactSuccessString: petting-success-space-cat From e835030de0b65085812981fe4fb9d83b9f05af03 Mon Sep 17 00:00:00 2001 From: Lemird Date: Sun, 24 Mar 2024 22:47:22 +0300 Subject: [PATCH 2/9] =?UTF-8?q?=D0=92=D1=81=D1=8F=D0=BA=D0=B0=D1=8F=20?= =?UTF-8?q?=D1=84=D0=B8=D0=B3=D0=BD=D1=8E=D1=88=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/CODEOWNERS | 6 ++-- .github/PULL_REQUEST_TEMPLATE.md | 62 +------------------------------- 2 files changed, 4 insertions(+), 64 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ffdf3db1e36..5c8c923aae0 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,10 +1,10 @@ # Last match in file takes precedence. # Ping for all PRs -* @13lackHawk +* @Lemirda # Ping for all PRs that include translations/editing fluent strings -*.ftl @13lackHawk +*.ftl @Lemirda # Ping for all prototypes -*.yml @13lackHawk \ No newline at end of file +*.yml @Lemirda \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 005ae30583d..16258e757f0 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,64 +2,4 @@ ## Описание PR - -**Медиа** - - -**Проверки** - -- [ ] PR полностью завершён и мне не нужна помощь чтобы его закончить. -- [ ] Я внимательно просмотрел все свои изменения и багов в них не нашёл. -- [ ] Я запускал локальный сервер со своими изменениями и всё протестировал. -- [ ] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. - -**Изменения для игроков** - - -:cl: -- add: Добавлено веселье! -- remove: Убрано веселье! -- tweak: Изменено веселье! -- fix: Исправлено веселье! - -**Изменения для разработчиков** - - -:cl: -- add: Добавлен код! -- remove: Убран код! -- tweak: Изменён код! -- fix: Исправлен код! \ No newline at end of file + \ No newline at end of file From 86baea7af53d2e6bdccf5179c47b3bf2a6d947b5 Mon Sep 17 00:00:00 2001 From: NIKforest <139044671+NIKforest@users.noreply.github.com> Date: Sun, 24 Mar 2024 23:04:33 +0300 Subject: [PATCH 3/9] Update carp.yml --- Resources/Prototypes/Entities/Mobs/NPCs/carp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index c7b8081d889..c5cc2575793 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -170,7 +170,7 @@ description: ghost-role-information-sentient-carp-description - type: GhostTakeoverAvailable - type: Puller - needsHands: false + needsHands: false - type: HTN rootTask: task: DragonCarpCompound From ce04796cdf80f3320c11d85a9501b2ee56c1c67e Mon Sep 17 00:00:00 2001 From: NIKforest <139044671+NIKforest@users.noreply.github.com> Date: Sun, 24 Mar 2024 23:07:30 +0300 Subject: [PATCH 4/9] Update MrProperMobs.yml --- .../NIKforest's Prototypes/MrProperMobs.yml | 280 ------------------ 1 file changed, 280 deletions(-) diff --git a/Resources/Prototypes/Andromeda/NIKforest's Prototypes/MrProperMobs.yml b/Resources/Prototypes/Andromeda/NIKforest's Prototypes/MrProperMobs.yml index 5d3aedd2dc3..45268c1063b 100644 --- a/Resources/Prototypes/Andromeda/NIKforest's Prototypes/MrProperMobs.yml +++ b/Resources/Prototypes/Andromeda/NIKforest's Prototypes/MrProperMobs.yml @@ -671,286 +671,6 @@ exclaimSound: path: /Audio/Andromeda/Liquid/LiquidSpeech/exclaim.ogg -- type: species - id: ColdDiona - name: species-name-diona - roundStart: true - prototype: MobDiona - sprites: MobDionaSprites - defaultSkinTone: "#07c5df" - markingLimits: MobDionaMarkingLimits - dollPrototype: MobDionaDummy - skinColoration: Hues - maleFirstNames: DionaFirst - femaleFirstNames: DionaFirst - maleLastNames: DionaLast # Corvax-LastnameGender - femaleLastNames: DionaLast # Corvax-LastnameGender - naming: TheFirstofLast - -- type: speciesBaseSprites - id: MobDionaSprites - sprites: - Head: MobDionaHead - HeadTop: MobHumanoidAnyMarking - HeadSide: MobHumanoidAnyMarking - Chest: MobDionaTorso - Eyes: MobDionaEyes - LArm: MobDionaLArm - RArm: MobDionaRArm - LHand: MobDionaLHand - RHand: MobDionaRHand - LLeg: MobDionaLLeg - RLeg: MobDionaRLeg - LFoot: MobDionaLFoot - RFoot: MobDionaRFoot - -- type: markingPoints - id: MobDionaMarkingLimits - onlyWhitelisted: true - points: - Head: - points: 2 - required: false - HeadTop: - points: 1 - required: false - HeadSide: - points: 1 - required: false - Chest: - points: 1 - required: false - Legs: - points: 2 - required: false - Arms: - points: 2 - required: false - Overlay: - points: 1 - required: true - defaultMarkings: [ DionaVineOverlay ] - -- type: humanoidBaseSprite - id: MobDionaEyes - baseSprite: - sprite: Mobs/Customization/eyes.rsi - state: diona - -- type: humanoidBaseSprite - id: MobDionaHead - baseSprite: - sprite: Mobs/Species/Diona/parts.rsi - state: head_m - -- type: humanoidBaseSprite - id: MobDionaHeadMale - baseSprite: - sprite: Mobs/Species/Diona/parts.rsi - state: head_m - -- type: humanoidBaseSprite - id: MobDionaHeadFemale - baseSprite: - sprite: Mobs/Species/Diona/parts.rsi - state: head_f - -- type: humanoidBaseSprite - id: MobDionaTorso - baseSprite: - sprite: Mobs/Species/Diona/parts.rsi - state: torso_m - -- type: humanoidBaseSprite - id: MobDionaTorsoMale - baseSprite: - sprite: Mobs/Species/Diona/parts.rsi - state: torso_m - -- type: humanoidBaseSprite - id: MobDionaTorsoFemale - baseSprite: - sprite: Mobs/Species/Diona/parts.rsi - state: torso_f - -- type: humanoidBaseSprite - id: MobDionaLLeg - baseSprite: - sprite: Mobs/Species/Diona/parts.rsi - state: l_leg - -- type: humanoidBaseSprite - id: MobDionaLHand - baseSprite: - sprite: Mobs/Species/Diona/parts.rsi - state: l_hand - -- type: humanoidBaseSprite - id: MobDionaLArm - baseSprite: - sprite: Mobs/Species/Diona/parts.rsi - state: l_arm - -- type: humanoidBaseSprite - id: MobDionaLFoot - baseSprite: - sprite: Mobs/Species/Diona/parts.rsi - state: l_foot - -- type: humanoidBaseSprite - id: MobDionaRLeg - baseSprite: - sprite: Mobs/Species/Diona/parts.rsi - state: r_leg - -- type: humanoidBaseSprite - id: MobDionaRHand - baseSprite: - sprite: Mobs/Species/Diona/parts.rsi - state: r_hand - -- type: humanoidBaseSprite - id: MobDionaRArm - baseSprite: - sprite: Mobs/Species/Diona/parts.rsi - state: r_arm - -- type: humanoidBaseSprite - id: MobDionaRFoot - baseSprite: - sprite: Mobs/Species/Diona/parts.rsi - state: r_foot - -- type: entity - save: false - name: Древо Холода - parent: BaseMobSpeciesOrganic - id: BaseMobColdDiona - abstract: true - components: - - type: HumanoidAppearance - species: ColdDiona - - type: Hunger - baseDecayRate: 0.0083 - - type: Thirst - baseDecayRate: 0.0083 - - type: Icon - sprite: Mobs/Species/Diona/parts.rsi - state: full - - type: Body - prototype: Diona - requiredLegs: 2 - - type: Damageable - damageContainer: Biological - damageModifierSet: Diona - - type: DamageVisuals - damageOverlayGroups: - Brute: - sprite: Mobs/Effects/brute_damage.rsi - color: "#75b1f0" - - type: Butcherable - butcheringType: Spike - spawned: - - id: FoodMeatPlant - amount: 5 - - type: Bloodstream - bloodReagent: Cryoxadone - - type: Reactive - groups: - Flammable: [ Touch ] - Extinguish: [ Touch ] - Acidic: [Touch, Ingestion] - reactions: - - reagents: [Water, SpaceCleaner] - methods: [Touch] - effects: - - !type:WashCreamPieReaction - - reagents: [ PlantBGone ] - methods: [ Touch ] - effects: - - !type:HealthChange - scaled: true - damage: - types: - Blunt: 2 - Slash: 2 - Piercing: 3 - - !type:PopupMessage - type: Local - visualType: Large - messages: [ "diona-hurt-by-herbicide-popup" ] - probability: 0.66 - - reagents: [ WeedKiller ] - methods: [ Touch ] - effects: - - !type:HealthChange - scaled: true - damage: - types: - Poison: 5 - - !type:PopupMessage - type: Local - visualType: Large - messages: [ "diona-hurt-by-herbicide-popup" ] - probability: 0.66 - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.35 - density: 300 #weighs more than humans because wood - restitution: 0.0 - mask: - - MobMask - layer: - - MobLayer - - type: Inventory - templateId: diona - - type: Speech - speechVerb: Plant - - type: Vocal - sounds: - Male: UnisexDiona - Female: UnisexDiona - Unsexed: UnisexDiona - - type: BodyEmotes - soundsId: DionaBodyEmotes - - type: IgnoreKudzu - -- type: entity - save: false - name: Древо Холода - parent: BaseMobColdDiona - id: MobColdDiona - defaultSkinTone: "#07c5df" - components: - - type: Bloodstream - bloodReagent: Cryoxadone - - type: ThermalRegulator - metabolismHeat: 800 - radiatedHeat: 100 - implicitHeatRegulation: 250 - sweatHeatRegulation: 500 - shiveringHeatRegulation: 500 - normalBodyTemperature: 200.15 - thermalRegulationTemperatureThreshold: 25 - - type: Temperature - heatDamageThreshold: 310 - coldDamageThreshold: 0 - currentTemperature: 200.15 - specificHeat: 42 - coldDamage: - types: - Cold: 0 #per second, scales with temperature & other constants - heatDamage: - types: - Heat: 5.5 - - type: Barotrauma - damage: - types: - Blunt: 0 - - type: entity parent: ClothingBackpack id: ClothingBackpackCosmoDevil From e1e8bfc3c0082f5bc01ea4a334d60cf6a040fa4b Mon Sep 17 00:00:00 2001 From: NIKforest <139044671+NIKforest@users.noreply.github.com> Date: Sun, 24 Mar 2024 23:15:13 +0300 Subject: [PATCH 5/9] Update MrProperMobs.yml --- .../Andromeda/NIKforest's Prototypes/MrProperMobs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Andromeda/NIKforest's Prototypes/MrProperMobs.yml b/Resources/Prototypes/Andromeda/NIKforest's Prototypes/MrProperMobs.yml index 45268c1063b..f1471888e7f 100644 --- a/Resources/Prototypes/Andromeda/NIKforest's Prototypes/MrProperMobs.yml +++ b/Resources/Prototypes/Andromeda/NIKforest's Prototypes/MrProperMobs.yml @@ -539,7 +539,7 @@ reagents: - ReagentId: ShamblersJuice Quantity: 5 - - type: AntiRottingContaine + - type: AntiRottingContainer - type: MeleeChemicalInjector transferAmount: 8 solution: melee From 73337a8566f2bfe74b4ebe16efd411f4cdffcf94 Mon Sep 17 00:00:00 2001 From: NIKforest <139044671+NIKforest@users.noreply.github.com> Date: Sun, 24 Mar 2024 23:23:38 +0300 Subject: [PATCH 6/9] Update MrProperMobs.yml --- .../Andromeda/NIKforest's Prototypes/MrProperMobs.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Andromeda/NIKforest's Prototypes/MrProperMobs.yml b/Resources/Prototypes/Andromeda/NIKforest's Prototypes/MrProperMobs.yml index f1471888e7f..94c30b30089 100644 --- a/Resources/Prototypes/Andromeda/NIKforest's Prototypes/MrProperMobs.yml +++ b/Resources/Prototypes/Andromeda/NIKforest's Prototypes/MrProperMobs.yml @@ -486,6 +486,7 @@ - type: entity name: Ликвид id: MobLiquid + suffix: Андромеда parent: SimpleMobBase description: Это живая газировка? От него летит куча пузырьков из газировки. Выглядит злым. components: @@ -928,7 +929,7 @@ - SimpleHostile - type: Sprite drawdepth: Mobs - sprite: Andromeda/NIKforest/spacedevilsmall.rsi + sprite: Andromeda/NIKforest/spacedevil2.rsi layers: - map: [ "enum.DamageStateVisualLayers.Base" ] state: running From c55290898cbd9db1217f1012ad4ec3b0ee7e19ca Mon Sep 17 00:00:00 2001 From: NIKforest <139044671+NIKforest@users.noreply.github.com> Date: Sun, 24 Mar 2024 23:40:43 +0300 Subject: [PATCH 7/9] Update stellnya.yml --- .../Prototypes/Andromeda/Lemird Prototype's/stellnya.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Resources/Prototypes/Andromeda/Lemird Prototype's/stellnya.yml b/Resources/Prototypes/Andromeda/Lemird Prototype's/stellnya.yml index c54a67d834b..0c03170d79f 100644 --- a/Resources/Prototypes/Andromeda/Lemird Prototype's/stellnya.yml +++ b/Resources/Prototypes/Andromeda/Lemird Prototype's/stellnya.yml @@ -5,12 +5,9 @@ description: "Вы видели всё в своей жизни если видели это... Однако они такие милые!~" suffix: Андромеда components: - - type: Tag - tags: - - DroneUsable - type: Sprite sprite: Andromeda/Lemird/stellnya.rsi - type: Clothing sprite: Andromeda/Lemird/stellnya.rsi - type: AddAccentClothing - accent: OwOAccent \ No newline at end of file + accent: OwOAccent From abb2f2e6f749920e529ba190b0f26a4dd81366dd Mon Sep 17 00:00:00 2001 From: Lemird Date: Mon, 25 Mar 2024 19:21:11 +0300 Subject: [PATCH 8/9] fix commit for cringe proper --- .github/CODEOWNERS | 6 ++-- .github/PULL_REQUEST_TEMPLATE.md | 57 +++++++++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 5c8c923aae0..ffdf3db1e36 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,10 +1,10 @@ # Last match in file takes precedence. # Ping for all PRs -* @Lemirda +* @13lackHawk # Ping for all PRs that include translations/editing fluent strings -*.ftl @Lemirda +*.ftl @13lackHawk # Ping for all prototypes -*.yml @Lemirda \ No newline at end of file +*.yml @13lackHawk \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 16258e757f0..b157da28e9c 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,4 +2,59 @@ ## Описание PR - \ No newline at end of file + +**Медиа** + + +**Проверки** + +- [ ] PR полностью завершён и мне не нужна помощь чтобы его закончить. +- [ ] Я внимательно просмотрел все свои изменения и багов в них не нашёл. +- [ ] Я запускал локальный сервер со своими изменениями и всё протестировал. +- [ ] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. + +**Изменения для игроков** + + +:cl: +- add: Добавлено веселье! +- remove: Убрано веселье! +- tweak: Изменено веселье! +- fix: Исправлено веселье! + +**Изменения для разработчиков** + + +:cl: +- add: Добавлен код! +- remove: Убран код! +- tweak: Изменён код! +- fix: Исправлен код! \ No newline at end of file From ea6459a3caaf62b27d06a5fc0d00ec64e792b997 Mon Sep 17 00:00:00 2001 From: Lemird Date: Mon, 25 Mar 2024 19:24:23 +0300 Subject: [PATCH 9/9] =?UTF-8?q?=D0=B3=D0=BE=D0=B2=D0=BD=D0=B0=20=D0=BA?= =?UTF-8?q?=D1=83=D1=81=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/PULL_REQUEST_TEMPLATE.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index b157da28e9c..005ae30583d 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -17,10 +17,13 @@ **Изменения для игроков**