Lamp Plushie (#9118)

* Update meta.json * Add files via upload * Update toys.yml * Update toy.yml * Update toys.yml
space-wizards · Jul 11, 2022 · fb6586c · fb6586c
1 parent 8b89a2b
commit fb6586c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
@@ -23,6 +23,7 @@
         - PlushieRatvar
         - PlushieSpaceLizard
         - PlushieRouny
+        - PlushieLamp
         - ToyMouse
       chance: 0.5
       offset: 0.2

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -74,6 +74,19 @@
   - type: Sprite
     state: plushie_rouny
 
+- type: entity
+  parent: BasePlushie
+  id: PlushieLamp
+  name: lamp plushie
+  description: A light emitting friend!
+  components:
+  - type: Sprite
+    state: plushie_lamp
+  - type: PointLight
+    netsync: false
+    radius: 1.5
+    energy: 2
+
 - type: entity
   parent: BasePlushie
   id: PlushieLizard #Weh!

diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
@@ -28,6 +28,9 @@
         {
             "name": "plushie_lizard"
         },
+        {
+            "name": "plushie_lamp"
+        },
         {
             "name": "plushie_nuke"
         },

diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_lamp.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_lamp.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,9 @@ @@
             {
                 "name": "plushie_lizard"
             },
+            {
+                "name": "plushie_lamp"
+            },
             {
                 "name": "plushie_nuke"
             },
@@ Expand Down @@