From fb6586cdc61118c91f44ad38d7101ac67f729929 Mon Sep 17 00:00:00 2001
From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Sun, 10 Jul 2022 19:13:16 -0600
Subject: [PATCH] Lamp Plushie (#9118)

* Update meta.json

* Add files via upload

* Update toys.yml

* Update toy.yml

* Update toys.yml
---
 .../Entities/Markers/Spawners/Random/toy.yml      |   1 +
 .../Prototypes/Entities/Objects/Fun/toys.yml      |  13 +++++++++++++
 Resources/Textures/Objects/Fun/toys.rsi/meta.json |   3 +++
 .../Objects/Fun/toys.rsi/plushie_lamp.png         | Bin 0 -> 485 bytes
 4 files changed, 17 insertions(+)
 create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/plushie_lamp.png

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
index 41436dba32cb..596d66adc7b3 100644
--- 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
index bcb0bebe6c7f..cfc2bb12cd7f 100644
--- 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
index 366fbf2ac526..e38c0abff19f 100644
--- 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
new file mode 100644
index 0000000000000000000000000000000000000000..43e02fbc95a4820acfcbed6336d01af87d3cef06
GIT binary patch
literal 485
zcmV<B0UG{^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<Smq|oHRCt{2mcL8GKorMcw2Gi06e>ZAW9eVuX03~B*9@Ip{1+VJ
zq=WxL7iU*jCyiVE4_pMNXdsJFM5^b#%iWnuf4sX(EJ(jlE_Z=`K6me>X$9t-g}^@%
zcmgKI8#zA)@9zW@9CIiodVGy2;U<uWTgF~s9Gvf-b<e@O2ul{20>`iuE^$VaFc+8s
z$9U^uNli$AW1_1nYXxb+O*jdDbeCO!+=~Hsj{?-Mr3su)fmhxEhHDxg$H06)EujRL
z{8I=0tZTSfh;nfHj}T1&cVExVM{3UDLk?frw}R6I#$|O+9(^QgZwsdh$lb>sfXCY^
zq#N5AeDDA-Z=qOg1$J<nfQ*05E4?Wv9Ik2(j+rfhFO}X8sB;jEz#HwfWPx82`EJJ%
zO8{UmL2p7X(d;iXmxgl_kSP*wEU>kk2>5Hi#=dqEy^g1{^jy>TOA}Ba1;=ZEPw^-=
z+6kz}G&v<B0R>WU6lp>>s<~-X8uvgZk?K>(j~U!7Mgr;`Kk0Q#{SRO*-~uXCpvWu)
b<}UCJF-Nv4#1x8u00000NkvXXu0mjfQ_92R

literal 0
HcmV?d00001