From c849ace792852e8ca060c0e268af355662f94803 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Tue, 10 Dec 2024 12:09:03 +0000 Subject: [PATCH 1/3] Ripley mk2 painted --- .../Prototypes/Entities/Objects/Specific/Mech/mechs.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index a92024c731..39d1173b1a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -287,6 +287,11 @@ soundOnReflect: /Audio/Weapons/block_metal1.ogg reflects: - NonEnergy + - type: Tag + tags: + - DoorBumpOpener + - FootstepSound + - Ripley - type: MobThresholds currentThresholdState : Alive thresholds: From e06a38146e018a27493a714a28210e3cd830d807 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Tue, 10 Dec 2024 13:47:05 +0000 Subject: [PATCH 2/3] Fix Pirate,Add White\Black Gygax --- .../entities/objects/fun/mech_spray_paint.ftl | 9 +++ .../entities/objects/fun/mech_spray_paint.ftl | 9 +++ .../Entities/Objects/Fun/mech_spray_paint.yml | 62 ++++++++++++++++++- .../Objects/Specific/Mech/gygax.rsi/meta.json | 5 +- 4 files changed, 81 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/fun/mech_spray_paint.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/fun/mech_spray_paint.ftl index 56a48dc87f..2396066fdf 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/fun/mech_spray_paint.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/fun/mech_spray_paint.ftl @@ -27,6 +27,15 @@ ent-MechPaintGygaxMolot = { ent-MechPaintBase } ent-MechPaintGygaxOld = { ent-MechPaintBase } .suffix = DEBUG, Gygax, Old .desc = { ent-MechPaintBase.desc } +ent-MechPaintGygaxBlack = { ent-MechPaintBase } + .suffix = DEBUG, Gygax, Black + .desc = { ent-MechPaintBase.desc } +ent-MechPaintGygaxWhite = { ent-MechPaintBase } + .suffix = DEBUG, Gygax, White + .desc = { ent-MechPaintBase.desc } +ent-MechPaintGygaxPirate = { ent-MechPaintBase } + .suffix = DEBUG, Gygax, Pirate + .desc = { ent-MechPaintBase.desc } ent-MechPaintDurandUnathi = { ent-MechPaintBase } .suffix = DEBUG, Durand, Unathi .desc = { ent-MechPaintBase.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/mech_spray_paint.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/mech_spray_paint.ftl index 1231c5f4ef..7be6e7729c 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/mech_spray_paint.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/mech_spray_paint.ftl @@ -27,6 +27,15 @@ ent-MechPaintGygaxMolot = { ent-MechPaintBase } ent-MechPaintGygaxOld = { ent-MechPaintBase } .suffix = ДЕБАГ, Гигакс, Old .desc = { ent-MechPaintBase.desc } +ent-MechPaintGygaxBlack = { ent-MechPaintBase } + .suffix = ДЕБАГ, Гигакс, Black + .desc = { ent-MechPaintBase.desc } +ent-MechPaintGygaxWhite = { ent-MechPaintBase } + .suffix = ДЕБАГ, Гигакс, White + .desc = { ent-MechPaintBase.desc } +ent-MechPaintGygaxPirate = { ent-MechPaintBase } + .suffix = ДЕБАГ, Гигакс, Pirate + .desc = { ent-MechPaintBase.desc } ent-MechPaintDurandUnathi = { ent-MechPaintBase } .suffix = ДЕБАГ, Дюранд, Unathi .desc = { ent-MechPaintBase.desc } diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/mech_spray_paint.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/mech_spray_paint.yml index bb8f6da767..abdcd5f153 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/mech_spray_paint.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/mech_spray_paint.yml @@ -283,7 +283,67 @@ True: {state: "pobeda"} False: {state: "pobeda-cap"} -#Gegax-Pirate +# Gygax-Black +- type: entity + parent: MechPaintBase + suffix: DEBUG, Gygax, Contraband + id: MechPaintGygaxBlack + components: + - type: Sprite + sprite: _Sunrise/Objects/Fun/mech_spraycans/gygax.rsi + state: syndiegax-cap + layers: + - state: syndiegax-cap + map: ["enum.OpenableVisuals.Layer"] + - type: Item + sprite: _Sunrise/Objects/Fun/mech_spraycans/gygax.rsi + heldPrefix: syndiegax + - type: MechPaint + used: false + whitelist: + tags: + - Gygax + baseState: gygax_black + openState: gygax_black-open + brokenState: gygax_black-broken + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "syndiegax"} + False: {state: "syndiegax-cap"} + +# Gygax-White +- type: entity + parent: MechPaintBase + suffix: DEBUG, Gygax, Legal + id: MechPaintGygaxWhite + components: + - type: Sprite + sprite: _Sunrise/Objects/Fun/mech_spraycans/gygax.rsi + state: gygax-white-cap + layers: + - state: gygax-white-cap + map: ["enum.OpenableVisuals.Layer"] + - type: Item + sprite: _Sunrise/Objects/Fun/mech_spraycans/gygax.rsi + heldPrefix: gygax-white + - type: MechPaint + used: false + whitelist: + tags: + - Gygax + baseState: gygax_white + openState: gygax_white-open + brokenState: gygax_white-broken + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "gygax-white"} + False: {state: "gygax-white-cap"} + +#Gygax-Pirate - type: entity parent: MechPaintBase suffix: DEBUG, Gygax, Pirate diff --git a/Resources/Textures/Objects/Specific/Mech/gygax.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/gygax.rsi/meta.json index 63850a96d8..28739f4fa5 100644 --- a/Resources/Textures/Objects/Specific/Mech/gygax.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Mech/gygax.rsi/meta.json @@ -144,7 +144,7 @@ 0.3, 0.4, 0.5, - 0.3 + 0.3 ] ] }, @@ -183,8 +183,7 @@ 0.5, 0.3, 0.5, - 0.3, - 0.5 + 0.3 ] ] }, From 83a3866afa5411d2c30f0a065175f7cad855cc96 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Tue, 10 Dec 2024 14:00:49 +0000 Subject: [PATCH 3/3] Locale --- .../_sunrise/entities/objects/fun/mech_spray_paint.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/mech_spray_paint.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/mech_spray_paint.ftl index 7be6e7729c..534f85b13f 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/mech_spray_paint.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/mech_spray_paint.ftl @@ -28,13 +28,13 @@ ent-MechPaintGygaxOld = { ent-MechPaintBase } .suffix = ДЕБАГ, Гигакс, Old .desc = { ent-MechPaintBase.desc } ent-MechPaintGygaxBlack = { ent-MechPaintBase } - .suffix = ДЕБАГ, Гигакс, Black + .suffix = ДЕБАГ, Гигакс, Черный .desc = { ent-MechPaintBase.desc } ent-MechPaintGygaxWhite = { ent-MechPaintBase } - .suffix = ДЕБАГ, Гигакс, White + .suffix = ДЕБАГ, Гигакс, Белый .desc = { ent-MechPaintBase.desc } ent-MechPaintGygaxPirate = { ent-MechPaintBase } - .suffix = ДЕБАГ, Гигакс, Pirate + .suffix = ДЕБАГ, Гигакс, Пираты .desc = { ent-MechPaintBase.desc } ent-MechPaintDurandUnathi = { ent-MechPaintBase } .suffix = ДЕБАГ, Дюранд, Unathi