From e0d5843e9aea6f507302bb075f918c645b7527ba Mon Sep 17 00:00:00 2001 From: Helm4142 Date: Tue, 14 Jan 2025 21:15:53 +0600 Subject: [PATCH 1/8] migo plushie added --- .../SS220/Entities/Objects/Fun/migo.yml | 32 ++++++++++++++++++ .../SS220/Objects/Fun/migo.rsi/meta.json | 15 ++++++++ .../Objects/Fun/migo.rsi/migo-plushie.png | Bin 0 -> 736 bytes 3 files changed, 47 insertions(+) create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml create mode 100644 Resources/Textures/SS220/Objects/Fun/migo.rsi/meta.json create mode 100644 Resources/Textures/SS220/Objects/Fun/migo.rsi/migo-plushie.png diff --git a/Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml b/Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml new file mode 100644 index 000000000000..058b5a664c7e --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml @@ -0,0 +1,32 @@ +- type: entity + parent: BasePlushie + id: PlushieMigo + name: shrine maiden fumomigo + description: Not a single youkai will pass by the lazy gaze of this plush. + components: + - type: Sprite + sprite: SS220/Objects/Fun/migo.rsi + state: migo-plushie + - type: EmitSoundOnUse + sound: + path: /Audio/SS220/Effects/fumo/fumo2.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/SS220/Effects/fumo/fumocollide.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/SS220/Effects/fumo/fumocollide.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/SS220/Effects/fumo/fumo2.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/SS220/Effects/fumo/fumo2.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/SS220/Effects/fumo/fumocollide.ogg + - type: MeleeWeapon + wideAnimationRotation: 180 + soundHit: + collection: ToySqueak \ No newline at end of file diff --git a/Resources/Textures/SS220/Objects/Fun/migo.rsi/meta.json b/Resources/Textures/SS220/Objects/Fun/migo.rsi/meta.json new file mode 100644 index 000000000000..2ef9be7ae393 --- /dev/null +++ b/Resources/Textures/SS220/Objects/Fun/migo.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "For SS220 by Plagexx / Helm", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "migo-plushie" + } + ] + } + \ No newline at end of file diff --git a/Resources/Textures/SS220/Objects/Fun/migo.rsi/migo-plushie.png b/Resources/Textures/SS220/Objects/Fun/migo.rsi/migo-plushie.png new file mode 100644 index 0000000000000000000000000000000000000000..9cc10a44bb9b46985d7737d77ad6c5031cb47d35 GIT binary patch literal 736 zcmV<60w4W}P)Y{W|p@Sk72gRX?E)EqZCx;dsTm->E5da^NMry!TQUhj$=3@1B3(cfWh{h)8U)0EZ?kf1M z&fij8(;=xted<}G1bIk8))cFq=Uqo4U^_p5`j+f-mKF5V>K$_N#;{x+x~85rWXMxz zB)njL&yfh&xegxPAaC3zDSVw)&}|)UlKWW{JY=*XDji6 zt$CR%E$cY?!Yot)WVG`f8J$kFtowTe`I#97_j-G6DLm{M6A!|7&)&GB;Y-N zJIlTEpQV)Q)EOVL-xBsAK%6{AeUy6;NPwLf37uN`nky|SNNZQhLh4xqPTtHep($c< zuMZ?Zp^-2dzx-HGkaV)(og=IPCy!AN`5^GB0gWv7Y~NDuJ+Qm#KLKmvjm%kbt%29` zD<0fPqk&sb?b_n8j}?d&`0o|?17VwRjth?=-T(jq4rN$LW=%~1DgXcg2mk;800000 S(o>TF0000 Date: Tue, 14 Jan 2025 21:30:59 +0600 Subject: [PATCH 2/8] migo name --- Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml b/Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml index 058b5a664c7e..86e60ec23b3e 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml @@ -1,7 +1,7 @@ - type: entity parent: BasePlushie id: PlushieMigo - name: shrine maiden fumomigo + name: Plushie migo description: Not a single youkai will pass by the lazy gaze of this plush. components: - type: Sprite From a694a69348c02eadb85b3ca9fe364978604dc1cc Mon Sep 17 00:00:00 2001 From: Helm4142 Date: Wed, 15 Jan 2025 13:47:55 +0600 Subject: [PATCH 3/8] dodelal1 --- .../SS220/Entities/Objects/Fun/migo.yml | 29 ++----------------- .../SS220/Objects/Fun/migo.rsi/meta.json | 2 +- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml b/Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml index 86e60ec23b3e..10a86c7e56f3 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml @@ -1,32 +1,9 @@ - type: entity parent: BasePlushie id: PlushieMigo - name: Plushie migo - description: Not a single youkai will pass by the lazy gaze of this plush. + name: migo plushie + description: ЧАВО!? components: - type: Sprite sprite: SS220/Objects/Fun/migo.rsi - state: migo-plushie - - type: EmitSoundOnUse - sound: - path: /Audio/SS220/Effects/fumo/fumo2.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/SS220/Effects/fumo/fumocollide.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/SS220/Effects/fumo/fumocollide.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/SS220/Effects/fumo/fumo2.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/SS220/Effects/fumo/fumo2.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/SS220/Effects/fumo/fumocollide.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - collection: ToySqueak \ No newline at end of file + state: migo-plushie \ No newline at end of file diff --git a/Resources/Textures/SS220/Objects/Fun/migo.rsi/meta.json b/Resources/Textures/SS220/Objects/Fun/migo.rsi/meta.json index 2ef9be7ae393..90783ae8f51d 100644 --- a/Resources/Textures/SS220/Objects/Fun/migo.rsi/meta.json +++ b/Resources/Textures/SS220/Objects/Fun/migo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "copyright": "For SS220 by Plagexx / Helm", + "copyright": "For SS220 by Plagexx", "size": { "x": 32, "y": 32 From f35bcc9ac0b633fc085fdf9fbbb7403c0b898e16 Mon Sep 17 00:00:00 2001 From: Helm4142 Date: Wed, 15 Jan 2025 15:19:43 +0600 Subject: [PATCH 4/8] migo_mbgotova --- Resources/Locale/ru-RU/ss220/migo.ftl | 2 ++ .../Prototypes/SS220/Catalog/Fills/Lockers/misc.yml | 4 ++++ .../SS220/Entities/Objects/CultYogg/corruption.yml | 9 +++++++++ .../Prototypes/SS220/Entities/Objects/Fun/migo.yml | 10 ++++++++-- 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss220/migo.ftl diff --git a/Resources/Locale/ru-RU/ss220/migo.ftl b/Resources/Locale/ru-RU/ss220/migo.ftl new file mode 100644 index 000000000000..78293db4ccdd --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/migo.ftl @@ -0,0 +1,2 @@ +ent-PlushieMigo = плюшевый Ми-Го + .desc = И это дитя Тёмного Бога? \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/SS220/Catalog/Fills/Lockers/misc.yml index 40b8990cd5b1..cd2893cfbc13 100644 --- a/Resources/Prototypes/SS220/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/SS220/Catalog/Fills/Lockers/misc.yml @@ -102,6 +102,10 @@ prob: 0.2 - id: PlushieSnake prob: 0.2 + #SS220-PlushieMiGo-begin + - id: PlushieMigo + prob: 0.01 + #SS220-PlushieMiGo-end - id: ClothingShoesSkates prob: 0.1 - id: ClothingHandsGlovesColorYellow diff --git a/Resources/Prototypes/SS220/Entities/Objects/CultYogg/corruption.yml b/Resources/Prototypes/SS220/Entities/Objects/CultYogg/corruption.yml index ef11a5a673f7..3fc947e2bb4f 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/CultYogg/corruption.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/CultYogg/corruption.yml @@ -350,3 +350,12 @@ result: BurglarBug corruptionReverseEffect: ExorcismUncorruptEffect # BurglarBug end + +# Fun begin +- type: corrupted + id: PlushieMigo + from: + parentPrototypeId: BasePlushie + result: PlushieMigo + corruptionReverseEffect: ExorcismUncorruptEffect +# Fun end \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml b/Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml index 10a86c7e56f3..920efd9b6aa6 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml @@ -2,8 +2,14 @@ parent: BasePlushie id: PlushieMigo name: migo plushie - description: ЧАВО!? + description: And this is the child of the Dark God? components: - type: Sprite sprite: SS220/Objects/Fun/migo.rsi - state: migo-plushie \ No newline at end of file + state: migo-plushie + - type: EmitSoundOnUse + sound: + path: /Audio/SS220/CultYogg/migo_astral_in.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/SS220/CultYogg/migo_astral_out.ogg \ No newline at end of file From 8c4ff3a70c9bafa4744af4ec78eb5ee105f72e42 Mon Sep 17 00:00:00 2001 From: Helm4142 Date: Wed, 15 Jan 2025 16:03:10 +0600 Subject: [PATCH 5/8] migo_tochnododelal --- Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml b/Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml index 920efd9b6aa6..89ebe9e1ad1e 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Fun/migo.yml @@ -10,6 +10,5 @@ - type: EmitSoundOnUse sound: path: /Audio/SS220/CultYogg/migo_astral_in.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/SS220/CultYogg/migo_astral_out.ogg \ No newline at end of file + - type: UseDelay + delay: 5.0 \ No newline at end of file From bd161c0d3a8c371149ff7b7b875c8684c5272c0a Mon Sep 17 00:00:00 2001 From: Helm4142 Date: Wed, 15 Jan 2025 17:18:54 +0600 Subject: [PATCH 6/8] localization transfer --- Resources/Locale/ru-RU/ss220/migo.ftl | 2 -- .../Locale/ru-RU/ss220/prototypes/entities/objects/fun/toys.ftl | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 Resources/Locale/ru-RU/ss220/migo.ftl diff --git a/Resources/Locale/ru-RU/ss220/migo.ftl b/Resources/Locale/ru-RU/ss220/migo.ftl deleted file mode 100644 index 78293db4ccdd..000000000000 --- a/Resources/Locale/ru-RU/ss220/migo.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-PlushieMigo = плюшевый Ми-Го - .desc = И это дитя Тёмного Бога? \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/fun/toys.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/fun/toys.ftl index f6f219b6febf..985a28b9338f 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/fun/toys.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/fun/toys.ftl @@ -28,3 +28,5 @@ ent-WeaponSniperHristovToy = Христов ent-WeaponSniperMosinToy = Кардашёв-Мосин .desc = Оружие охоты, или бесконечной войны клоуна против Службы Безопасности на просторах техтуннелей. .suffix = Винтовка, Игрушечный +ent-PlushieMigo = плюшевый Ми-Го + .desc = И это дитя Тёмного Бога? \ No newline at end of file From f7fce3e8da97f4e5f6d9fc5a2f5813329dab8a1e Mon Sep 17 00:00:00 2001 From: Helm4142 Date: Wed, 15 Jan 2025 18:53:35 +0600 Subject: [PATCH 7/8] plushie migo gotovo --- Resources/Prototypes/Catalog/Fills/Crates/fun.yml | 4 ++++ Resources/Prototypes/SS220/Catalog/Fills/Lockers/misc.yml | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 89b3e424b4fe..31b2743f441c 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -7,6 +7,10 @@ weight: 0.5 - id: PlushieRatvar weight: 0.5 + #SS220-PlushieMiGo-begin + - id: PlushieMigo #SS220 + weight: 0.15 + #SS220-PlushieMiGo-end - id: PlushieNuke - id: PlushieSlime - id: PlushieSnake diff --git a/Resources/Prototypes/SS220/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/SS220/Catalog/Fills/Lockers/misc.yml index cd2893cfbc13..40b8990cd5b1 100644 --- a/Resources/Prototypes/SS220/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/SS220/Catalog/Fills/Lockers/misc.yml @@ -102,10 +102,6 @@ prob: 0.2 - id: PlushieSnake prob: 0.2 - #SS220-PlushieMiGo-begin - - id: PlushieMigo - prob: 0.01 - #SS220-PlushieMiGo-end - id: ClothingShoesSkates prob: 0.1 - id: ClothingHandsGlovesColorYellow From 971df96d0bde6f43049a7179004720c5e4d68c78 Mon Sep 17 00:00:00 2001 From: Helm4142 <158806576+Helm4142@users.noreply.github.com> Date: Thu, 16 Jan 2025 14:00:16 +0600 Subject: [PATCH 8/8] Update meta Co-authored-by: Kirus59 <145689588+Kirus59@users.noreply.github.com> --- Resources/Textures/SS220/Objects/Fun/migo.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/SS220/Objects/Fun/migo.rsi/meta.json b/Resources/Textures/SS220/Objects/Fun/migo.rsi/meta.json index 90783ae8f51d..43b10f2ae719 100644 --- a/Resources/Textures/SS220/Objects/Fun/migo.rsi/meta.json +++ b/Resources/Textures/SS220/Objects/Fun/migo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "copyright": "For SS220 by Plagexx", + "copyright": "sprited by plagexx (discord) for SS220", "size": { "x": 32, "y": 32