No take; Only throw. (#40143)

* commit atrocities

* hail satan

* Channel Pavlovian horror

* pet kitty cat

* Taint universe forever

* Assault sensibilities

* sully existence

* tarnish morality

* The degunnening

* encratening

* Update toys.yml

* add few pixels to fix vulp inhands

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index 6e26006ef14eb2dee0388a3d1bde6e032717b36a..997b3d91b459e36a034ffe2732467baeaef054eb 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -414,6 +414,8 @@
       - id: ClothingShoesClownLarge
       - id: ClothingHeadHatMagician
       - id: BeachBall
+      - id: TennisBall
+        amount: 2
       - id: ClothingShoesSkates
       - id: RubberChicken
 

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index c223efe1a087b3cf0100f89b4ed9345569e2bb9a..bb3829a2dde21a15e7a7c8b6677a293e3b160e23 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -114,6 +114,7 @@
       - id: ToySkeleton
       - id: Basketball
       - id: Football
+      - id: TennisBall
       - id: BalloonNT
       - id: BalloonCorgi
       - id: MysteryFigureBox

diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
index de25ec9eb47547455314693edeb166d22f576aba..5b0c9448a6aa29cd238e3dea644cb148aeb3897b 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -100,6 +100,8 @@
         orGroup: GiftPool
       - id: ClothingNeckCloakMoth
         orGroup: GiftPool
+      - id: TennisBall
+        orGroup: GiftPool
       - id: ToyMouse
         orGroup: GiftPool
       - id: ToyAi

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index c1aea7ecd5e5188c50b4a923f7b93f79cb8526bd..0c8ef383c59c1561a6cac9eb16f7143e2a12bdae 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -453,6 +453,47 @@
     size: Small
     sprite: Objects/Fun/Balls/football.rsi
 
+- type: entity
+  parent: BaseItem
+  id: TennisBall
+  name: tennis ball
+  description: A fuzzy orb of endless betrayal.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Balls/tennisball.rsi
+    state: icon
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.25
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.5 # a little bouncy
+        friction: 0.2
+  - type: Catchable
+    catchChance: 0.8
+    catchSuccessSound:
+      path: /Audio/Effects/Footsteps/bounce.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Effects/Footsteps/bounce.ogg
+  - type: Item
+    size: Small
+    sprite: Objects/Fun/Balls/tennisball.rsi
+  - type: EmitSoundOnUse
+    sound:
+      collection: ToySqueak
+      params:
+        volume: -4
+  - type: UseDelay
+  - type: Clothing
+    slots: [mask]
+  - type: Tag
+    tags:
+    - PetWearable
+
 - type: entity
   parent: BaseItem
   id: BeachBall

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index cff52ee3a390c76d9d2702d085f0235882616eac..4d6738b285be1a64c0b05a18ddd208c682fb5df0 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -971,6 +971,42 @@
       types:
         Piercing: 0
 
+- type: entity
+  id: BulletTennis
+  name: tennis ball
+  description: A fuzzy orb of endless betrayal.
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Physics
+    bodyType: Dynamic
+    linearDamping: 0
+    angularDamping: 0
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.1,-0.1,0.1,0.1"
+        hard: false
+        mask:
+        - Impassable
+        - BulletImpassable
+  - type: Sprite
+    sprite: Objects/Fun/Balls/tennisball.rsi
+    layers:
+      - state: icon
+  - type: Ammo
+    muzzleFlash: null
+  - type: Projectile
+    deleteOnCollide: true
+    damage:
+      types:
+        Piercing: 0
+    soundHit: null
+  - type: TimedDespawn
+    lifetime: 10
+    
+
 - type: entity
   id: BulletAcid
   name: acid spit

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
index 84df160258f9a5959f521488f9dcca0443c9d9e9..27990fb04a4118345b81ed2069cbf65f4f3c8e28 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -128,6 +128,7 @@
     - PlasticBanana
     - RevolverCapGun
     - SnapPopBox
+    - TennisBall
     - ToyMouse
     - ToyAi
     - ToyNuke

diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-dog.png b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-dog.png
new file mode 100644 (file)
index 0000000..7a8d57d
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-dog.png differ

diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-fox.png b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-fox.png
new file mode 100644 (file)
index 0000000..deb668c
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-fox.png differ

diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-puppy.png b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-puppy.png
new file mode 100644 (file)
index 0000000..6ee92fc
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-puppy.png differ

diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-reptilian.png
new file mode 100644 (file)
index 0000000..4a2dce6
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-reptilian.png differ

diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-vox.png b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-vox.png
new file mode 100644 (file)
index 0000000..0e7315a
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-vox.png differ

diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-vulpkanin.png
new file mode 100644 (file)
index 0000000..96a574b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK-vulpkanin.png differ

diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK.png b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK.png
new file mode 100644 (file)
index 0000000..2e909e1
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/equipped-MASK.png differ

diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/icon.png b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/icon.png
new file mode 100644 (file)
index 0000000..f874ccb
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..be1f125
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..00d9479
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/meta.json b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/meta.json
new file mode 100644 (file)
index 0000000..57651f6
--- /dev/null
+++ b/Resources/Textures/Objects/Fun/Balls/tennisball.rsi/meta.json
@@ -0,0 +1,50 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Created by IproduceWidgets (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+       {
+      "name": "equipped-MASK",
+      "directions": 4
+    },
+       {
+      "name": "equipped-MASK-reptilian",
+      "directions": 4
+    },
+       {
+      "name": "equipped-MASK-vox",
+      "directions": 4
+    },
+       {
+      "name": "equipped-MASK-vulpkanin",
+      "directions": 4
+    },
+       {
+      "name": "equipped-MASK-dog",
+      "directions": 4
+    },
+       {
+      "name": "equipped-MASK-fox",
+      "directions": 4
+    },
+       {
+      "name": "equipped-MASK-puppy",
+      "directions": 4
+    }
+  ]
+}