diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.cs index bcafa3d1fef..4cdeaadabfd 100644 --- a/Content.Server/Polymorph/Systems/PolymorphSystem.cs +++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs @@ -462,10 +462,11 @@ private void RetrievePausedEntity(EntityUid user, EntityUid target) EntityManager.AddComponent(newEntityUid, copiedMindshieldComp); } - SendToPausesdMap(newEntityUid, newEntityUidTransformComp); - - newHumanoidData.EntityUid = newEntityUid; - _metaData.SetEntityName(newEntityUid, targetMeta.EntityName); + EnsurePausedMap(); /// Апстрим: Может поломаться. Проверяйте. + if (PausedMap != null) + _transform.SetParent(newEntityUid, newEntityUidTransformComp, PausedMap.Value); + newHumanoidData.EntityUid = newEntityUid; + _metaData.SetEntityName(newEntityUid, targetMeta.EntityName); return newHumanoidData; } diff --git a/Content.Shared/ADT/Changeling/Components/ChangelingComponent.cs b/Content.Shared/ADT/Changeling/Components/ChangelingComponent.cs index aaf3afe483b..1b198f80f1a 100644 --- a/Content.Shared/ADT/Changeling/Components/ChangelingComponent.cs +++ b/Content.Shared/ADT/Changeling/Components/ChangelingComponent.cs @@ -179,7 +179,7 @@ public sealed partial class ChangelingComponent : Component /// How fast the changeling will turn visible from movement when using chameleon skin. /// [DataField] - public float ChameleonSkinMovementVisibilityRate = 0.60f; + public float ChameleonSkinMovementVisibilityRate = 0.30f; #endregion #region Dissonant Shriek Ability diff --git a/Content.Shared/Humanoid/SkinColor.cs b/Content.Shared/Humanoid/SkinColor.cs index 960f910a323..5157425a2dc 100644 --- a/Content.Shared/Humanoid/SkinColor.cs +++ b/Content.Shared/Humanoid/SkinColor.cs @@ -5,7 +5,7 @@ public static class SkinColor public const float MaxTintedHuesSaturation = 0.1f; public const float MinTintedHuesLightness = 0.85f; - public const float MinHuesLightness = 0.175f; + public const float MinHuesLightness = 0.025f; public static Color ValidHumanSkinTone => Color.FromHsv(new Vector4(0.07f, 0.2f, 1f, 1f)); diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index b176cd948be..cd560b1a0a4 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1296,3 +1296,12 @@ Entries: - {message: "Респрайт обмоток для ног. Автор спрайтов - floppo4ka_.", type: Tweak} id: 55691 #костыль отображения в Обновлениях time: '2024-02-24T20:20:00.0000000+00:00' + +- author: Котя + changes: + - {message: "Фикс поглощения генокрада.", type: Fix} + - {message: "Фикс невозможности поставить полностью чёрный цвет кожи.", type: Fix} + - {message: "Фикс недоделок в знаниях языков у мобов.", type: Fix} + - {message: "Скелет получил 50% сопротивление к электрическому урону.", type: Tweak} + id: 55692 #костыль отображения в Обновлениях + time: '2024-02-26T20:20:00.0000000+00:00' \ No newline at end of file diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 12fd85a16b7..535f39767e5 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -224,6 +224,7 @@ Asphyxiation: 0.0 Bloodloss: 0.0 Cellular: 0.0 + Shock: 0.5 flatReductions: Blunt: 5 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 272361f6e6f..8cf18d3de12 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -61,6 +61,11 @@ - type: Tag tags: - VimPilot + - type: LanguageSpeaker + speaks: + - Mouse + understands: + - Mouse - type: entity name: bee @@ -1035,6 +1040,11 @@ - type: HTN rootTask: task: SimpleHostileCompound + - type: LanguageSpeaker # Frontier + speaks: + - Monkey + understands: + - Monkey - type: entity name: kangaroo @@ -1287,7 +1297,7 @@ - type: Speech speechSounds: Monkey speechVerb: Monkey - - type: MonkeyAccent + #- type: MonkeyAccent - type: NpcFactionMember factions: - Syndicate @@ -1299,6 +1309,13 @@ - type: GhostTakeoverAvailable - type: Loadout prototypes: [SyndicateOperativeGearMonkey] + - type: LanguageSpeaker # Frontier + speaks: + - Monkey + understands: + - GalacticCommon + - Monkey + - type: entity id: MobMonkeySyndicateAgent @@ -3067,6 +3084,12 @@ - type: MobPrice price: 60 - type: NonSpreaderZombie + - type: LanguageSpeaker # Frontier + speaks: + - Mouse + understands: + - Mouse + - type: entity name: pig diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index b49b01fc254..c6fc5060715 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -128,6 +128,13 @@ tags: - CannotSuicide - VimPilot + - type: LanguageSpeaker # Frontier + speaks: + - Cat + understands: + - GalacticCommon + - Cat + - type: entity name: Exception @@ -146,6 +153,13 @@ tags: - CannotSuicide - VimPilot + - type: LanguageSpeaker # Frontier + speaks: + - Cat + understands: + - GalacticCommon + - Cat + - type: entity name: Floppa @@ -179,6 +193,13 @@ path: /Audio/ADT/carakal_purr.ogg interactFailureSound: path: /Audio/ADT/carakal_hiss.ogg + - type: LanguageSpeaker # Frontier + speaks: + - Cat + understands: + - GalacticCommon + - Cat + - type: entity name: Bandito @@ -303,8 +324,8 @@ spawned: - id: FoodMeat amount: 2 - - type: ReplacementAccent - accent: dog + #- type: ReplacementAccent + # accent: dog - type: InteractionPopup successChance: 0.5 interactSuccessString: petting-success-dog @@ -322,6 +343,13 @@ - VimPilot - type: StealTarget stealGroup: AnimalMcGriff + - type: LanguageSpeaker # Frontier + speaks: + - Dog + understands: + - GalacticCommon + - Dog + - type: entity name: Paperwork @@ -402,8 +430,8 @@ spawned: - id: FoodMeat amount: 3 - - type: ReplacementAccent - accent: dog + #- type: ReplacementAccent + # accent: dog - type: InteractionPopup successChance: 0.7 interactSuccessString: petting-success-dog @@ -421,6 +449,13 @@ - VimPilot - type: StealTarget stealGroup: AnimalWalter + - type: LanguageSpeaker # Frontier + speaks: + - Dog + understands: + - GalacticCommon + - Dog + - type: entity name: Morty @@ -619,6 +654,13 @@ - VimPilot - type: StealTarget stealGroup: AnimalHamlet + - type: LanguageSpeaker # Frontier + speaks: + - Mouse + understands: + - GalacticCommon + - Mouse + - type: entity name: Shiva @@ -820,6 +862,13 @@ gender: male - type: StealTarget stealGroup: AnimalPunPun + - type: LanguageSpeaker # Frontier + speaks: + - Monkey + understands: + - GalacticCommon + - Monkey + - type: entity name: Tropico diff --git a/Resources/Prototypes/GameRules/cargo_gifts.yml b/Resources/Prototypes/GameRules/cargo_gifts.yml index f6a0edf8f33..f4dc9a70167 100644 --- a/Resources/Prototypes/GameRules/cargo_gifts.yml +++ b/Resources/Prototypes/GameRules/cargo_gifts.yml @@ -1,213 +1,213 @@ -- type: entity - id: GiftsPizzaPartySmall - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - weight: 10 - startDelay: 10 - duration: 120 - earliestStart: 20 - - type: CargoGiftsRule - description: cargo-gift-pizza-small - sender: cargo-gift-default-sender - dest: cargo-gift-dest-bar - gifts: - FoodPizzaLarge: 1 # 16 pizzas - FoodBarSupply: 1 - FoodSoftdrinks: 1 - CrateVendingMachineRestockRobustSoftdrinks: 1 +#- type: entity +# id: GiftsPizzaPartySmall +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# weight: 10 +# startDelay: 10 +# duration: 120 +# earliestStart: 20 +# - type: CargoGiftsRule +# description: cargo-gift-pizza-small +# sender: cargo-gift-default-sender +# dest: cargo-gift-dest-bar +# gifts: +# FoodPizzaLarge: 1 # 16 pizzas +# FoodBarSupply: 1 +# FoodSoftdrinks: 1 +# CrateVendingMachineRestockRobustSoftdrinks: 1 -- type: entity - id: GiftsPizzaPartyLarge - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - weight: 6 - startDelay: 10 - duration: 240 - earliestStart: 20 - minimumPlayers: 1 - - type: CargoGiftsRule - description: cargo-gift-pizza-large - sender: cargo-gift-default-sender - dest: cargo-gift-dest-bar - gifts: - FoodPizzaLarge: 4 # 64 pizzas - FoodBarSupply: 1 - FoodSoftdrinksLarge: 1 +#- type: entity +# id: GiftsPizzaPartyLarge +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# weight: 6 +# startDelay: 10 +# duration: 240 +# earliestStart: 20 +# minimumPlayers: 1 +# - type: CargoGiftsRule +# description: cargo-gift-pizza-large +# sender: cargo-gift-default-sender +# dest: cargo-gift-dest-bar +# gifts: +# FoodPizzaLarge: 4 # 64 pizzas +# FoodBarSupply: 1 +# FoodSoftdrinksLarge: 1 -- type: entity - id: GiftsEngineering - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - weight: 4 - startDelay: 10 - duration: 240 - earliestStart: 15 - minimumPlayers: 1 - - type: CargoGiftsRule - description: cargo-gift-eng - sender: cargo-gift-default-sender - dest: cargo-gift-dest-eng - gifts: - EngineeringCableBulk: 1 - AirlockKit: 1 - MaterialSteel: 1 - MaterialPlasteel: 1 - MaterialGlass: 1 - CrateVendingMachineRestockEngineering: 1 +#- type: entity +# id: GiftsEngineering +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# weight: 4 +# startDelay: 10 +# duration: 240 +# earliestStart: 15 +# minimumPlayers: 1 +# - type: CargoGiftsRule +# description: cargo-gift-eng +# sender: cargo-gift-default-sender +# dest: cargo-gift-dest-eng +# gifts: +# EngineeringCableBulk: 1 +# AirlockKit: 1 +# MaterialSteel: 1 +# MaterialPlasteel: 1 +# MaterialGlass: 1 +# CrateVendingMachineRestockEngineering: 1 -- type: entity - id: GiftsVendingRestock - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - weight: 4 - startDelay: 10 - duration: 120 - earliestStart: 15 - minimumPlayers: 1 - - type: CargoGiftsRule - description: cargo-gift-vending - sender: cargo-gift-default-sender - dest: cargo-gift-dest-supp - gifts: - CrateVendingMachineRestockHotDrinks: 3 - CrateVendingMachineRestockBooze: 1 - CrateVendingMachineRestockNutriMax: 1 - CrateVendingMachineRestockRobustSoftdrinks: 2 - CrateVendingMachineRestockVendomat: 1 - CrateVendingMachineRestockGetmoreChocolateCorp: 1 +#- type: entity +# id: GiftsVendingRestock +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# weight: 4 +# startDelay: 10 +# duration: 120 +# earliestStart: 15 +# minimumPlayers: 1 +# - type: CargoGiftsRule +# description: cargo-gift-vending +# sender: cargo-gift-default-sender +# dest: cargo-gift-dest-supp +# gifts: +# CrateVendingMachineRestockHotDrinks: 3 +# CrateVendingMachineRestockBooze: 1 +# CrateVendingMachineRestockNutriMax: 1 +# CrateVendingMachineRestockRobustSoftdrinks: 2 +# CrateVendingMachineRestockVendomat: 1 +# CrateVendingMachineRestockGetmoreChocolateCorp: 1 -- type: entity - id: GiftsJanitor - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - weight: 8 - startDelay: 10 - duration: 120 - earliestStart: 20 - minimumPlayers: 1 - - type: CargoGiftsRule - description: cargo-gift-cleaning - sender: cargo-gift-default-sender - dest: cargo-gift-dest-janitor - gifts: - ServiceJanitorial: 2 - ServiceLightsReplacement: 2 - ServiceJanitorBiosuit: 1 +#- type: entity +# id: GiftsJanitor +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# weight: 8 +# startDelay: 10 +# duration: 120 +# earliestStart: 20 +# minimumPlayers: 1 +# - type: CargoGiftsRule +# description: cargo-gift-cleaning +# sender: cargo-gift-default-sender +# dest: cargo-gift-dest-janitor +# gifts: +# ServiceJanitorial: 2 +# ServiceLightsReplacement: 2 +# ServiceJanitorBiosuit: 1 -- type: entity - id: GiftsMedical - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - weight: 1 - startDelay: 10 - duration: 120 - earliestStart: 20 - minimumPlayers: 1 - - type: CargoGiftsRule - description: cargo-gift-medical-supply - sender: cargo-gift-default-sender - dest: cargo-gift-dest-med - gifts: - MedicalSupplies: 1 - MedicalChemistrySupplies: 1 - EmergencyBruteKit: 1 - EmergencyAdvancedKit: 1 - MedicalBiosuit: 1 +#- type: entity +# id: GiftsMedical +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# weight: 1 +# startDelay: 10 +# duration: 120 +# earliestStart: 20 +# minimumPlayers: 1 +# - type: CargoGiftsRule +# description: cargo-gift-medical-supply +# sender: cargo-gift-default-sender +# dest: cargo-gift-dest-med +# gifts: +# MedicalSupplies: 1 +# MedicalChemistrySupplies: 1 +# EmergencyBruteKit: 1 +# EmergencyAdvancedKit: 1 +# MedicalBiosuit: 1 -- type: entity - id: GiftsSpacingSupplies - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - weight: 8 - startDelay: 10 - duration: 120 - earliestStart: 10 - minimumPlayers: 1 - - type: CargoGiftsRule - description: cargo-gift-space-protection - sender: cargo-gift-default-sender - dest: cargo-gift-dest-supp - gifts: - EmergencyInternalsLarge: 2 - EmergencyInflatablewall: 1 - EmergencyAdvancedKit: 1 - MedicalBiosuit: 1 - EmergencyO2Kit: 1 - MedicalSupplies: 1 - MedicalChemistrySupplies: 1 - EmergencyBruteKit: 1 +#- type: entity +# id: GiftsSpacingSupplies +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# weight: 8 +# startDelay: 10 +# duration: 120 +# earliestStart: 10 +# minimumPlayers: 1 +# - type: CargoGiftsRule +# description: cargo-gift-space-protection +# sender: cargo-gift-default-sender +# dest: cargo-gift-dest-supp +# gifts: +# EmergencyInternalsLarge: 2 +# EmergencyInflatablewall: 1 +# EmergencyAdvancedKit: 1 +# MedicalBiosuit: 1 +# EmergencyO2Kit: 1 +# MedicalSupplies: 1 +# MedicalChemistrySupplies: 1 +# EmergencyBruteKit: 1 -- type: entity - id: GiftsFireProtection - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - weight: 4 - startDelay: 10 - duration: 120 - earliestStart: 20 - minimumPlayers: 1 - - type: CargoGiftsRule - description: cargo-gift-fire-protection - sender: cargo-gift-default-sender - dest: cargo-gift-dest-supp - gifts: - EmergencyFire: 2 - EmergencyBurnKit: 1 - EmergencyBruteKit: 1 +#- type: entity +# id: GiftsFireProtection +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# weight: 4 +# startDelay: 10 +# duration: 120 +# earliestStart: 20 +# minimumPlayers: 1 +# - type: CargoGiftsRule +# description: cargo-gift-fire-protection +# sender: cargo-gift-default-sender +# dest: cargo-gift-dest-supp +# gifts: +# EmergencyFire: 2 +# EmergencyBurnKit: 1 +# EmergencyBruteKit: 1 -- type: entity - id: GiftsSecurityGuns - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - weight: 4 - startDelay: 10 - duration: 120 - earliestStart: 20 - minimumPlayers: 1 - - type: CargoGiftsRule - description: cargo-gift-security-guns - sender: cargo-gift-default-sender - dest: cargo-gift-dest-sec - gifts: - SecurityArmor: 3 - ArmorySmg: 1 - ArmoryShotgun: 1 - ArmoryLaser: 1 +#- type: entity +# id: GiftsSecurityGuns +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# weight: 4 +# startDelay: 10 +# duration: 120 +# earliestStart: 20 +# minimumPlayers: 1 +# - type: CargoGiftsRule +# description: cargo-gift-security-guns +# sender: cargo-gift-default-sender +# dest: cargo-gift-dest-sec +# gifts: +# SecurityArmor: 3 +# ArmorySmg: 1 +# ArmoryShotgun: 1 +# ArmoryLaser: 1 -- type: entity - id: GiftsSecurityRiot - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - weight: 4 - startDelay: 10 - duration: 120 - earliestStart: 20 - minimumPlayers: 1 - - type: CargoGiftsRule - description: cargo-gift-security-riot - sender: cargo-gift-default-sender - dest: cargo-gift-dest-sec - gifts: - SecurityRiot: 2 - SecurityRestraints: 2 - SecurityNonLethal: 2 +#- type: entity +# id: GiftsSecurityRiot +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# weight: 4 +# startDelay: 10 +# duration: 120 +# earliestStart: 20 +# minimumPlayers: 1 +# - type: CargoGiftsRule +# description: cargo-gift-security-riot +# sender: cargo-gift-default-sender +# dest: cargo-gift-dest-sec +# gifts: +# SecurityRiot: 2 +# SecurityRestraints: 2 +# SecurityNonLethal: 2