Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Разобрал наболевшие баги, закомментил подарки карго #427

Merged
merged 3 commits into from
Feb 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Content.Server/Polymorph/Systems/PolymorphSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public sealed partial class ChangelingComponent : Component
/// How fast the changeling will turn visible from movement when using chameleon skin.
/// </summary>
[DataField]
public float ChameleonSkinMovementVisibilityRate = 0.60f;
public float ChameleonSkinMovementVisibilityRate = 0.30f;
#endregion

#region Dissonant Shriek Ability
Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/Humanoid/SkinColor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
9 changes: 9 additions & 0 deletions Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
1 change: 1 addition & 0 deletions Resources/Prototypes/Damage/modifier_sets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@
Asphyxiation: 0.0
Bloodloss: 0.0
Cellular: 0.0
Shock: 0.5
flatReductions:
Blunt: 5

Expand Down
25 changes: 24 additions & 1 deletion Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@
- type: Tag
tags:
- VimPilot
- type: LanguageSpeaker
speaks:
- Mouse
understands:
- Mouse

- type: entity
name: bee
Expand Down Expand Up @@ -1035,6 +1040,11 @@
- type: HTN
rootTask:
task: SimpleHostileCompound
- type: LanguageSpeaker # Frontier
speaks:
- Monkey
understands:
- Monkey

- type: entity
name: kangaroo
Expand Down Expand Up @@ -1287,7 +1297,7 @@
- type: Speech
speechSounds: Monkey
speechVerb: Monkey
- type: MonkeyAccent
#- type: MonkeyAccent
- type: NpcFactionMember
factions:
- Syndicate
Expand All @@ -1299,6 +1309,13 @@
- type: GhostTakeoverAvailable
- type: Loadout
prototypes: [SyndicateOperativeGearMonkey]
- type: LanguageSpeaker # Frontier
speaks:
- Monkey
understands:
- GalacticCommon
- Monkey


- type: entity
id: MobMonkeySyndicateAgent
Expand Down Expand Up @@ -3067,6 +3084,12 @@
- type: MobPrice
price: 60
- type: NonSpreaderZombie
- type: LanguageSpeaker # Frontier
speaks:
- Mouse
understands:
- Mouse


- type: entity
name: pig
Expand Down
57 changes: 53 additions & 4 deletions Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,13 @@
tags:
- CannotSuicide
- VimPilot
- type: LanguageSpeaker # Frontier
speaks:
- Cat
understands:
- GalacticCommon
- Cat


- type: entity
name: Exception
Expand All @@ -146,6 +153,13 @@
tags:
- CannotSuicide
- VimPilot
- type: LanguageSpeaker # Frontier
speaks:
- Cat
understands:
- GalacticCommon
- Cat


- type: entity
name: Floppa
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -322,6 +343,13 @@
- VimPilot
- type: StealTarget
stealGroup: AnimalMcGriff
- type: LanguageSpeaker # Frontier
speaks:
- Dog
understands:
- GalacticCommon
- Dog


- type: entity
name: Paperwork
Expand Down Expand Up @@ -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
Expand All @@ -421,6 +449,13 @@
- VimPilot
- type: StealTarget
stealGroup: AnimalWalter
- type: LanguageSpeaker # Frontier
speaks:
- Dog
understands:
- GalacticCommon
- Dog


- type: entity
name: Morty
Expand Down Expand Up @@ -619,6 +654,13 @@
- VimPilot
- type: StealTarget
stealGroup: AnimalHamlet
- type: LanguageSpeaker # Frontier
speaks:
- Mouse
understands:
- GalacticCommon
- Mouse


- type: entity
name: Shiva
Expand Down Expand Up @@ -820,6 +862,13 @@
gender: male
- type: StealTarget
stealGroup: AnimalPunPun
- type: LanguageSpeaker # Frontier
speaks:
- Monkey
understands:
- GalacticCommon
- Monkey


- type: entity
name: Tropico
Expand Down
Loading
Loading