Plushie Rework

Resources/Audio/_Starlight/Items/Toys/attributions.yml

@@ -1,13 +1,3 @@
-- files: ["deerplush_nun.ogg"]
-  license: "CC0-1.0"
-  copyright: "Original sound by Cerzix"
-  source: "https://github.com/Cerzix"
-
-- files: ["yippie.ogg"]
-  license: "CC0-1.0"
-  copyright: "Original sound by CipherForbid"
-  source: "https://www.youtube.com/watch?v=-jySY1QC7dc"
-
 - files: ["gnome_hahe.ogg"]
   license: "CC0-1.0"
   copyright: "Original sound by Radio TV Solutions"
@@ -37,3 +27,8 @@
   license: "Custom"
   copyright: "tonsil5 (Freesound)"
   source: "https://pixabay.com/sound-effects/cartoon-scream-1-6835/"
+
+- files: ["yippie.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original sound by CipherForbid"
+  source: "https://www.youtube.com/watch?v=-jySY1QC7dc"

Resources/Locale/en-US/_Starlight/nutrition/components/food-sequence.ftl

@@ -1,20 +1,18 @@
 # COTTON BURGERS
 
-food-sequence-cotton-burger-content-plushie-panda = panda
-food-sequence-cotton-burger-content-plushie-deer = deer
-food-sequence-cotton-burger-content-plushie-mimelizard = silent
 food-sequence-cotton-burger-content-plushie-abductor = alien
 food-sequence-cotton-burger-content-plushie-axolotl = axolotl
 food-sequence-cotton-burger-content-plushie-borb = borb
+food-sequence-cotton-burger-content-plushie-borg = lawful
+food-sequence-cotton-burger-content-plushie-cow-squishims = cow
 food-sequence-cotton-burger-content-plushie-creature = YIPPIE
-food-sequence-cotton-burger-content-plushie-gnome = fooberry
+food-sequence-cotton-burger-content-plushie-frog-squishims = froggy
 food-sequence-cotton-burger-content-plushie-goat = soft
-food-sequence-cotton-burger-content-plushie-lisa = corgi
+food-sequence-cotton-burger-content-plushie-gnome = fooberry
 food-sequence-cotton-burger-content-plushie-kitten = mew
+food-sequence-cotton-burger-content-plushie-panda = panda
 food-sequence-cotton-burger-content-plushie-pig = pig
 food-sequence-cotton-burger-content-plushie-renault = yip
-food-sequence-cotton-burger-content-plushie-snail = snail
-food-sequence-cotton-burger-content-plushie-cow = cow
-food-sequence-cotton-burger-content-plushie-frog = frog
-food-sequence-cotton-burger-content-plushie-sus = sus
 food-sequence-cotton-burger-content-plushie-shadekin = marr
+food-sequence-cotton-burger-content-plushie-snail = french
+food-sequence-cotton-burger-content-plushie-sus = sus

Resources/Locale/en-US/_Starlight/store/categories.ftl

@@ -1,5 +1,8 @@
+# Hug Dispenser
 store-category-plushies = Plushies
+store-category-plushie-toys = Toys
 store-category-plushie-species = Species
+store-category-plushie-crew = Crew
 
 store-category-medical-chemistry = Chemistry
 store-category-medical-medical = Medical

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -13,7 +13,7 @@
     - id: DoorRemoteCargo
     - id: AstroNavCartridge
     - id: ClothingHandsKnuckleDustersQM
-    - id: PlushieLance # Starlight start
+    # Starlight start
     - id: RadioHandheldExpedition
     - id: ClothingOuterHardsuitLuxmax
     - id: SalvageShuttleConsoleCircuitboard
@@ -55,7 +55,8 @@
       - !type:GamemodeCondition
         presets:
         - Greenshift
-        - Sandbox #Starlight end
+        - Sandbox
+    #Starlight end
 
 - type: entity
   id: LockerQuarterMasterFilled
@@ -260,7 +261,6 @@
     - id: RCDAmmo
     - id: RubberStampCE
     - id: MetalFoamGrenade
-    - id: PlushieMatthew #starlight
     - id: EngineeringTechFabFlatpack # Starlight
     - id: PrintedDocumentGreenshiftAlert #SL
       conditions: #SL

Resources/Prototypes/Catalog/Fills/Lockers/security.yml

@@ -162,8 +162,6 @@
         prob: 1.8
     - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse
       prob: 0.15
-    - id: PlushieMorgana #starlight
-    - id: PlushieKiller #starlight
     - id: JawsOfLifeMed #Starlight
 
 

Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml

@@ -128,9 +128,6 @@
         - id: ClothingNeckCloakPan
       - id: ToyFigurineSkeleton
       - id: MysteryFigureBox
-      - id: PlushieMimeLizard #starlight
-      - id: SnailPlushie #starlight
-      - id: AxolotlPlushie #starlight
       # Cult
       - !type:AllSelector
         children:

Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml

@@ -78,15 +78,6 @@
       children:
       - id: PlushieThrongler
       - id: PlushieGhostRevenant # You got the god roll, and failed
-#STARLIGHT-Start
-    - !type:GroupSelector
-      children:
-      - id: DeerPlushie
-        weight: 9
-      - id: OddDeerPlushie
-        weight: 1
-    - id: VikaPviPlushie
-#STARLIGHT-End
 
 # Weh!
 - type: entityTable

Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml

@@ -230,11 +230,6 @@
     - id: PlushieSharkBlue
     - id: PlushieVox
     - id: PlushieXeno
-    # Starlight-start
-    - id: DeerPlushie
-    - id: OddDeerPlushie
-    - id: VikaPviPlushie
-    # Starlight-end
     - id: PlasticBanana
     - id: RevolverCapGun
     - id: SnapPopBox

Resources/Prototypes/_Starlight/Catalog/Cargo/cargo_fun.yml

@@ -21,7 +21,7 @@
 - type: cargoProduct
   id: FunMegaShark
   icon:
-    sprite: _Starlight/Objects/Fun/Plushies/large_soft_shark.rsi
+    sprite: _Starlight/Objects/Fun/Plushies/large_soft_shark_plushie.rsi
     state: icon
   product: CrateFunMegaShark
   cost: 2500

Resources/Prototypes/_Starlight/Catalog/Fills/Lockers/representatives.yml

@@ -22,7 +22,6 @@
         - id: BoxFolderClipboardFilled
         - id: PrinterDocFlatpack
         - id: FaxMachineFlatpack
-        - id: PlushieEmmie
         - id: ClothingOuterHardsuitNtrep
         - id: BriefcaseSecure
         - !type:NestedSelector

Resources/Prototypes/_Starlight/Catalog/Fills/Lockers/security.yml

@@ -124,8 +124,6 @@
           prob: 0.35
         - id: RubberStampBrigmedic
           amount: 2
-        - id: PlushieMorgana
-        - id: PlushieKiller
         - id: JawsOfLifeMed #Starlight
         - id: JawsOfLifeMed #Starlight