Merge branch 'DeltaV-Station:master' into CybersunShuttle

DeltaV-Station · Sep 25, 2024 · 1698b08 · 1698b08
2 parents 36ed223 + a316329
commit 1698b08
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 51 deletions.
diff --git 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<MarkerSystem>().MarkersVisible = true;
             _lightManager.Enabled = false;
             shell.ExecuteCommand("showsubfloorforever");
-            _stateManager.RequestStateChange<MappingState>();
+            _entitySystemManager.GetEntitySystem<ActionsSystem>().LoadActionAssignments("/mapping_actions.yml", false);
         }
     }
 }

diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,23 +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
-    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.
-      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
@@ -3629,3 +3610,24 @@
   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
+- 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
+- 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
diff --git 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

diff --git a/Resources/Prototypes/DeltaV/ai_factions.yml 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
@@ -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/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

diff --git 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
@@ -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

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/special.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/special.yml
@@ -1,50 +1,31 @@
 - 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"
     layers:
       - 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:
       - Normal
       - TelegnosticProjection
   - type: Input
     context: "ghost"
-  - type: Examiner
   - type: TelegnosticProjection
   - type: Stealth
     lastVisibility: 0.66