From e9f0b869ee7ad1216d8400ebfbe847948d16f19c Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Tue, 24 Sep 2024 07:15:17 +0000 Subject: [PATCH 1/8] make cats attack mouse toy (#1877) * make cats attack mouse toy * make toy mouse bit work * pro * pro --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Prototypes/DeltaV/ai_factions.yml | 5 +++++ Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 6 ++++++ Resources/Prototypes/Entities/Mobs/NPCs/pets.yml | 2 ++ Resources/Prototypes/Entities/Objects/Fun/toys.yml | 11 +++++++++++ 4 files changed, 24 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/ai_factions.yml diff --git a/Resources/Prototypes/DeltaV/ai_factions.yml b/Resources/Prototypes/DeltaV/ai_factions.yml new file mode 100644 index 00000000000..783fc9d9889 --- /dev/null +++ b/Resources/Prototypes/DeltaV/ai_factions.yml @@ -0,0 +1,5 @@ +- type: npcFaction + id: Cat + hostile: + - Mouse + - SimpleHostile diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index e7d9f6f6364..8be302a5e2c 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -2867,6 +2867,12 @@ - type: Tag tags: - VimPilot + - type: HTN # DeltaV - make all cats eat mice + rootTask: + task: SimpleHostileCompound + - type: NpcFactionMember # DeltaV - give cats faction so they fight mice + factions: + - Cat - type: entity name: calico cat diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 3fe80c75c56..7733f0a4be6 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -135,6 +135,7 @@ - type: NpcFactionMember factions: - PetsNT + - Cat # DeltaV - type: HTN rootTask: task: SimpleHostileCompound @@ -158,6 +159,7 @@ - type: NpcFactionMember factions: - PetsNT + - Cat # DeltaV - type: Grammar attributes: proper: true diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 476f3e6cdfa..65ba53fcccf 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -666,6 +666,17 @@ equippedPrefix: mouse slots: - HEAD + # Begin DeltaV additions: make cats attack mouse toys to play with them + - type: Damageable + damageContainer: StructuralInorganic # not actually destructible, just lets it be attacked + - type: MobState + - type: MobThresholds + thresholds: + 0: Alive # always be considered alive + - type: NpcFactionMember + factions: + - Mouse + # End DeltaV additions - type: entity parent: BasePlushie From fc263ecced6a42ce77202affc7c1733dfc6a6cd4 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Tue, 24 Sep 2024 09:15:36 +0200 Subject: [PATCH 2/8] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 5a8914069df..efdaf97197c 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: FluffiestFloof - changes: - - message: Removed the random sentience event. - type: Remove - id: 80 - time: '2023-10-23T19:17:23.0000000+00:00' - author: Colin-Tel changes: - message: Fixed Tortuga station's critical lack of hardsuits @@ -3629,3 +3623,10 @@ id: 579 time: '2024-09-23T18:53:31.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1903 +- author: deltanedas + changes: + - message: Cats will now play with mouse toys. + type: Tweak + id: 580 + time: '2024-09-24T07:15:18.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1877 From c4d6e1b7819dbfaa1d4995579afa81b1ae9e7782 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Tue, 24 Sep 2024 16:30:50 +0000 Subject: [PATCH 3/8] revert mapping mode (#1907) Add mapping load acts (#30722) Smug doesn't seem to have time to fix mapping state and I don't want to dump more time into it so. Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- Content.Client/Commands/MappingClientSideSetupCommand.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Client/Commands/MappingClientSideSetupCommand.cs b/Content.Client/Commands/MappingClientSideSetupCommand.cs index eb2d13c9540..3255e85e18f 100644 --- a/Content.Client/Commands/MappingClientSideSetupCommand.cs +++ b/Content.Client/Commands/MappingClientSideSetupCommand.cs @@ -1,3 +1,4 @@ +using Content.Client.Actions; using Content.Client.Mapping; using Content.Client.Markers; using JetBrains.Annotations; @@ -25,7 +26,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) _entitySystemManager.GetEntitySystem().MarkersVisible = true; _lightManager.Enabled = false; shell.ExecuteCommand("showsubfloorforever"); - _stateManager.RequestStateChange(); + _entitySystemManager.GetEntitySystem().LoadActionAssignments("/mapping_actions.yml", false); } } } From 364acb1ddcf2f604566c5f283286aaf79d6074af Mon Sep 17 00:00:00 2001 From: Milon Date: Tue, 24 Sep 2024 18:33:01 +0200 Subject: [PATCH 4/8] nukie mouse yaml cleanup (#1900) * cleanup * autotraitor evil --- .../DeltaV/Entities/Mobs/NPCs/nukiemouse.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml index bde0a73504c..5036957a1d8 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml @@ -44,8 +44,6 @@ - SmallMobMask layer: - SmallMobLayer - - type: MobState - - type: Deathgasp - type: MobStateActions actions: Critical: @@ -60,10 +58,6 @@ - type: MovementSpeedModifier baseWalkSpeed : 3 baseSprintSpeed : 4.9 - - type: Reactive - groups: - Flammable: [Touch] - Extinguish: [Touch] - type: InventorySlots - type: UserInterface interfaces: @@ -126,7 +120,6 @@ Female: Mouse Unsexed: Mouse wilhelmProbability: 0.01 - - type: CombatMode - type: MeleeWeapon soundHit: path: /Audio/Effects/bite.ogg @@ -153,10 +146,6 @@ - type: ActiveRadio channels: - Syndicate - # make the player a traitor once its taken - - type: AutoTraitor - giveUplink: false - giveObjectives: false - type: InteractionPopup successChance: 0.6 interactSuccessString: petting-success-nukie-mouse From 07755a88e0b65ca9d1c4cc94183e4cde984fe0f8 Mon Sep 17 00:00:00 2001 From: Milon Date: Tue, 24 Sep 2024 18:33:08 +0200 Subject: [PATCH 5/8] fix telegnomes sliding on ice (#1898) * fix * shuffle shit around * trolled * webedit ops Signed-off-by: Milon --------- Signed-off-by: Milon --- .../Entities/Mobs/Player/special.yml | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/special.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/special.yml index d057423f1ba..01ae63659b6 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/special.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/special.yml @@ -1,13 +1,11 @@ - type: entity + parent: [ Incorporeal, BaseMob ] id: MobObserverTelegnostic name: telegnostic projection description: Ominous. categories: [ HideSpawnMenu ] components: - type: Sprite - overrideContainerOcclusion: true # Ghosts always show up regardless of where they're contained. - noRot: true - drawdepth: Ghosts sprite: Objects/Consumable/Food/bowl.rsi state: eyeball color: "#90EE90" @@ -15,28 +13,12 @@ - state: eyeball shader: unshaded - type: Psionic - - type: MindContainer - - type: Clickable - - type: InteractionOutline - type: Physics - bodyType: KinematicController fixedRotation: true - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.35 - density: 13 - mask: - - GhostImpassable - type: MovementSpeedModifier baseSprintSpeed: 8 baseWalkSpeed: 5 - - type: MovementIgnoreGravity #- type: PsionicallyInvisible - - type: InputMover - - type: Appearance - type: Eye drawFov: false visMask: @@ -44,7 +26,6 @@ - TelegnosticProjection - type: Input context: "ghost" - - type: Examiner - type: TelegnosticProjection - type: Stealth lastVisibility: 0.66 From be388de18c4d9a97968e4a96cace6c11bcdcfe34 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Tue, 24 Sep 2024 18:33:27 +0200 Subject: [PATCH 6/8] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index efdaf97197c..5836c1c28cb 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: Colin-Tel - changes: - - message: Fixed Tortuga station's critical lack of hardsuits - type: Fix - id: 81 - time: '2023-10-23T21:40:33.0000000+00:00' - author: Colin-Tel changes: - message: Removed prisoners from job selection, since they were spawning in arrivals. @@ -3630,3 +3624,10 @@ id: 580 time: '2024-09-24T07:15:18.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1877 +- author: MilonPL + changes: + - message: Telegnostic projections will no longer slide on ice. + type: Fix + id: 581 + time: '2024-09-24T16:33:09.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1898 From a900943164242f955e6e5a1bec3ea39f0126b8b0 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Tue, 24 Sep 2024 19:48:44 +0000 Subject: [PATCH 7/8] let goliaths pry doors (#1908) Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml index 877dd40cc38..ecf0c002a22 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml @@ -90,6 +90,12 @@ - id: FoodMeatGoliath amount: 3 - id: MaterialGoliathHide1 + - type: Prying # DeltaV: let sentient goliaths pry doors + pryPowered: true + force: true + speedModifier: 1.5 + useSound: + path: /Audio/Items/crowbar.ogg - type: entity id: ActionGoliathTentacle From a316329896295407f1a8956c5eca416da19ce0d4 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Tue, 24 Sep 2024 21:49:03 +0200 Subject: [PATCH 8/8] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 5836c1c28cb..53086154e67 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Colin-Tel - changes: - - message: Removed prisoners from job selection, since they were spawning in arrivals. - Warden no longer requires prisoner playtime in the meantime. - type: Remove - id: 82 - time: '2023-10-23T23:12:41.0000000+00:00' - author: VMSolidus changes: - message: Harpies can now be stripped, and can randomly be psychic @@ -3631,3 +3624,10 @@ id: 581 time: '2024-09-24T16:33:09.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1898 +- author: deltanedas + changes: + - message: Goliaths can now pry doors open. + type: Tweak + id: 582 + time: '2024-09-24T19:48:45.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1908