Resprites and keeping consistency for forgotten figurines (#40889)

* Resprites and keeping consistency for forgotten figurines

* Slarti Requests

* fixed sus

diff --git a/Resources/Locale/en-US/datasets/figurines.ftl b/Resources/Locale/en-US/datasets/figurines.ftl
index c000c37c1e435315d7b49e67a56596ea485d6f12..2c5d0738640c38494c1c08f5e15e709841d999e9 100644 (file)
--- a/Resources/Locale/en-US/datasets/figurines.ftl
+++ b/Resources/Locale/en-US/datasets/figurines.ftl
@@ -316,3 +316,27 @@ figurines-hamlet-5 = Pip!
 figurines-hamlet-6 = Fwiep!
 figurines-hamlet-7 = Heep!
 figurines-hamlet-8 = NOT THE MICROWAVE!
+
+figurines-thief-1 = You don't have a warrant!
+figurines-thief-2 = This is just a normal beacon!
+figurines-thief-3 = Theres nothing suspicious about this satchel at all, officer.
+figurines-thief-4 = I have NO idea where your pet is...
+figurines-thief-5 = Huh, I didn't know that wall could open up...
+
+figurines-skeleton-1 = ACK ACK!
+figurines-skeleton-2 = Ugh, that locker was cramped!
+figurines-skeleton-3 = You're going to have a bad time.
+figurines-skeleton-4 = Got any milk?
+figurines-skeleton-5 = I have a bone to pick with you!
+
+figurines-owlman-1 = No need to fear, Owlman is here!
+figurines-owlman-2 = Owl be seeing you later!
+figurines-owlman-3 = HOOT!!
+figurines-owlman-4 = What do you call an owl magician, HOO-DINI!
+figurines-owlman-5 = Don't worry citizen, I'll save the day!
+
+figurines-griffin-1 = MUHAHAHAHA, I am so evil!!
+figurines-griffin-2 = The second I see Owlman, they are so dead!!
+figurines-griffin-3 = How do us Griffins deal with stress? We wing it!
+figurines-griffin-4 = My name isn't Gilda!!
+figurines-griffin-5 = Being a criminal mastermind, isn't easy.

diff --git a/Resources/Prototypes/Datasets/figurines.yml b/Resources/Prototypes/Datasets/figurines.yml
index 95e072d8893e31c34636a0fab7c1ca7709ec28b0..53ba40da6460d36768bebc972ef04c3784917def 100644 (file)
--- a/Resources/Prototypes/Datasets/figurines.yml
+++ b/Resources/Prototypes/Datasets/figurines.yml
@@ -261,3 +261,27 @@
   values:
     prefix: figurines-hamlet-
     count: 8
+
+- type: localizedDataset
+  id: FigurinesThief
+  values:
+    prefix: figurines-thief-
+    count: 5
+
+- type: localizedDataset
+  id: FigurinesSkeleton
+  values:
+    prefix: figurines-skeleton-
+    count: 5
+
+- type: localizedDataset
+  id: FigurinesOwlman
+  values:
+    prefix: figurines-owlman-
+    count: 5
+
+- type: localizedDataset
+  id: FigurinesGriffin
+  values:
+    prefix: figurines-griffin-
+    count: 5

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index e6e3ec8c6f99512798c043ba0a5fee7368b1f823..b39ace69d26f4bc983ba1082e41624227b20320b 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -111,7 +111,7 @@
         - id: ClothingNeckCloakGay
         - id: ClothingNeckCloakEnby
         - id: ClothingNeckCloakPan
-      - id: ToySkeleton
+      - id: ToyFigurineSkeleton
       - id: Basketball
       - id: Football
       - id: TennisBall

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
index f77712839c8f515066e501608a5031b4ecdadd57..96c00683d4570ad71538880d71a97631b1a53334 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
@@ -52,14 +52,14 @@
         - ToyAi
         - ToyNuke
         - ToyFigurinePassenger
-        - ToyGriffin
+        - ToyFigurineGriffin
         - ToyHonk
         - ToyIan
         - ToyMarauder
         - ToyMauler
         - ToyGygax
         - ToyOdysseus
-        - ToyOwlman
+        - ToyFigurineOwlman
         - ToyDeathRipley
         - ToyPhazon
         - ToyFireRipley
@@ -67,7 +67,7 @@
         - ToyRipley
         - ToySeraph
         - ToyDurand
-        - ToySkeleton
+        - ToyFigurineSkeleton
         - MysteryFigureBox
       chance: 0.5
       offset: 0.2
@@ -124,9 +124,9 @@
       - ToyFigurineSlime
       - ToyFigurineGreytider
       - ToyFigurineWizard
-      - ToyGriffin
-      - ToyOwlman
-      - ToySkeleton
+      - ToyFigurineGriffin
+      - ToyFigurineOwlman
+      - ToyFigurineSkeleton
       - ToyFigurineQueen
       - ToyFigurineSpaceDragon
       - ToyFigurineRatKing

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
index fc9e976c19821c3bbac81a6ffb30b199f6dfdb93..4b5238fe34bbfe8b79d14f08d56b025d1d01caf3 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -520,7 +520,7 @@
         orGroup: GiftPool
       - id: ToyFigurinePassenger
         orGroup: GiftPool
-      - id: ToyGriffin
+      - id: ToyFigurineGriffin
         orGroup: GiftPool
       - id: ToyHonk
         orGroup: GiftPool
@@ -534,7 +534,7 @@
         orGroup: GiftPool
       - id: ToyOdysseus
         orGroup: GiftPool
-      - id: ToyOwlman
+      - id: ToyFigurineOwlman
         orGroup: GiftPool
       - id: ToyDeathRipley
         orGroup: GiftPool
@@ -550,7 +550,7 @@
         orGroup: GiftPool
       - id: ToyDurand
         orGroup: GiftPool
-      - id: ToySkeleton
+      - id: ToyFigurineSkeleton
         orGroup: GiftPool
       - id: FoamBlade
         orGroup: GiftPool
@@ -713,7 +713,7 @@
         orGroup: GiftPool
       - id: ToyFigurinePassenger
         orGroup: GiftPool
-      - id: ToyGriffin
+      - id: ToyFigurineGriffin
         orGroup: GiftPool
       - id: ToyHonk
         orGroup: GiftPool
@@ -727,7 +727,7 @@
         orGroup: GiftPool
       - id: ToyOdysseus
         orGroup: GiftPool
-      - id: ToyOwlman
+      - id: ToyFigurineOwlman
         orGroup: GiftPool
       - id: ToyDeathRipley
         orGroup: GiftPool
@@ -743,7 +743,7 @@
         orGroup: GiftPool
       - id: ToyDurand
         orGroup: GiftPool
-      - id: ToySkeleton
+      - id: ToyFigurineSkeleton
         orGroup: GiftPool
       - id: FoamBlade
         orGroup: GiftPool
@@ -790,7 +790,7 @@
         orGroup: GiftPool
       - id: ToyFigurinePassenger
         orGroup: GiftPool
-      - id: ToyGriffin
+      - id: ToyFigurineGriffin
         orGroup: GiftPool
       - id: ToyHonk
         orGroup: GiftPool
@@ -804,7 +804,7 @@
         orGroup: GiftPool
       - id: ToyOdysseus
         orGroup: GiftPool
-      - id: ToyOwlman
+      - id: ToyFigurineOwlman
         orGroup: GiftPool
       - id: ToyDeathRipley
         orGroup: GiftPool
@@ -820,7 +820,7 @@
         orGroup: GiftPool
       - id: ToyDurand
         orGroup: GiftPool
-      - id: ToySkeleton
+      - id: ToyFigurineSkeleton
         orGroup: GiftPool
       - id: FoamBlade
         orGroup: GiftPool

diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
index 5b0c9448a6aa29cd238e3dea644cb148aeb3897b..6a35d58c76f128196633c9a60a3497919deda610 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -110,7 +110,7 @@
         orGroup: GiftPool
       - id: ToyFigurinePassenger
         orGroup: GiftPool
-      - id: ToyGriffin
+      - id: ToyFigurineGriffin
         orGroup: GiftPool
       - id: ToyHonk
         orGroup: GiftPool
@@ -124,7 +124,7 @@
         orGroup: GiftPool
       - id: ToyOdysseus
         orGroup: GiftPool
-      - id: ToyOwlman
+      - id: ToyFigurineOwlman
         orGroup: GiftPool
       - id: ToyDeathRipley
         orGroup: GiftPool
@@ -140,7 +140,7 @@
         orGroup: GiftPool
       - id: ToyDurand
         orGroup: GiftPool
-      - id: ToySkeleton
+      - id: ToyFigurineSkeleton
         orGroup: GiftPool
       - id: FoamBlade
         orGroup: GiftPool
@@ -200,7 +200,7 @@
         orGroup: GiftPool
       - id: ClothingNeckCloakAdmin
         orGroup: GiftPool
-      - id: ToySkeleton
+      - id: ToyFigurineSkeleton
         orGroup: GiftPool
       - id: Basketball
         orGroup: GiftPool

diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml
index 6c466ea7c0093125c3adc61b72994b23cd85a8f6..1530b639495b722843667f8fc27cb40d77fab680 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml
@@ -106,15 +106,21 @@
       - id: ToyFigurineNukieCommander
         prob: 0.50
         orGroup: SpacemenFig
-      - id: ToyGriffin
+      - id: ToyFigurineGriffin
         prob: 0.50
         orGroup: SpacemenFig
-      - id: ToyOwlman
+      - id: ToyFigurineOwlman
         prob: 0.50
         orGroup: SpacemenFig
-      - id: ToySkeleton
+      - id: ToyFigurineSkeleton
         prob: 0.50
         orGroup: SpacemenFig
+      - id: ToyFigurineSkeleton
+        prob: 0.50
+        orGroup: SpacemenFig
+      - id: ToyFigurineThief
+        prob: 0.30
+        orgroup: SpacemenFig
       - id: ToyFigurineRatKing
         prob: 0.30
         orGroup: SpacemenFig

diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
index 7575457f4d6d5488f69afab590a1da5cd3f8e1a3..5e7cd96af87b337d956c9204e512b2b051180e99 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
@@ -452,6 +452,50 @@
   - type: SpeakOnTrigger
     pack: FigurinesWizard
 
+- type: entity
+  parent: BaseFigurine
+  id: ToyFigurineGriffin
+  name: griffin figure
+  description: A figurine depicting 'The Griffin', criminal mastermind.
+  components:
+  - type: Sprite
+    state: griffin
+  - type: SpeakOnTrigger
+    pack: FigurinesGriffin
+
+- type: entity
+  parent: BaseFigurine
+  id: ToyFigurineOwlman
+  name: owlman figure
+  description: A figurine depicting 'Owlman', the defender of justice.
+  components:
+  - type: Sprite
+    state: owlman
+  - type: SpeakOnTrigger
+    pack: FigurinesOwlman
+
+- type: entity
+  parent: BaseFigurine
+  id: ToyFigurineSkeleton
+  name: skeleton figure
+  description: A figurine depicting a spooky scary skeleton.
+  components:
+  - type: Sprite
+    state: skeleton
+  - type: SpeakOnTrigger
+    pack: FigurinesSkeleton
+
+- type: entity
+  parent: BaseFigurine
+  id: ToyFigurineThief
+  name: thief figure
+  description: A figurine depicting a kleptomaniac that hides in the shadows.
+  components:
+  - type: Sprite
+    state: thief
+  - type: SpeakOnTrigger
+    pack: FigurinesThief
+
 #Nonhuman Figurines
 
 - type: entity
@@ -473,8 +517,8 @@
   components:
   - type: Sprite
     state: queen
-  # - type: SpeakOnTrigger # TODO add something
-  #   pack: FigurinesQueen
+  - type: SpeakOnTrigger
+    pack: FigurinesQueen
 
 - type: entity
   parent: BaseFigurine
@@ -530,42 +574,3 @@
     state: hamlet
   - type: SpeakOnTrigger
     pack: FigurinesHamlet
-
-#TODO: Convert these to the new figurine sprite template and rename their sprite name.
-#Yes, these are humanoids, but they need to be updated first.
-
-- type: entity
-  parent: BaseFigurine
-  id: ToyGriffin
-  name: griffin figure
-  description: An action figure modeled after 'The Griffin', criminal mastermind.
-  components:
-  - type: Sprite
-    state: griffinprize
-
-- type: entity
-  parent: BaseFigurine
-  id: ToyOwlman
-  name: owl figure
-  description: An action figure modeled after 'The Owl', defender of justice.
-  components:
-  - type: Sprite
-    state: owlprize
-
-- type: entity
-  parent: BaseFigurine
-  id: ToySkeleton
-  name: skeleton figure
-  description: Spooked ya!
-  components:
-  - type: Sprite
-    state: skeletonprize
-
-- type: entity
-  parent: BaseFigurine
-  id: ToyFigurineThief
-  name: thief character figure
-  description: Hiding in the shadows...
-  components:
-  - type: Sprite
-    state: thiefcharacter

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
index 3b151c5ea5d557a69646f73c5ee5f6fc93fc5546..c23c126c734c59e124ecff674197285341a11569 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -133,14 +133,14 @@
     - ToyMouse
     - ToyAi
     - ToyNuke
-    - ToyGriffin
+    - ToyFigurineGriffin
     - ToyHonk
     - ToyIan
     - ToyMarauder
     - ToyMauler
     - ToyGygax
     - ToyOdysseus
-    - ToyOwlman
+    - ToyFigurineOwlman
     - ToyDeathRipley
     - ToyPhazon
     - ToyFireRipley
@@ -148,7 +148,7 @@
     - ToyRipley
     - ToySeraph
     - ToyDurand
-    - ToySkeleton
+    - ToyFigurineSkeleton
     - ToySword
     - ToyAmongPequeno
     - ToyRubberDuck

diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/griffin.png b/Resources/Textures/Objects/Fun/figurines.rsi/griffin.png
new file mode 100644 (file)
index 0000000..054343e
Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/griffin.png differ

diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/griffinprize.png b/Resources/Textures/Objects/Fun/figurines.rsi/griffinprize.png
deleted file mode 100644 (file)
index c7acbf6..0000000
Binary files a/Resources/Textures/Objects/Fun/figurines.rsi/griffinprize.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/meta.json b/Resources/Textures/Objects/Fun/figurines.rsi/meta.json
index 31208a764a35c65b060a7e2ecb96edbbc74f7596..01707c6f6e5e8320f30d540a60d3aae3dc8b409c 100644 (file)
--- a/Resources/Textures/Objects/Fun/figurines.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/figurines.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Sprites made by Flareguy for Space Station 14. Griffinprize, skeletonprize, thiefcharacter and owlprize taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Figurine_spawner sprite made using parts found in spawner_icons.dmi from Paradise Station at commit https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37. Head sprites excluding Captain, Medical exluding doctor, non-human excluding queen and slime, and service jobs excluding librarian done by tacobeller and holoclown done by brainfood1183. inhand-left and inhand-right sprites made by the_pro_noob678 for SS14.",
+    "copyright": "Sprites made by Flareguy for Space Station 14. Figurine_spawner sprite made using parts found in spawner_icons.dmi from Paradise Station at commit https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37. Head sprites excluding Captain, Medical exluding doctor, non-human excluding queen and slime, and service jobs excluding librarian done by tacobeller and holoclown done by brainfood1183. inhand-left and inhand-right sprites made by the_pro_noob678 for SS14. Skeleton, Thief, Griffin, and Owlman Figurines made by YoungThugSS14.",
     "size": {
         "x": 32,
         "y": 32
@@ -151,13 +151,13 @@
             "name": "wizard_fake"
         },
         {
-            "name": "owlprize"
+            "name": "owlman"
         },
         {
-            "name": "griffinprize"
+            "name": "griffin"
         },
         {
-            "name": "skeletonprize"
+            "name": "skeleton"
         },
         {
             "name": "fig_box"
@@ -166,7 +166,7 @@
             "name": "fig_box_unfolded"
         },
         {
-            "name": "thiefcharacter"
+            "name": "thief"
         },
         {
             "name": "figurine_spawner"

diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/owlman.png b/Resources/Textures/Objects/Fun/figurines.rsi/owlman.png
new file mode 100644 (file)
index 0000000..b78fb4b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/owlman.png differ

diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/owlprize.png b/Resources/Textures/Objects/Fun/figurines.rsi/owlprize.png
deleted file mode 100644 (file)
index aab05e0..0000000
Binary files a/Resources/Textures/Objects/Fun/figurines.rsi/owlprize.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/skeleton.png b/Resources/Textures/Objects/Fun/figurines.rsi/skeleton.png
new file mode 100644 (file)
index 0000000..95ad835
Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/skeleton.png differ

diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/skeletonprize.png b/Resources/Textures/Objects/Fun/figurines.rsi/skeletonprize.png
deleted file mode 100644 (file)
index 5d8e5f2..0000000
Binary files a/Resources/Textures/Objects/Fun/figurines.rsi/skeletonprize.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/thief.png b/Resources/Textures/Objects/Fun/figurines.rsi/thief.png
new file mode 100644 (file)
index 0000000..0d4ae8b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/thief.png differ

diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/thiefcharacter.png b/Resources/Textures/Objects/Fun/figurines.rsi/thiefcharacter.png
deleted file mode 100644 (file)
index d0d3f55..0000000
Binary files a/Resources/Textures/Objects/Fun/figurines.rsi/thiefcharacter.png and /dev/null differ

diff --git a/Resources/migration.yml b/Resources/migration.yml
index bbf331d5b6e9612731da015cef4b8192dcef88b8..9a59d61c3926b47436792a7255f169fa9eb54dce 100644 (file)
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -730,3 +730,8 @@ BibleSatanic: null
 # 2025-10-08
 ClothingBeltAssault: ClothingBeltMilitaryWebbing
 WarpPointBombing: null
+
+# 2025-10-13
+ToyGriffin: ToyFigurineGriffin
+ToyOwlman: ToyFigurineOwlman
+ToySkeleton: ToyFigurineSkeleton