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 76b342dd8ca1..349bc68f9ef4 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 000000000000..43e02fbc95a4 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_lamp.png differ