diff --git a/Content.Server/_White/BucketHelmet/BucketHelmetSystem.cs b/Content.Server/_White/_Engi/BucketHelmet/BucketHelmetSystem.cs similarity index 89% rename from Content.Server/_White/BucketHelmet/BucketHelmetSystem.cs rename to Content.Server/_White/_Engi/BucketHelmet/BucketHelmetSystem.cs index d37bba310f..5aa91b87a6 100644 --- a/Content.Server/_White/BucketHelmet/BucketHelmetSystem.cs +++ b/Content.Server/_White/_Engi/BucketHelmet/BucketHelmetSystem.cs @@ -1,7 +1,7 @@ using Content.Shared.Inventory.Events; -using Content.Shared._White.BucketHelmet; +using Content.Shared._White._Engi.BucketHelmet; -namespace Content.Server._White.BucketHelmet; +namespace Content.Server._White._Engi.BucketHelmet; /// /// This handles placemet of PreventStrippingFromEarsComponent when bucket helmet is in use. diff --git a/Content.Server/_White/Other/Suhariki/SuharikiComponent.cs b/Content.Server/_White/_Engi/Suhariki/SuharikiComponent.cs similarity index 97% rename from Content.Server/_White/Other/Suhariki/SuharikiComponent.cs rename to Content.Server/_White/_Engi/Suhariki/SuharikiComponent.cs index ec72d12478..b405ac336b 100644 --- a/Content.Server/_White/Other/Suhariki/SuharikiComponent.cs +++ b/Content.Server/_White/_Engi/Suhariki/SuharikiComponent.cs @@ -4,7 +4,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy using Content.Shared.Chat.Prototypes; using Robust.Shared.Audio; -namespace Content.Server._White.Other.Suhariki; +namespace Content.Server._White._Engi.Suhariki; /// /// Makes you loose your tooth and have funny accent. diff --git a/Content.Server/_White/Other/Suhariki/SuharikiSystem.cs b/Content.Server/_White/_Engi/Suhariki/SuharikiSystem.cs similarity index 99% rename from Content.Server/_White/Other/Suhariki/SuharikiSystem.cs rename to Content.Server/_White/_Engi/Suhariki/SuharikiSystem.cs index 4a8e3f5178..2c4c95a5ed 100644 --- a/Content.Server/_White/Other/Suhariki/SuharikiSystem.cs +++ b/Content.Server/_White/_Engi/Suhariki/SuharikiSystem.cs @@ -21,7 +21,7 @@ using Content.Server.Body.Systems; using Content.Server.Body.Components; using Content.Server.Speech.Components; -namespace Content.Server._White.Other.Suhariki; +namespace Content.Server._White._Engi.Suhariki; /// /// WD Engi Exclusive. diff --git a/Content.Shared/_White/BucketHelmet/BucketHelmetComponent.cs b/Content.Shared/_White/_Engi/BucketHelmet/BucketHelmetComponent.cs similarity index 77% rename from Content.Shared/_White/BucketHelmet/BucketHelmetComponent.cs rename to Content.Shared/_White/_Engi/BucketHelmet/BucketHelmetComponent.cs index b7f94bed69..11dca20edf 100644 --- a/Content.Shared/_White/BucketHelmet/BucketHelmetComponent.cs +++ b/Content.Shared/_White/_Engi/BucketHelmet/BucketHelmetComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared._White.BucketHelmet; +namespace Content.Shared._White._Engi.BucketHelmet; /// /// This is used for bucket helmet. diff --git a/Content.Shared/_White/BucketHelmet/PreventStrippingFromEarsComponent.cs b/Content.Shared/_White/_Engi/BucketHelmet/PreventStrippingFromEarsComponent.cs similarity index 81% rename from Content.Shared/_White/BucketHelmet/PreventStrippingFromEarsComponent.cs rename to Content.Shared/_White/_Engi/BucketHelmet/PreventStrippingFromEarsComponent.cs index 0d71b9fd2e..9bdb4135eb 100644 --- a/Content.Shared/_White/BucketHelmet/PreventStrippingFromEarsComponent.cs +++ b/Content.Shared/_White/_Engi/BucketHelmet/PreventStrippingFromEarsComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared._White.BucketHelmet; +namespace Content.Shared._White._Engi.BucketHelmet; /// /// This is used to block stripping headsets when bucket helmet is on. diff --git a/Content.Shared/_White/DamageableClothing/Components/DamageableClothingComponent.cs b/Content.Shared/_White/_Engi/DamageableClothing/Components/DamageableClothingComponent.cs similarity index 91% rename from Content.Shared/_White/DamageableClothing/Components/DamageableClothingComponent.cs rename to Content.Shared/_White/_Engi/DamageableClothing/Components/DamageableClothingComponent.cs index e213bcd7f7..dce35c3809 100644 --- a/Content.Shared/_White/DamageableClothing/Components/DamageableClothingComponent.cs +++ b/Content.Shared/_White/_Engi/DamageableClothing/Components/DamageableClothingComponent.cs @@ -1,7 +1,7 @@ using Content.Shared.Damage; using Robust.Shared.GameStates; -namespace Content.Shared.DamageableClothing; +namespace Content.Shared._White._Engi.DamageableClothing; /// /// This component goes on an equippable item that should take damage while in use. diff --git a/Content.Shared/_White/DamageableClothing/Components/DamageableClothingUserComponent.cs b/Content.Shared/_White/_Engi/DamageableClothing/Components/DamageableClothingUserComponent.cs similarity index 86% rename from Content.Shared/_White/DamageableClothing/Components/DamageableClothingUserComponent.cs rename to Content.Shared/_White/_Engi/DamageableClothing/Components/DamageableClothingUserComponent.cs index 079f4c2173..eda9ae8daa 100644 --- a/Content.Shared/_White/DamageableClothing/Components/DamageableClothingUserComponent.cs +++ b/Content.Shared/_White/_Engi/DamageableClothing/Components/DamageableClothingUserComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.DamageableClothing; +namespace Content.Shared._White._Engi.DamageableClothing; /// /// This component gets dynamically added to an Entity via the . diff --git a/Content.Shared/_White/DamageableClothing/DamageableClothingSystem.cs b/Content.Shared/_White/_Engi/DamageableClothing/DamageableClothingSystem.cs similarity index 96% rename from Content.Shared/_White/DamageableClothing/DamageableClothingSystem.cs rename to Content.Shared/_White/_Engi/DamageableClothing/DamageableClothingSystem.cs index 9b32b03706..8a4ed64175 100644 --- a/Content.Shared/_White/DamageableClothing/DamageableClothingSystem.cs +++ b/Content.Shared/_White/_Engi/DamageableClothing/DamageableClothingSystem.cs @@ -1,7 +1,7 @@ using Robust.Shared.Timing; using Content.Shared.Inventory.Events; -namespace Content.Shared.DamageableClothing; +namespace Content.Shared._White._Engi.DamageableClothing; /// /// WD Engi Exclusive. diff --git a/Content.Shared/_White/DamageableClothing/DamageableClothingUserSystem.cs b/Content.Shared/_White/_Engi/DamageableClothing/DamageableClothingUserSystem.cs similarity index 96% rename from Content.Shared/_White/DamageableClothing/DamageableClothingUserSystem.cs rename to Content.Shared/_White/_Engi/DamageableClothing/DamageableClothingUserSystem.cs index b8ec9a78b6..c4269c78a7 100644 --- a/Content.Shared/_White/DamageableClothing/DamageableClothingUserSystem.cs +++ b/Content.Shared/_White/_Engi/DamageableClothing/DamageableClothingUserSystem.cs @@ -1,6 +1,6 @@ using Content.Shared.Damage; -namespace Content.Shared.DamageableClothing; +namespace Content.Shared._White._Engi.DamageableClothing; /// /// WD Engi Exclusive. diff --git a/Resources/Audio/White/_Engi/Object/Misc/Suhariki/tooth_break.ogg b/Resources/Audio/White/_Engi/Object/Misc/Suhariki/tooth_break.ogg new file mode 100644 index 0000000000..8c94263045 Binary files /dev/null and b/Resources/Audio/White/_Engi/Object/Misc/Suhariki/tooth_break.ogg differ diff --git a/Resources/Audio/White/_Engi/Object/Misc/Suhariki/tooth_drop_1.ogg b/Resources/Audio/White/_Engi/Object/Misc/Suhariki/tooth_drop_1.ogg new file mode 100644 index 0000000000..4a836659f1 Binary files /dev/null and b/Resources/Audio/White/_Engi/Object/Misc/Suhariki/tooth_drop_1.ogg differ diff --git a/Resources/Audio/White/_Engi/Object/Misc/Suhariki/tooth_drop_2.ogg b/Resources/Audio/White/_Engi/Object/Misc/Suhariki/tooth_drop_2.ogg new file mode 100644 index 0000000000..1c86c34b1d Binary files /dev/null and b/Resources/Audio/White/_Engi/Object/Misc/Suhariki/tooth_drop_2.ogg differ diff --git a/Resources/Locale/ru-RU/_Engi/suhariki.ftl b/Resources/Locale/ru-RU/_Engi/suhariki.ftl new file mode 100644 index 0000000000..c6f4aaaa7a --- /dev/null +++ b/Resources/Locale/ru-RU/_Engi/suhariki.ftl @@ -0,0 +1,7 @@ +ent-FoodSnackSuhariki = сухарики + .desc = Старая реликвия из прошлого, на этикетке едва можно прочитать слово «Кириешки». +ent-FoodPacketSuharikiTrash = упаковка от сухариков +ent-SuharikiTooth = зуб + .desc = Может быть он твой, а может и не твой. + +suhariki-lost = сломал свой зуб! diff --git a/Resources/Prototypes/_White/Entities/Clothing/Head/bucketHelmet.yml b/Resources/Prototypes/_White/_Engi/Entities/Clothing/Head/bucketHelmet.yml similarity index 84% rename from Resources/Prototypes/_White/Entities/Clothing/Head/bucketHelmet.yml rename to Resources/Prototypes/_White/_Engi/Entities/Clothing/Head/bucketHelmet.yml index 9121cefa0c..be64280c24 100644 --- a/Resources/Prototypes/_White/Entities/Clothing/Head/bucketHelmet.yml +++ b/Resources/Prototypes/_White/_Engi/Entities/Clothing/Head/bucketHelmet.yml @@ -6,9 +6,9 @@ description: A regular bucket with two eye holes. When worn on the head, something sticky inside latches on the earpiece. components: - type: Sprite - sprite: White/Clothing/Head/bucketHelmet.rsi + sprite: White/_Engi/Clothing/Head/bucketHelmet.rsi - type: Clothing - sprite: White/Clothing/Head/bucketHelmet.rsi + sprite: White/_Engi/Clothing/Head/bucketHelmet.rsi - type: IdentityBlocker - type: Armor modifiers: diff --git a/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/ClothingOuterArmorReflectiveGhetto.yml b/Resources/Prototypes/_White/_Engi/Entities/Clothing/OuterClothing/ClothingOuterArmorReflectiveGhetto.yml similarity index 89% rename from Resources/Prototypes/_White/Entities/Clothing/OuterClothing/ClothingOuterArmorReflectiveGhetto.yml rename to Resources/Prototypes/_White/_Engi/Entities/Clothing/OuterClothing/ClothingOuterArmorReflectiveGhetto.yml index 65920157f6..7512186177 100644 --- a/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/ClothingOuterArmorReflectiveGhetto.yml +++ b/Resources/Prototypes/_White/_Engi/Entities/Clothing/OuterClothing/ClothingOuterArmorReflectiveGhetto.yml @@ -6,10 +6,10 @@ description: Two mirrors connected by wires for dubious laser protection. components: - type: Sprite - sprite: White/Clothing/OuterClothing/armor_reflect_ghetto.rsi + sprite: White/_Engi/Clothing/OuterClothing/armor_reflect_ghetto.rsi state: icon - type: Clothing - sprite: White/Clothing/OuterClothing/armor_reflect_ghetto.rsi + sprite: White/_Engi/Clothing/OuterClothing/armor_reflect_ghetto.rsi - type: Armor modifiers: coefficients: diff --git a/Resources/Prototypes/_White/Entities/Objects/Consumable/Food/suhariki.yml b/Resources/Prototypes/_White/_Engi/Entities/Objects/Consumable/Food/suhariki.yml similarity index 74% rename from Resources/Prototypes/_White/Entities/Objects/Consumable/Food/suhariki.yml rename to Resources/Prototypes/_White/_Engi/Entities/Objects/Consumable/Food/suhariki.yml index f154e15c0b..1ad6277d38 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Consumable/Food/suhariki.yml +++ b/Resources/Prototypes/_White/_Engi/Entities/Objects/Consumable/Food/suhariki.yml @@ -12,7 +12,7 @@ - cheap - bread - type: Sprite - sprite: White/Objects/Consumable/Food/Suhariki/suhariki.rsi + sprite: White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi state: suhariki - type: Tag tags: @@ -25,7 +25,7 @@ Blunt: 10 - type: Item size: Tiny - sprite: White/Objects/Consumable/Food/Suhariki/suhariki.rsi + sprite: White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi heldPrefix: suhariki - type: SolutionContainerManager solutions: @@ -47,11 +47,11 @@ name: suhariki bag components: - type: Sprite - sprite: White/Objects/Consumable/Food/Suhariki/suhariki.rsi + sprite: White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi state: suhariki-trash - type: Item size: Tiny - sprite: White/Objects/Consumable/Food/Suhariki/suhariki.rsi + sprite: White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi heldPrefix: suhariki - type: entity @@ -62,16 +62,16 @@ description: Может быть он твой, а может и не твой. components: - type: Sprite - sprite: White/Objects/Consumable/Food/Suhariki/tooth.rsi + sprite: White/_Engi/Objects/Consumable/Food/Suhariki/tooth.rsi state: icon - type: Item size: Tiny - type: EmitSoundOnLand sound: - path: /Audio/White/Object/Misc/Suhariki/tooth_drop_1.ogg + path: /Audio/White/_Engi/Object/Misc/Suhariki/tooth_drop_1.ogg - type: EmitSoundOnCollide sound: - path: /Audio/White/Object/Misc/Suhariki/tooth_drop_2.ogg + path: /Audio/White/_Engi/Object/Misc/Suhariki/tooth_drop_2.ogg - type: SpaceGarbage - type: StaticPrice price: 100 diff --git a/Resources/Prototypes/_White/Entities/Objects/Shields/MirrorShieldGhetto.yml b/Resources/Prototypes/_White/_Engi/Entities/Objects/Shields/MirrorShieldGhetto.yml similarity index 91% rename from Resources/Prototypes/_White/Entities/Objects/Shields/MirrorShieldGhetto.yml rename to Resources/Prototypes/_White/_Engi/Entities/Objects/Shields/MirrorShieldGhetto.yml index f7f60383a6..ca14a41179 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Shields/MirrorShieldGhetto.yml +++ b/Resources/Prototypes/_White/_Engi/Entities/Objects/Shields/MirrorShieldGhetto.yml @@ -6,10 +6,10 @@ description: A makeshift mirror with a handle, used as dubious laser protection. components: - type: Sprite - sprite: White/Objects/Weapons/ghetto_mirror_shield.rsi + sprite: White/_Engi/Objects/Weapons/ghetto_mirror_shield.rsi state: icon - type: Item - sprite: White/Objects/Weapons/ghetto_mirror_shield.rsi + sprite: White/_Engi/Objects/Weapons/ghetto_mirror_shield.rsi size: Ginormous - type: Tag tags: diff --git a/Resources/Prototypes/_White/Fluff/engi.yml b/Resources/Prototypes/_White/_Engi/Fluff/fluff.yml similarity index 80% rename from Resources/Prototypes/_White/Fluff/engi.yml rename to Resources/Prototypes/_White/_Engi/Fluff/fluff.yml index 649b6c59f6..9ebb3456a7 100644 --- a/Resources/Prototypes/_White/Fluff/engi.yml +++ b/Resources/Prototypes/_White/_Engi/Fluff/fluff.yml @@ -4,7 +4,7 @@ - type: customGhost id: big_zi_348-ghost ckey: BIG_Zi_348 - sprite: White/Fluff/_Engi/BIG_Zi_348/big_zi_348-ghost.rsi + sprite: White/_Engi/Fluff/BIG_Zi_348/big_zi_348-ghost.rsi alpha: 0.9 ghostName: BIG_Zi_348 ghostDescription: Как хорошо быть кем-то в этой жизни. @@ -18,7 +18,7 @@ suffix: fluff components: - type: Sprite - sprite: White/Fluff/_Engi/Rikka/rikka-plushie.rsi + sprite: White/_Engi/Fluff/Rikka/rikka-plushie.rsi state: icon - type: Item size: Normal diff --git a/Resources/Prototypes/_White/Recipes/Crafting/Graphs/bucketHelmet.yml b/Resources/Prototypes/_White/_Engi/Recipes/Graphs/bucketHelmet.yml similarity index 100% rename from Resources/Prototypes/_White/Recipes/Crafting/Graphs/bucketHelmet.yml rename to Resources/Prototypes/_White/_Engi/Recipes/Graphs/bucketHelmet.yml diff --git a/Resources/Prototypes/_White/Recipes/Crafting/Graphs/ghettoMirrorShield.yml b/Resources/Prototypes/_White/_Engi/Recipes/Graphs/ghettoMirrorShield.yml similarity index 86% rename from Resources/Prototypes/_White/Recipes/Crafting/Graphs/ghettoMirrorShield.yml rename to Resources/Prototypes/_White/_Engi/Recipes/Graphs/ghettoMirrorShield.yml index e36d8bf12a..c15ac8bafb 100644 --- a/Resources/Prototypes/_White/Recipes/Crafting/Graphs/ghettoMirrorShield.yml +++ b/Resources/Prototypes/_White/_Engi/Recipes/Graphs/ghettoMirrorShield.yml @@ -29,13 +29,13 @@ - tag: MirrorShieldGhetto name: самодельный зеркальный щит icon: - sprite: White/Objects/Weapons/ghetto_mirror_shield.rsi + sprite: White/_Engi/Objects/Weapons/ghetto_mirror_shield.rsi state: icon amount: 1 - tag: MirrorShieldGhetto name: самодельный зеркальный щит icon: - sprite: White/Objects/Weapons/ghetto_mirror_shield.rsi + sprite: White/_Engi/Objects/Weapons/ghetto_mirror_shield.rsi state: icon amount: 1 doAfter: 6 diff --git a/Resources/Prototypes/_White/Recipes/Crafting/ghettoMirrorShield.yml b/Resources/Prototypes/_White/_Engi/Recipes/ghettoMirrorShield.yml similarity index 87% rename from Resources/Prototypes/_White/Recipes/Crafting/ghettoMirrorShield.yml rename to Resources/Prototypes/_White/_Engi/Recipes/ghettoMirrorShield.yml index 588f18da36..3c8faa88ec 100644 --- a/Resources/Prototypes/_White/Recipes/Crafting/ghettoMirrorShield.yml +++ b/Resources/Prototypes/_White/_Engi/Recipes/ghettoMirrorShield.yml @@ -9,7 +9,7 @@ objectType: Item description: Сделанное на скорую руку зеркало с рукояткой для использования как сомнительная защита от лазеров. icon: - sprite: White/Objects/Weapons/ghetto_mirror_shield.rsi + sprite: White/_Engi/Objects/Weapons/ghetto_mirror_shield.rsi state: icon - type: construction @@ -22,5 +22,5 @@ objectType: Item description: Два зеркала соединённые проводами для сомнительной защиты от лазеров. icon: - sprite: White/Clothing/OuterClothing/armor_reflect_ghetto.rsi + sprite: White/_Engi/Clothing/OuterClothing/armor_reflect_ghetto.rsi state: icon diff --git a/Resources/Prototypes/_White/_Engi/tags.yml b/Resources/Prototypes/_White/_Engi/tags.yml new file mode 100644 index 0000000000..6d867976e4 --- /dev/null +++ b/Resources/Prototypes/_White/_Engi/tags.yml @@ -0,0 +1,3 @@ +# WD Engi Exclusive +- type: Tag + id: MirrorShieldGhetto diff --git a/Resources/Textures/White/Clothing/Head/bucketHelmet.rsi/equipped-HELMET.png b/Resources/Textures/White/_Engi/Clothing/Head/bucketHelmet.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/White/Clothing/Head/bucketHelmet.rsi/equipped-HELMET.png rename to Resources/Textures/White/_Engi/Clothing/Head/bucketHelmet.rsi/equipped-HELMET.png diff --git a/Resources/Textures/White/Clothing/Head/bucketHelmet.rsi/icon.png b/Resources/Textures/White/_Engi/Clothing/Head/bucketHelmet.rsi/icon.png similarity index 100% rename from Resources/Textures/White/Clothing/Head/bucketHelmet.rsi/icon.png rename to Resources/Textures/White/_Engi/Clothing/Head/bucketHelmet.rsi/icon.png diff --git a/Resources/Textures/White/Clothing/Head/bucketHelmet.rsi/meta.json b/Resources/Textures/White/_Engi/Clothing/Head/bucketHelmet.rsi/meta.json similarity index 100% rename from Resources/Textures/White/Clothing/Head/bucketHelmet.rsi/meta.json rename to Resources/Textures/White/_Engi/Clothing/Head/bucketHelmet.rsi/meta.json diff --git a/Resources/Textures/White/Clothing/OuterClothing/armor_reflect_ghetto.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/White/_Engi/Clothing/OuterClothing/armor_reflect_ghetto.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/White/Clothing/OuterClothing/armor_reflect_ghetto.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/White/_Engi/Clothing/OuterClothing/armor_reflect_ghetto.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/White/Clothing/OuterClothing/armor_reflect_ghetto.rsi/icon.png b/Resources/Textures/White/_Engi/Clothing/OuterClothing/armor_reflect_ghetto.rsi/icon.png similarity index 100% rename from Resources/Textures/White/Clothing/OuterClothing/armor_reflect_ghetto.rsi/icon.png rename to Resources/Textures/White/_Engi/Clothing/OuterClothing/armor_reflect_ghetto.rsi/icon.png diff --git a/Resources/Textures/White/Clothing/OuterClothing/armor_reflect_ghetto.rsi/inhand-left.png b/Resources/Textures/White/_Engi/Clothing/OuterClothing/armor_reflect_ghetto.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/White/Clothing/OuterClothing/armor_reflect_ghetto.rsi/inhand-left.png rename to Resources/Textures/White/_Engi/Clothing/OuterClothing/armor_reflect_ghetto.rsi/inhand-left.png diff --git a/Resources/Textures/White/Clothing/OuterClothing/armor_reflect_ghetto.rsi/inhand-right.png b/Resources/Textures/White/_Engi/Clothing/OuterClothing/armor_reflect_ghetto.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/White/Clothing/OuterClothing/armor_reflect_ghetto.rsi/inhand-right.png rename to Resources/Textures/White/_Engi/Clothing/OuterClothing/armor_reflect_ghetto.rsi/inhand-right.png diff --git a/Resources/Textures/White/Clothing/OuterClothing/armor_reflect_ghetto.rsi/meta.json b/Resources/Textures/White/_Engi/Clothing/OuterClothing/armor_reflect_ghetto.rsi/meta.json similarity index 100% rename from Resources/Textures/White/Clothing/OuterClothing/armor_reflect_ghetto.rsi/meta.json rename to Resources/Textures/White/_Engi/Clothing/OuterClothing/armor_reflect_ghetto.rsi/meta.json diff --git a/Resources/Textures/White/Fluff/_Engi/BIG_Zi_348/big_zi_348-ghost.rsi/animated.png b/Resources/Textures/White/_Engi/Fluff/BIG_Zi_348/big_zi_348-ghost.rsi/animated.png similarity index 100% rename from Resources/Textures/White/Fluff/_Engi/BIG_Zi_348/big_zi_348-ghost.rsi/animated.png rename to Resources/Textures/White/_Engi/Fluff/BIG_Zi_348/big_zi_348-ghost.rsi/animated.png diff --git a/Resources/Textures/White/Fluff/_Engi/BIG_Zi_348/big_zi_348-ghost.rsi/meta.json b/Resources/Textures/White/_Engi/Fluff/BIG_Zi_348/big_zi_348-ghost.rsi/meta.json similarity index 100% rename from Resources/Textures/White/Fluff/_Engi/BIG_Zi_348/big_zi_348-ghost.rsi/meta.json rename to Resources/Textures/White/_Engi/Fluff/BIG_Zi_348/big_zi_348-ghost.rsi/meta.json diff --git a/Resources/Textures/White/Fluff/_Engi/Rikka/rikka-plushie.rsi/icon.png b/Resources/Textures/White/_Engi/Fluff/Rikka/rikka-plushie.rsi/icon.png similarity index 100% rename from Resources/Textures/White/Fluff/_Engi/Rikka/rikka-plushie.rsi/icon.png rename to Resources/Textures/White/_Engi/Fluff/Rikka/rikka-plushie.rsi/icon.png diff --git a/Resources/Textures/White/Fluff/_Engi/Rikka/rikka-plushie.rsi/meta.json b/Resources/Textures/White/_Engi/Fluff/Rikka/rikka-plushie.rsi/meta.json similarity index 100% rename from Resources/Textures/White/Fluff/_Engi/Rikka/rikka-plushie.rsi/meta.json rename to Resources/Textures/White/_Engi/Fluff/Rikka/rikka-plushie.rsi/meta.json diff --git a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/meta.json b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/meta.json new file mode 100644 index 0000000000..49ba5139da --- /dev/null +++ b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "deadisko and BIG_Zi_348", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "suhariki" + }, + { + "name": "suhariki-trash" + }, + { + "name": "suhariki-inhand-right", + "directions": 4 + }, + { + "name": "suhariki-inhand-left", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki-inhand-left.png b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki-inhand-left.png new file mode 100644 index 0000000000..5a37a5debe Binary files /dev/null and b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki-inhand-left.png differ diff --git a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki-inhand-right.png b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki-inhand-right.png new file mode 100644 index 0000000000..95c620f2eb Binary files /dev/null and b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki-inhand-right.png differ diff --git a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki-trash.png b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki-trash.png new file mode 100644 index 0000000000..f528d725b2 Binary files /dev/null and b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki-trash.png differ diff --git a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki.png b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki.png new file mode 100644 index 0000000000..5e46236261 Binary files /dev/null and b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki.png differ diff --git a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/tooth.rsi/icon.png b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/tooth.rsi/icon.png new file mode 100644 index 0000000000..43d576fdae Binary files /dev/null and b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/tooth.rsi/icon.png differ diff --git a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/tooth.rsi/meta.json b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/tooth.rsi/meta.json new file mode 100644 index 0000000000..87bfd9d670 --- /dev/null +++ b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/tooth.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "xd", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/ghetto_mirror_shield.rsi/icon.png b/Resources/Textures/White/_Engi/Objects/Weapons/ghetto_mirror_shield.rsi/icon.png similarity index 100% rename from Resources/Textures/White/Objects/Weapons/ghetto_mirror_shield.rsi/icon.png rename to Resources/Textures/White/_Engi/Objects/Weapons/ghetto_mirror_shield.rsi/icon.png diff --git a/Resources/Textures/White/Objects/Weapons/ghetto_mirror_shield.rsi/inhand-left.png b/Resources/Textures/White/_Engi/Objects/Weapons/ghetto_mirror_shield.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/White/Objects/Weapons/ghetto_mirror_shield.rsi/inhand-left.png rename to Resources/Textures/White/_Engi/Objects/Weapons/ghetto_mirror_shield.rsi/inhand-left.png diff --git a/Resources/Textures/White/Objects/Weapons/ghetto_mirror_shield.rsi/inhand-right.png b/Resources/Textures/White/_Engi/Objects/Weapons/ghetto_mirror_shield.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/White/Objects/Weapons/ghetto_mirror_shield.rsi/inhand-right.png rename to Resources/Textures/White/_Engi/Objects/Weapons/ghetto_mirror_shield.rsi/inhand-right.png diff --git a/Resources/Textures/White/Objects/Weapons/ghetto_mirror_shield.rsi/meta.json b/Resources/Textures/White/_Engi/Objects/Weapons/ghetto_mirror_shield.rsi/meta.json similarity index 100% rename from Resources/Textures/White/Objects/Weapons/ghetto_mirror_shield.rsi/meta.json rename to Resources/Textures/White/_Engi/Objects/Weapons/ghetto_mirror_shield.rsi/meta.json