Merge branch 'mirotvorec-toy-and-some-shit-fixes' of https://github.c…

…om/lulpiopio/space-station-14 into mirotvorec-toy-and-some-shit-fixes
space-sunrise · Oct 11, 2024 · aa512c9 · aa512c9
2 parents 2a9b8a1 + 01f5107
commit aa512c9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml
@@ -1801,8 +1801,8 @@
     stock: 1
 
 - type: listing
-  id: UplinkSunrisePlushieMirotvorec
-  productEntity: PlushieMirotvorec
+  id: UplinkSunrisePlushiePeacemaker
+  productEntity: PlushiePeacemaker
   cost:
     Suntick: 4
   categories:

diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml
@@ -689,12 +689,12 @@
 
 - type: entity
   parent: BasePlushie
-  id: PlushieMirotvorec
+  id: PlushiePeacemaker
   name: Миротворец
   description: Там где он, там мир, но там где война, там он несëт смерть.
   components:
   - type: Sprite
-    state: plushie-mirotvorec
+    state: plushie-peacemaker
     sprite: _Sunrise/Objects/Fun/toys.rsi
   - type: EmitSoundOnUse
     sound:

diff --git a/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/meta.json
@@ -187,7 +187,7 @@
             "name": "plushie-nara"
         },
         {
-            "name": "plushie-mirotvorec"
+            "name": "plushie-peacemaker"
         }
     ]
 }