Merge branch 'master' into Research_Digiboard

Resources/Changelog/DeltaVChangelog.yml

@@ -1,12 +1,4 @@
 Entries:
-- author: rosieposieeee
-  changes:
-  - message: More hotfixes for Submarine Station! Say goodbye to your damn unsulated
-      gloves...
-    type: Tweak
-  id: 312
-  time: '2024-04-12T02:14:54.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1075
 - author: Adrian16199
   changes:
   - message: Clown hardsuit is craftable once again.
@@ -3833,3 +3825,10 @@
   id: 811
   time: '2024-12-22T20:05:08.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2496
+- author: juniwoofs
+  changes:
+  - message: a Morty Plushie (Sprite courtesy of a dog! code courtesy of me :3)
+    type: Add
+  id: 812
+  time: '2024-12-22T20:30:24.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2506

Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml

@@ -75,3 +75,13 @@
     damage: 5
   - type: Execution
     doAfterDuration: 3.0
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieMort
+  name: morty plushie
+  description: A plushie of the lovely Morty. It's a resilient, yet sensitive type of plush.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Fun/Toys/mortyplush.rsi
+    state: icon

Resources/Textures/DeltaV/Objects/Fun/Toys/mortyplush.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "juniwoofs",
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}