diff --git a/Resources/Prototypes/Andromeda/Evil Prototype's/plushiedrobe.yml b/Resources/Prototypes/Andromeda/Evil Prototype's/plushiedrobe.yml
index 8acc3ab5765..aa98161e7ac 100644
--- a/Resources/Prototypes/Andromeda/Evil Prototype's/plushiedrobe.yml	
+++ b/Resources/Prototypes/Andromeda/Evil Prototype's/plushiedrobe.yml	
@@ -90,7 +90,7 @@
     PlushieFelSci: 1
     PlushieAdv: 1
     PlushieCadet: 1
-#    PlushieSelectionist: 1
+    PlushieSelectionist: 1
     ToyMouse: 2
     Basketball: 2
     Football: 2
diff --git a/Resources/Prototypes/Andromeda/Evil Prototype's/plushies.yml b/Resources/Prototypes/Andromeda/Evil Prototype's/plushies.yml
index 343b0f756ae..c1b01315c65 100644
--- a/Resources/Prototypes/Andromeda/Evil Prototype's/plushies.yml	
+++ b/Resources/Prototypes/Andromeda/Evil Prototype's/plushies.yml	
@@ -3,89 +3,98 @@
   files:
   - /Audio/Andromeda/Evil/SoundCollection/PlushiePaintor/karandash.ogg
 
-#- type: entity
-#  parent: BasePlushie
-#  id: PlushiePaintor
-#  name: плюшевый грустный художник
-#  description: Это маленький плюшевый художник, ваш грустный брат по рисованию. Он вам с радостью поможет.
-#  suffix: Андромеда
-#  components:
-#  - type: Sprite
-#    sprite: Andromeda/Evil/plushiepaintor.rsi
-#    state: icon
-#  - type: Item
-#    size: Small
-#    sprite: Andromeda/Evil/plushiepaintor.rsi
-#  - type: Storage
-#    maxItemSize: Small
-#    grid:
-#    - 0,0,1,1
-#    whitelist:
-#      components:
-#        - Paint
-#        - Crayon
-#  - type: UserInterface
-#    interfaces:
-#    - key: enum.StorageUiKey.Key
-#      type: StorageBoundUserInterface
-#  - type: PointLight
-#    netsync: false
-#    radius: 1.5
-#    energy: 1.0
-#    color: "#9932CC"
-#  - type:  StorageFill
-#    contents:
-#      - id: SprayPaintPurple
-#      - id: CrayonPurple
-#      - id: CrayonRainbow
-#  - type: EmitSoundOnLand
-#    sound:
-#      collection: PaintorUse
-#  - type: EmitSoundOnActivate
-#    sound:
-#      collection: PaintorUse
-#  - type: EmitSoundOnUse
-#    sound:
-#      collection: PaintorUse
-#  - type: EmitSoundOnCollide
-#    sound:
-#      collection: PaintorUse
-#  - type: Clothing
-#    quickEquip: false
-#    sprite: Andromeda/Evil/plushiepaintor.rsi
-#    slots:
-#    - HEAD
+- type: entity
+  parent: BasePlushie
+  id: PlushiePaintor
+  name: плюшевый грустный художник
+  description: Это маленький плюшевый художник, ваш грустный брат по рисованию. Он вам с радостью поможет.
+  suffix: Андромеда
+  components:
+  - type: Sprite
+    sprite: Andromeda/Evil/plushiepaintor.rsi
+    state: icon
+  - type: Item
+    size: Small
+    sprite: Andromeda/Evil/plushiepaintor.rsi
+  - type: Storage
+    maxItemSize: Small
+    grid:
+    - 0,0,1,1
+    whitelist:
+      components:
+      - Paint
+      - Crayon
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+  - type: UserInterface
+    interfaces:
+      enum.StorageUiKey.Key:
+        type: StorageBoundUserInterface
+  - type: PointLight
+    netsync: false
+    radius: 1.5
+    energy: 1.0
+    color: "#9932CC"
+  - type:  StorageFill
+    contents:
+    # - id: SprayPaintPurple TODO: fix when added back
+    - id: CrayonPurple
+    - id: CrayonRainbow
+    - id: CrayonPurple
+  - type: EmitSoundOnLand
+    sound:
+      collection: PaintorUse
+  - type: EmitSoundOnActivate
+    sound:
+      collection: PaintorUse
+  - type: EmitSoundOnUse
+    sound:
+      collection: PaintorUse
+  - type: EmitSoundOnCollide
+    sound:
+      collection: PaintorUse
+  - type: Clothing
+    quickEquip: false
+    sprite: Andromeda/Evil/plushiepaintor.rsi
+    slots:
+    - HEAD
 
-#- type: entity
-#  parent: BasePlushie
-#  id: PlushieSelectionist
-#  name: плюшевый селекционер
-#  description: Растрепанный исследователь-ботаник, весь в работе над селекцией растений.
-#  suffix: Андромеда
-#  components:
-#  - type: Sprite
-#    sprite: Andromeda/Evil/plushieselectionist.rsi
-#    state: icon
-#  - type: Item
-#    size: Small
-#    sprite: Andromeda/Evil/plushieselectionist.rsi
-#  - type: Storage
-#    maxItemSize: Small
-#    grid:
-#    - 0,0,0,0
-#    whitelist:
-#      components:
-#        - Produce
-#        - Seed
-#  - type: UserInterface
-#    interfaces:
-#    - key: enum.StorageUiKey.Key
-#      type: StorageBoundUserInterface
-#  - type: PointLight
-#    netsync: false
-#    radius: 1.5
-#    energy: 1.0
-#    color: "#55eb63"
+- type: entity
+  parent: BasePlushie
+  id: PlushieSelectionist
+  name: плюшевый селекционер
+  description: Растрепанный исследователь-ботаник, весь в работе над селекцией растений.
+  suffix: Андромеда
+  components:
+  - type: Sprite
+    sprite: Andromeda/Evil/plushieselectionist.rsi
+    state: icon
+  - type: Item
+    size: Small
+    sprite: Andromeda/Evil/plushieselectionist.rsi
+  - type: Storage
+    maxItemSize: Small
+    grid:
+    - 0,0,0,0
+    whitelist:
+      components:
+      - Produce
+      - Seed
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+  - type: UserInterface
+    interfaces:
+      enum.StorageUiKey.Key:
+        type: StorageBoundUserInterface
+  - type: PointLight
+    netsync: false
+    radius: 1.5
+    energy: 1.0
+    color: "#55eb63"
 
 - type: entity
   parent: BasePlushie