From 01d2be78a010d17bc9c43806e604c6e81284921e Mon Sep 17 00:00:00 2001 From: rhailrake <49613070+rhailrake@users.noreply.github.com> Date: Thu, 25 May 2023 23:44:55 +0600 Subject: [PATCH] =?UTF-8?q?[FIX]=20=D0=AF=20=D0=BD=D0=B5=20=D0=B5=D0=B1?= =?UTF-8?q?=D1=83=20=D1=87=D0=B5=20=D0=B3=D1=80=D0=B0=D0=B1=D0=BB=D0=B8=20?= =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # Resources/Prototypes/Catalog/catalog.yml # Resources/Prototypes/Entities/Clothing/Eyes/hud.yml # Resources/Prototypes/Entities/Mobs/Player/skrell.yml # Resources/Prototypes/Species/arachnid.yml # Resources/Prototypes/Species/diona.yml # Resources/Prototypes/Species/dwarf.yml # Resources/Prototypes/Species/reptilian.yml # Resources/Prototypes/Species/skeleton.yml # Resources/Prototypes/Species/skrell.yml # Resources/Prototypes/Species/slime.yml # Resources/Prototypes/Species/vox.yml # Resources/Prototypes/Voice/speech_emote_sounds.yml --- Content.Server/White/Other/OnDeath.cs | 10 ++-- Content.Shared/Store/ListingPrototype.cs | 2 +- Resources/Audio/Voice/Felinid/cat_wilhelm.ogg | Bin 0 -> 32019 bytes .../MeatyOrePanel/meatyore_catalog.yml | 6 +- Resources/Prototypes/Maps/White/wonderbox.yml | 52 ------------------ Resources/Prototypes/Species/arachnid.yml | 5 +- .../Prototypes/Voice/speech_emote_sounds.yml | 30 ++++++++++ .../NonPeacefulRoundItems.yml | 2 - .../Prototypes/White/Species/felinid.yml | 1 - 9 files changed, 42 insertions(+), 66 deletions(-) create mode 100644 Resources/Audio/Voice/Felinid/cat_wilhelm.ogg delete mode 100644 Resources/Prototypes/Maps/White/wonderbox.yml diff --git a/Content.Server/White/Other/OnDeath.cs b/Content.Server/White/Other/OnDeath.cs index c683dbf1d5..e79f83869d 100644 --- a/Content.Server/White/Other/OnDeath.cs +++ b/Content.Server/White/Other/OnDeath.cs @@ -3,6 +3,7 @@ using Content.Server.Ghost.Components; using Content.Shared.Ghost; using Content.Shared.Humanoid; using Content.Shared.Mobs; +using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Random; @@ -18,7 +19,7 @@ public sealed class OnDeath : EntitySystem public override void Initialize() { SubscribeLocalEvent(HandleDeathEvent); - SubscribeLocalEvent(OnGhosted); + SubscribeLocalEvent(OnDetach); } private readonly Dictionary _playingStreams = new(); @@ -89,9 +90,8 @@ public sealed class OnDeath : EntitySystem private void PlayDeathSound(EntityUid uid) => _audio.PlayEntity(DeathSounds, uid, uid, AudioParams.Default); - private void OnGhosted(EntityUid uid, GhostComponent component, ComponentInit args) - { - StopPlayingStream(uid); - } + private void OnDetach(EntityUid uid, HumanoidAppearanceComponent component, PlayerDetachedEvent args) + => StopPlayingStream(args.Entity); + } diff --git a/Content.Shared/Store/ListingPrototype.cs b/Content.Shared/Store/ListingPrototype.cs index 8ba0745b0a..e18a43544c 100644 --- a/Content.Shared/Store/ListingPrototype.cs +++ b/Content.Shared/Store/ListingPrototype.cs @@ -86,7 +86,7 @@ public partial class ListingData : IEquatable, ICloneable /// /// used internally for tracking how many times an item was purchased. /// - public int PurchaseAmount = 0; + public int PurchaseAmount; /// /// Used to delay purchase of some items. diff --git a/Resources/Audio/Voice/Felinid/cat_wilhelm.ogg b/Resources/Audio/Voice/Felinid/cat_wilhelm.ogg new file mode 100644 index 0000000000000000000000000000000000000000..45934ebeb344b92d6bd477fd9006c468457a7ce9 GIT binary patch literal 32019 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 literal 0 HcmV?d00001 diff --git a/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml b/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml index ac560ad686..9a86646620 100644 --- a/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml +++ b/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml @@ -1484,14 +1484,14 @@ id: MeatyBecomeTraitor name: Антажка description: Выдать себе антажку - productEvent: !type:MeatyTraitorRequestActionEvent - cost: - MeatyOreCoin: 10 categories: - MeatyOreAntag + cost: + MeatyOreCoin: 10 conditions: - !type:BuyerBlockForAntagCondition - !type:BuyerBlockForMindProtected + productEvent: !type:MeatyTraitorRequestActionEvent # Special diff --git a/Resources/Prototypes/Maps/White/wonderbox.yml b/Resources/Prototypes/Maps/White/wonderbox.yml deleted file mode 100644 index 20477696d2..0000000000 --- a/Resources/Prototypes/Maps/White/wonderbox.yml +++ /dev/null @@ -1,52 +0,0 @@ -- type: gameMap - id: WonderBox - mapName: 'WonderBox Station' - mapPath: /Maps/White/WonderBox.yml - minPlayers: 50 - stations: - WonderBoxStation: - stationProto: StandardNanotrasenStation - components: - - type: StationNameSetup - mapNameTemplate: '{0} WonderBox Station {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: 'TG' - - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml - - type: StationJobs - overflowJobs: - - Passenger - availableJobs: - CargoTechnician: [ 6, 6 ] - Passenger: [ -1, -1 ] - Bartender: [ 2, 2 ] - Botanist: [ 6, 6 ] - Chef: [ 3, 3 ] - Clown: [ 1, 1 ] - Janitor: [ 4, 4 ] - Mime: [ 1, 1 ] - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] - ChiefEngineer: [ 1, 1 ] - StationEngineer: [ 10, 10 ] - ChiefMedicalOfficer: [ 1, 1 ] - MedicalDoctor: [ 8, 8 ] - Chemist: [ 3, 3 ] - ResearchDirector: [ 1, 1 ] - Scientist: [ 8, 8 ] - HeadOfSecurity: [ 1, 1 ] - SecurityOfficer: [ 6, 6 ] - Chaplain: [ 1, 1 ] - Warden: [ 1, 1 ] - Librarian: [ 2, 2 ] - Lawyer: [ 2, 2 ] - Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 6, 6 ] - AtmosphericTechnician: [ 4, 4 ] - TechnicalAssistant: [ 4, 4 ] - MedicalIntern: [ 3, 3 ] - ServiceWorker: [ 3, 3 ] - SecurityCadet: [ 6, 6 ] - Detective: [ 1, 1 ] - ResearchAssistant: [ 3, 3 ] diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml index 07a72cda17..a73d557422 100644 --- a/Resources/Prototypes/Species/arachnid.yml +++ b/Resources/Prototypes/Species/arachnid.yml @@ -1,7 +1,7 @@ - type: species id: Arachnid name: species-name-arachnid - roundStart: true + roundStart: false prototype: MobArachnid sprites: MobArachnidSprites defaultSkinTone: "#385878" @@ -10,7 +10,8 @@ skinColoration: Hues maleFirstNames: names_arachnid_first femaleFirstNames: names_arachnid_first - lastNames: names_arachnid_last + maleLastNames: names_arachnid_last + femaleLastNames: names_arachnid_last sexes: - Unsexed diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index b828d576eb..16929ce68c 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -76,6 +76,22 @@ collection: FelinidScreams Laugh: collection: MaleLaugh + Sneeze: + collection: MaleSneezes + Cough: + collection: MaleCoughs + Yawn: + collection: MaleYawn + Snore: + collection: Snores + Honk: + collection: BikeHorn + Sigh: + collection: MaleSigh + Crying: + collection: MaleCry + Whistle: + collection: Whistles Hiss: collection: FelinidHisses Meow: @@ -96,6 +112,20 @@ collection: FelinidScreams Laugh: collection: FemaleLaugh + Sneeze: + collection: FemaleSneezes + Cough: + collection: FemaleCoughs + Yawn: + collection: FemaleYawn + Snore: + collection: Snores + Sigh: + collection: FemaleSigh + Crying: + collection: FemaleCry + Whistle: + collection: Whistles Hiss: collection: FelinidHisses Meow: diff --git a/Resources/Prototypes/White/NonPeacefulRound/NonPeacefulRoundItems.yml b/Resources/Prototypes/White/NonPeacefulRound/NonPeacefulRoundItems.yml index 090376f7b7..f91cd49bdd 100644 --- a/Resources/Prototypes/White/NonPeacefulRound/NonPeacefulRoundItems.yml +++ b/Resources/Prototypes/White/NonPeacefulRound/NonPeacefulRoundItems.yml @@ -1,5 +1,4 @@ - type: nonPeacefulRoundEndItems - name: nonPeacefulRoundEndItems id: nonPeacefulRoundEndRange items: - WeaponSubMachineGunVector @@ -24,7 +23,6 @@ - Stunbaton - type: nonPeacefulRoundEndItems - name: nonPeacefulRoundEndItems id: nonPeacefulRoundEndMelee items: - FireAxeFlaming diff --git a/Resources/Prototypes/White/Species/felinid.yml b/Resources/Prototypes/White/Species/felinid.yml index 5cc33f76a3..12f8e27734 100644 --- a/Resources/Prototypes/White/Species/felinid.yml +++ b/Resources/Prototypes/White/Species/felinid.yml @@ -3,7 +3,6 @@ name: species-name-felinid roundStart: true prototype: MobFelinid - sprites: MobHumanSprites markingLimits: MobFelinidMarkingLimits dollPrototype: MobFelinidDummy skinColoration: HumanToned