From fb41bdbd24df5694bbd475b7de6d62b90a12c191 Mon Sep 17 00:00:00 2001 From: juniwoofs Date: Sat, 21 Dec 2024 18:30:14 -0800 Subject: [PATCH 01/11] morty plushie :3 --- .../Prototypes/Entities/Objects/Fun/toys.yml | 10 ++++++++++ Resources/Textures/Objects/Fun/toys.rsi/meta.json | 3 +++ .../Textures/Objects/Fun/toys.rsi/mortplush.png | Bin 0 -> 832 bytes 3 files changed, 13 insertions(+) create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/mortplush.png diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 1569818b6af..4ec3b118a52 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1663,3 +1663,13 @@ - type: PhysicalComposition materialComposition: Plastic: 25 + +- type: entity + parent: BasePlushie + id: PlushieMort + name: Morty plushie + description: A plushie of the lovely Morty. It's a resilient, yet sensitive type of plush. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: mortplush diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index 45f429f3e69..58cd4da489e 100644 --- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json @@ -365,6 +365,9 @@ }, { "name": "rubber_chicken" + }, + { + "name": "mortplush" } ] } diff --git a/Resources/Textures/Objects/Fun/toys.rsi/mortplush.png b/Resources/Textures/Objects/Fun/toys.rsi/mortplush.png new file mode 100644 index 0000000000000000000000000000000000000000..28b3f1c6ebb6524203c1f2a8f42d81ba0c4290dc GIT binary patch literal 832 zcmV-G1Hb%s(5XvUh_VD7 zji5Re6kV*m1Y#Ye0>dDv4hzvCyyQ_R2*e<$SPCy&X1CC!A9?t--{d#Gnf?89yY9d; zzc+8@ec$`u+ZmdAE~ zfFg6uusP10I<40+ID?Q&Dvd%_tdTju{xr6zMt?NrK>9CkfaDmfxEpVU>U~7lyBDEGXdnzMe6-F3Z6Z$a2WCB$dG; zAU8K0AJXQQww-#WofMFMkiajgFDwGTSA7$IX#YN4cMQz1Ipn@1LLgBX?2o+MtR8s% zVk+3)++<>+2RP7xlECeU&s6h{4ZkEJ8&a02`21y6(_0E09T@gxb_9(BU;VW~4BxUT zB{+OkLMjq^dALfrnbVdE03hGhZSIAz(qIqHNF^d~FP8+Axjueh$NgUZq32vr&fqLB z|5UB5Z3=UyBU^<}a5_jLk^tU?=|_)EpmR5`S>SYlgaikPsNTStfxQ`3xHD;RV+qJK zGTB`wb9bFKm4Tf<-20F4V%aD&IoQvwUial&`aAM53aKH;R{fo3-@MaF$d?p0UQUq4 zfI=6K^o4|sAyAweGY5DBa*Z}0ulZL`4Key88Z&?YZAmXzN?_cvPpAx>KXKOkboYj( zKt)D#UhdT;sO-mFIfF@_GxEcc`VB8$Ij@5p+TE_%BO8265;AL&TF0000< KMNUMnLSTYDOKL;_ literal 0 HcmV?d00001 From 551dc7d01cbe116d8185c4af7e981443e4d47114 Mon Sep 17 00:00:00 2001 From: juniwoofs Date: Sat, 21 Dec 2024 22:49:32 -0800 Subject: [PATCH 02/11] Morty Plushie fixed real --- .../Prototypes/DeltaV/Entities/Objects/Fun/toys.yml | 10 ++++++++++ Resources/Prototypes/Entities/Objects/Fun/toys.yml | 10 ---------- .../Objects/Fun/Toys/mortyplush.rsi/icon.png} | Bin .../Toys/{zerotoy.rsi => mortyplush.rsi}/meta.json | 2 +- Resources/Textures/Objects/Fun/toys.rsi/meta.json | 3 --- 5 files changed, 11 insertions(+), 14 deletions(-) rename Resources/Textures/{Objects/Fun/toys.rsi/mortplush.png => DeltaV/Objects/Fun/Toys/mortyplush.rsi/icon.png} (100%) rename Resources/Textures/DeltaV/Objects/Fun/Toys/{zerotoy.rsi => mortyplush.rsi}/meta.json (85%) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml index 39593702130..cff3101cb86 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml @@ -75,3 +75,13 @@ damage: 5 - type: Execution doAfterDuration: 3.0 + +- type: entity + parent: BasePlushie + id: PlushieMort + name: Morty plushie + description: A plushie of the lovely Morty. It's a resilient, yet sensitive type of plush. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: mortplush \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 4ec3b118a52..1569818b6af 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1663,13 +1663,3 @@ - type: PhysicalComposition materialComposition: Plastic: 25 - -- type: entity - parent: BasePlushie - id: PlushieMort - name: Morty plushie - description: A plushie of the lovely Morty. It's a resilient, yet sensitive type of plush. - components: - - type: Sprite - sprite: Objects/Fun/toys.rsi - state: mortplush diff --git a/Resources/Textures/Objects/Fun/toys.rsi/mortplush.png b/Resources/Textures/DeltaV/Objects/Fun/Toys/mortyplush.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Fun/toys.rsi/mortplush.png rename to Resources/Textures/DeltaV/Objects/Fun/Toys/mortyplush.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Objects/Fun/Toys/zerotoy.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Fun/Toys/mortyplush.rsi/meta.json similarity index 85% rename from Resources/Textures/DeltaV/Objects/Fun/Toys/zerotoy.rsi/meta.json rename to Resources/Textures/DeltaV/Objects/Fun/Toys/mortyplush.rsi/meta.json index 9d9e3ff1b95..b9b957f4a11 100644 --- a/Resources/Textures/DeltaV/Objects/Fun/Toys/zerotoy.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Fun/Toys/mortyplush.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "plyushkina", + "copyright": "juniwoofs", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index 58cd4da489e..45f429f3e69 100644 --- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json @@ -365,9 +365,6 @@ }, { "name": "rubber_chicken" - }, - { - "name": "mortplush" } ] } From 9bd2d95063c67865b646f486b2d262e60003f210 Mon Sep 17 00:00:00 2001 From: juniwoofs Date: Sun, 22 Dec 2024 07:58:02 -0800 Subject: [PATCH 03/11] Update toys.yml Fixed but for realer this time Signed-off-by: juniwoofs --- Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml index cff3101cb86..4d5c62ba754 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml @@ -1,4 +1,4 @@ -- type: entity +a- type: entity parent: BasePlushie id: ToyRenault name: renault toy @@ -83,5 +83,5 @@ description: A plushie of the lovely Morty. It's a resilient, yet sensitive type of plush. components: - type: Sprite - sprite: Objects/Fun/toys.rsi - state: mortplush \ No newline at end of file + sprite: DeltaV/Objects/Fun/toys.rsi + state: mortplush From 51b290fd16dfd9768b705e38d804ba5623540943 Mon Sep 17 00:00:00 2001 From: juniwoofs Date: Sun, 22 Dec 2024 08:42:18 -0800 Subject: [PATCH 04/11] Update toys.yml Signed-off-by: juniwoofs --- Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml index 4d5c62ba754..32717603605 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml @@ -1,4 +1,4 @@ -a- type: entity +- type: entity parent: BasePlushie id: ToyRenault name: renault toy From 76593d8f4856d161a6ac9a1b15180d8f01545dd1 Mon Sep 17 00:00:00 2001 From: juniwoofs Date: Sun, 22 Dec 2024 08:51:10 -0800 Subject: [PATCH 05/11] fixedbutforrealipromise --- .../DeltaV/Objects/Fun/Toys/zerotoy.rsi/meta.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Resources/Textures/DeltaV/Objects/Fun/Toys/zerotoy.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Objects/Fun/Toys/zerotoy.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Fun/Toys/zerotoy.rsi/meta.json new file mode 100644 index 00000000000..9d9e3ff1b95 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Fun/Toys/zerotoy.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "plyushkina", + "states": [ + { + "name": "icon" + } + ] +} From f6f0389887b73d14142561bf7e30c62b4ef81d87 Mon Sep 17 00:00:00 2001 From: juniwoofs Date: Sun, 22 Dec 2024 08:59:52 -0800 Subject: [PATCH 06/11] fixedbutforrealrealrealtrustme --- Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml index 32717603605..68c0f2d71bf 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml @@ -84,4 +84,4 @@ components: - type: Sprite sprite: DeltaV/Objects/Fun/toys.rsi - state: mortplush + state: icon From d6b634512eb41a9085c3047ffd5059e1865d5ab7 Mon Sep 17 00:00:00 2001 From: juniwoofs Date: Sun, 22 Dec 2024 09:10:09 -0800 Subject: [PATCH 07/11] jessiepleaseworkjessie --- Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml index 68c0f2d71bf..62e80460252 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml @@ -79,7 +79,7 @@ - type: entity parent: BasePlushie id: PlushieMort - name: Morty plushie + name: morty plushie description: A plushie of the lovely Morty. It's a resilient, yet sensitive type of plush. components: - type: Sprite From bc791792e51d05eb7c72344cce9f98da03fe8186 Mon Sep 17 00:00:00 2001 From: juniwoofs Date: Sun, 22 Dec 2024 09:16:44 -0800 Subject: [PATCH 08/11] waitwasthisthefix --- Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml index 62e80460252..77a773ec409 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml @@ -83,5 +83,5 @@ description: A plushie of the lovely Morty. It's a resilient, yet sensitive type of plush. components: - type: Sprite - sprite: DeltaV/Objects/Fun/toys.rsi + sprite: DeltaV/Objects/Fun/mortyplush.rsi state: icon From 165b6f8f759e1c4affb106d0669ff88670e7fb13 Mon Sep 17 00:00:00 2001 From: juniwoofs Date: Sun, 22 Dec 2024 09:23:52 -0800 Subject: [PATCH 09/11] imhonestlyembarassed --- Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml index 77a773ec409..1d8813e486f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml @@ -83,5 +83,5 @@ description: A plushie of the lovely Morty. It's a resilient, yet sensitive type of plush. components: - type: Sprite - sprite: DeltaV/Objects/Fun/mortyplush.rsi + sprite: DeltaV/Objects/Fun/Toys/mortyplush.rsi state: icon From 6d120f294a5f21704cf49a39afd90daa6bda5597 Mon Sep 17 00:00:00 2001 From: juniwoofs Date: Sun, 22 Dec 2024 23:14:16 -0800 Subject: [PATCH 10/11] Plushie morty in the pools --- Resources/Prototypes/Catalog/Fills/Crates/fun.yml | 1 + Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml | 1 + .../Entities/Structures/Machines/Computers/arcades.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 10595673708..31e28af0c94 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -41,6 +41,7 @@ - id: PlushieMothRandom # Nyano - random moth plushies - id: PlushieArachind - id: PlushiePenguin + - id: PlushieMort - type: entity id: CrateFunPlushie diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index eba1e300edf..11916cf316d 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -36,6 +36,7 @@ - PlushieMoth - PlushieMothRandom # Nyanotrasen Random Moth Plushies - PlushieArachind + - PlushieMort chance: 0.5 offset: 0.2 diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml index dda0b40fff7..d0e0da8f04b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml @@ -122,6 +122,7 @@ - PlushieSharkBlue - PlushieVox - PlushieXeno + - PlushieMort - PlasticBanana - RevolverCapGun - SnapPopBox From e251ceb6e6c6fbba54d470bb7d59a17d74575c0e Mon Sep 17 00:00:00 2001 From: juniwoofs Date: Mon, 23 Dec 2024 13:55:32 -0800 Subject: [PATCH 11/11] added deltav notation --- Resources/Prototypes/Catalog/Fills/Crates/fun.yml | 2 +- Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml | 2 +- .../Entities/Structures/Machines/Computers/arcades.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 2b8537f6983..ecc017f40aa 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -43,7 +43,7 @@ - id: PlushieMothRandom # Nyano - random moth plushies - id: PlushieArachind - id: PlushiePenguin - - id: PlushieMort + - id: PlushieMort # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml - type: entity id: CrateFunPlushie diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index 11916cf316d..6c2f94b3190 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -36,7 +36,7 @@ - PlushieMoth - PlushieMothRandom # Nyanotrasen Random Moth Plushies - PlushieArachind - - PlushieMort + - PlushieMort # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml chance: 0.5 offset: 0.2 diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml index d0e0da8f04b..10aade2eb47 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml @@ -122,7 +122,7 @@ - PlushieSharkBlue - PlushieVox - PlushieXeno - - PlushieMort + - PlushieMort # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml - PlasticBanana - RevolverCapGun - SnapPopBox