Nerf & standardised slip times (#27879)

* standardised slip times

* puddle and gib soap

* banana peels

* cleaned yaml by shifting to component

* error slip

* error slip intersect

* intersect ratio return

* error and omega soap changes

* SlipocalypseClusterSoap 2 tc cost

diff --git a/Content.Shared/Slippery/SlipperyComponent.cs b/Content.Shared/Slippery/SlipperyComponent.cs
index b80a9b57e4d4a12cb3b15e10e5ad41ad08c0445e..154ca6c51a450baf143e1464dcebb7a966d12923 100644 (file)
--- a/Content.Shared/Slippery/SlipperyComponent.cs
+++ b/Content.Shared/Slippery/SlipperyComponent.cs
@@ -25,14 +25,14 @@ namespace Content.Shared.Slippery
         /// </summary>
         [DataField, AutoNetworkedField]
         [Access(Other = AccessPermissions.ReadWrite)]
-        public float ParalyzeTime = 3f;
+        public float ParalyzeTime = 1.5f;
 
         /// <summary>
         /// The entity's speed will be multiplied by this to slip it forwards.
         /// </summary>
         [DataField, AutoNetworkedField]
         [Access(Other = AccessPermissions.ReadWrite)]
-        public float LaunchForwardsMultiplier = 1f;
+        public float LaunchForwardsMultiplier = 1.5f;
 
         /// <summary>
         /// If this is true, any slipping entity loses its friction until

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 9bd10c8ef0a24e52c88e6052d1dda1778afd4987..c9dc048cd3817ac93be510671eafec7d4d3c3d60 100644 (file)
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -784,7 +784,7 @@
   description: uplink-slipocalypse-clustersoap-desc
   productEntity: SlipocalypseClusterSoap
   cost:
-    Telecrystal: 3
+    Telecrystal: 2
   categories:
   - UplinkDisruption
 

diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml
index fecf9f19a4785d017b0d4093a645fd578619c8a2..62bb923a61b309fb72b8a477b794f0a1be44fb23 100644 (file)
--- a/Resources/Prototypes/Entities/Effects/puddle.yml
+++ b/Resources/Prototypes/Entities/Effects/puddle.yml
@@ -113,7 +113,6 @@
   components:
   - type: Clickable
   - type: Slippery
-    launchForwardsMultiplier: 2.0
   - type: Transform
     noRot: true
     anchored: true

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index a74e3450e94038979700b774d3cc2a91e63e25dc..b2375a2dbf98d837caad3c0406e7fcfb53132674 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -311,7 +311,6 @@
     sprite: Objects/Specific/Hydroponics/banana.rsi
     heldPrefix: peel
   - type: Slippery
-    launchForwardsMultiplier: 1.5
   - type: StepTrigger
     intersectRatio: 0.2
   - type: CollisionWake
@@ -388,7 +387,6 @@
       path: /Audio/Effects/slip.ogg
       params:
         volume: -100
-    launchForwardsMultiplier: 1.6
 
 - type: entity
   name: bananium peel
@@ -402,8 +400,6 @@
     sprite: Objects/Materials/materials.rsi
     heldPrefix: peel
   - type: Slippery
-    paralyzeTime: 4
-    launchForwardsMultiplier: 2
 
 - type: entity
   name: carrot

diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index bf0b7190b5b3add66dd97ddd6e6ab659affd5f73..04b023248e8fae752ad19fc0d60896bb0695be9a 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -257,9 +257,7 @@
     borderColor: "#C18199"
   - type: Icon
     state: pda-clown
-  - type: Slippery
-    paralyzeTime: 4
-    launchForwardsMultiplier: 1.5
+  - type: Slippery # secretly made of bananium
   - type: StepTrigger
   - type: CollisionWake
     enabled: false

diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
index 8cb3d88ede27130562e1c41a7d0ff09589f7c460..243a816a47811e6db6cee516f84b81271ae07169 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
@@ -162,8 +162,6 @@
     sound:
        path: /Audio/Items/bikehorn.ogg
   - type: Slippery
-    paralyzeTime: 4
-    launchForwardsMultiplier: 1.5
   - type: StepTrigger
   - type: CollisionWake
     enabled: false

diff --git a/Resources/Prototypes/Entities/Objects/Fun/error.yml b/Resources/Prototypes/Entities/Objects/Fun/error.yml
index 8f3fc211378377e031d03d44878beb3abf6da093..e4b9af61e0ae157d0b63feb8b824c9a37f914492 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/error.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/error.yml
@@ -16,7 +16,8 @@
         - ReagentId: Nutriment
           Quantity: 5
   - type: Slippery
-    launchForwardsMultiplier: 5
+    paralyzeTime: 3
+    launchForwardsMultiplier: 3
   - type: StepTrigger
     intersectRatio: 0.2
   - type: CollisionWake
@@ -28,14 +29,14 @@
       slips:
         shape:
           !type:PhysShapeAabb
-          bounds: "-0.2,-0.2,0.2,0.2"
+          bounds: "-0.4,-0.3,0.4,0.3"
         hard: false
         layer:
         - SlipLayer
       fix1:
         shape:
           !type:PhysShapeAabb
-          bounds: "-0.2,-0.2,0.2,0.2"
+          bounds: "-0.4,-0.3,0.4,0.3"
         density: 30
         mask:
         - ItemMask

diff --git a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
index 9561fa3538f7bed05a855daa002de659cc774a86..02feda953f8c38930247d33def8f143802f43283 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
@@ -108,8 +108,6 @@
     - type: Transform
       anchored: true
     - type: Slippery
-      paralyzeTime: 2
-      launchForwardsMultiplier: 1.5
     - type: StepTrigger
       intersectRatio: 0.2
     - type: Physics

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
index 5678de6bafc5f49728edfd7047a04174d797ed20..efb93a88680e97e809cfb645779cf6d5bd384e8d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
@@ -21,8 +21,6 @@
     sprite: Objects/Specific/Janitorial/soap.rsi
     storedRotation: -90
   - type: Slippery
-    paralyzeTime: 2
-    launchForwardsMultiplier: 1.5
   - type: StepTrigger
     intersectRatio: 0.2
   - type: CollisionWake
@@ -129,8 +127,8 @@
   - type: SolutionContainerVisuals
     fillBaseName: syndie-
   - type: Slippery
-    paralyzeTime: 5
-    launchForwardsMultiplier: 2.5
+    paralyzeTime: 3
+    launchForwardsMultiplier: 3
   - type: Item
     heldPrefix: syndie
   - type: FlavorProfile
@@ -154,8 +152,8 @@
     layers:
     - state: syndie-soaplet
   - type: Slippery
-    paralyzeTime: 5
-    launchForwardsMultiplier: 2.5
+    paralyzeTime: 1.5 # these things are tiny
+    launchForwardsMultiplier: 1.5
   - type: StepTrigger
     intersectRatio: 0.04
   - type: Item
@@ -196,7 +194,6 @@
   - type: SolutionContainerVisuals
     fillBaseName: gibs-
   - type: Slippery
-    paralyzeTime: 2
   - type: StepTrigger
   - type: Item
     heldPrefix: gibs
@@ -221,8 +218,8 @@
   - type: SolutionContainerVisuals
     fillBaseName: omega-
   - type: Slippery
-    paralyzeTime: 7
-    launchForwardsMultiplier: 3
+    paralyzeTime: 5.0
+    launchForwardsMultiplier: 3.0
   - type: Item
     heldPrefix: omega
   - type: SolutionContainerManager

diff --git a/Resources/Prototypes/Entities/Tiles/bananium.yml b/Resources/Prototypes/Entities/Tiles/bananium.yml
index c9a6ec2844100ac1885e04684763185034b51c3e..fa8cfdd001aa18803543b5c4e2517c8590b7eee2 100644 (file)
--- a/Resources/Prototypes/Entities/Tiles/bananium.yml
+++ b/Resources/Prototypes/Entities/Tiles/bananium.yml
@@ -44,8 +44,6 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Slippery
-    paralyzeTime: 2
-    launchForwardsMultiplier: 1.5
   - type: StepTrigger
     intersectRatio: 0.2
   - type: Physics

diff --git a/Resources/Prototypes/Reagents/cleaning.yml b/Resources/Prototypes/Reagents/cleaning.yml
index da02fc666d8abff9f77355190f6ac10491e9d3dd..a6b53be68836e8946173f592706ff59b839f2bb5 100644 (file)
--- a/Resources/Prototypes/Reagents/cleaning.yml
+++ b/Resources/Prototypes/Reagents/cleaning.yml
@@ -77,8 +77,6 @@
   meltingPoint: 18.2
   tileReactions:
     - !type:SpillTileReaction
-      paralyzeTime: 3
-      launchForwardsMultiplier: 2
       requiredSlipSpeed: 1
       superSlippery: true