Сортировка эксклюзива енги + респрайт деревянных столов и дверей (#12)
* Massive * Чейндлок (cherry picked from commit 4dc165e4c1aa75e8fd22f14db95ac72bf50c77f5)
@@ -1,7 +1,7 @@
|
|||||||
using Content.Shared.Inventory.Events;
|
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;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// This handles placemet of PreventStrippingFromEarsComponent when bucket helmet is in use.
|
/// This handles placemet of PreventStrippingFromEarsComponent when bucket helmet is in use.
|
||||||
@@ -4,7 +4,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
|
|||||||
using Content.Shared.Chat.Prototypes;
|
using Content.Shared.Chat.Prototypes;
|
||||||
using Robust.Shared.Audio;
|
using Robust.Shared.Audio;
|
||||||
|
|
||||||
namespace Content.Server._White.Other.Suhariki;
|
namespace Content.Server._White._Engi.Suhariki;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Makes you loose your tooth and have funny accent.
|
/// Makes you loose your tooth and have funny accent.
|
||||||
@@ -21,7 +21,7 @@ using Content.Server.Body.Systems;
|
|||||||
using Content.Server.Body.Components;
|
using Content.Server.Body.Components;
|
||||||
using Content.Server.Speech.Components;
|
using Content.Server.Speech.Components;
|
||||||
|
|
||||||
namespace Content.Server._White.Other.Suhariki;
|
namespace Content.Server._White._Engi.Suhariki;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// WD Engi Exclusive.
|
/// WD Engi Exclusive.
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
namespace Content.Shared._White.BucketHelmet;
|
namespace Content.Shared._White._Engi.BucketHelmet;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// This is used for bucket helmet.
|
/// This is used for bucket helmet.
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
namespace Content.Shared._White.BucketHelmet;
|
namespace Content.Shared._White._Engi.BucketHelmet;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// This is used to block stripping headsets when bucket helmet is on.
|
/// This is used to block stripping headsets when bucket helmet is on.
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
using Content.Shared.Damage;
|
using Content.Shared.Damage;
|
||||||
using Robust.Shared.GameStates;
|
using Robust.Shared.GameStates;
|
||||||
|
|
||||||
namespace Content.Shared.DamageableClothing;
|
namespace Content.Shared._White._Engi.DamageableClothing;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// This component goes on an equippable item that should take damage while in use.
|
/// This component goes on an equippable item that should take damage while in use.
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
namespace Content.Shared.DamageableClothing;
|
namespace Content.Shared._White._Engi.DamageableClothing;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// This component gets dynamically added to an Entity via the <see cref="DamageableClothing"/>.
|
/// This component gets dynamically added to an Entity via the <see cref="DamageableClothing"/>.
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
using Robust.Shared.Timing;
|
using Robust.Shared.Timing;
|
||||||
using Content.Shared.Inventory.Events;
|
using Content.Shared.Inventory.Events;
|
||||||
|
|
||||||
namespace Content.Shared.DamageableClothing;
|
namespace Content.Shared._White._Engi.DamageableClothing;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// WD Engi Exclusive.
|
/// WD Engi Exclusive.
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
using Content.Shared.Damage;
|
using Content.Shared.Damage;
|
||||||
|
|
||||||
namespace Content.Shared.DamageableClothing;
|
namespace Content.Shared._White._Engi.DamageableClothing;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// WD Engi Exclusive.
|
/// WD Engi Exclusive.
|
||||||
BIN
Resources/Audio/White/_Engi/Object/Misc/Suhariki/tooth_break.ogg
Normal file
7
Resources/Locale/ru-RU/_Engi/suhariki.ftl
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
ent-FoodSnackSuhariki = сухарики
|
||||||
|
.desc = Старая реликвия из прошлого, на этикетке едва можно прочитать слово «Кириешки».
|
||||||
|
ent-FoodPacketSuharikiTrash = упаковка от сухариков
|
||||||
|
ent-SuharikiTooth = зуб
|
||||||
|
.desc = Может быть он твой, а может и не твой.
|
||||||
|
|
||||||
|
suhariki-lost = сломал свой зуб!
|
||||||
@@ -6,9 +6,9 @@
|
|||||||
description: A regular bucket with two eye holes. When worn on the head, something sticky inside latches on the earpiece.
|
description: A regular bucket with two eye holes. When worn on the head, something sticky inside latches on the earpiece.
|
||||||
components:
|
components:
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: White/Clothing/Head/bucketHelmet.rsi
|
sprite: White/_Engi/Clothing/Head/bucketHelmet.rsi
|
||||||
- type: Clothing
|
- type: Clothing
|
||||||
sprite: White/Clothing/Head/bucketHelmet.rsi
|
sprite: White/_Engi/Clothing/Head/bucketHelmet.rsi
|
||||||
- type: IdentityBlocker
|
- type: IdentityBlocker
|
||||||
- type: Armor
|
- type: Armor
|
||||||
modifiers:
|
modifiers:
|
||||||
@@ -6,10 +6,10 @@
|
|||||||
description: Two mirrors connected by wires for dubious laser protection.
|
description: Two mirrors connected by wires for dubious laser protection.
|
||||||
components:
|
components:
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: White/Clothing/OuterClothing/armor_reflect_ghetto.rsi
|
sprite: White/_Engi/Clothing/OuterClothing/armor_reflect_ghetto.rsi
|
||||||
state: icon
|
state: icon
|
||||||
- type: Clothing
|
- type: Clothing
|
||||||
sprite: White/Clothing/OuterClothing/armor_reflect_ghetto.rsi
|
sprite: White/_Engi/Clothing/OuterClothing/armor_reflect_ghetto.rsi
|
||||||
- type: Armor
|
- type: Armor
|
||||||
modifiers:
|
modifiers:
|
||||||
coefficients:
|
coefficients:
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
- cheap
|
- cheap
|
||||||
- bread
|
- bread
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: White/Objects/Consumable/Food/Suhariki/suhariki.rsi
|
sprite: White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi
|
||||||
state: suhariki
|
state: suhariki
|
||||||
- type: Tag
|
- type: Tag
|
||||||
tags:
|
tags:
|
||||||
@@ -25,7 +25,7 @@
|
|||||||
Blunt: 10
|
Blunt: 10
|
||||||
- type: Item
|
- type: Item
|
||||||
size: Tiny
|
size: Tiny
|
||||||
sprite: White/Objects/Consumable/Food/Suhariki/suhariki.rsi
|
sprite: White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi
|
||||||
heldPrefix: suhariki
|
heldPrefix: suhariki
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
@@ -47,11 +47,11 @@
|
|||||||
name: suhariki bag
|
name: suhariki bag
|
||||||
components:
|
components:
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: White/Objects/Consumable/Food/Suhariki/suhariki.rsi
|
sprite: White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi
|
||||||
state: suhariki-trash
|
state: suhariki-trash
|
||||||
- type: Item
|
- type: Item
|
||||||
size: Tiny
|
size: Tiny
|
||||||
sprite: White/Objects/Consumable/Food/Suhariki/suhariki.rsi
|
sprite: White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi
|
||||||
heldPrefix: suhariki
|
heldPrefix: suhariki
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
@@ -62,16 +62,16 @@
|
|||||||
description: Может быть он твой, а может и не твой.
|
description: Может быть он твой, а может и не твой.
|
||||||
components:
|
components:
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: White/Objects/Consumable/Food/Suhariki/tooth.rsi
|
sprite: White/_Engi/Objects/Consumable/Food/Suhariki/tooth.rsi
|
||||||
state: icon
|
state: icon
|
||||||
- type: Item
|
- type: Item
|
||||||
size: Tiny
|
size: Tiny
|
||||||
- type: EmitSoundOnLand
|
- type: EmitSoundOnLand
|
||||||
sound:
|
sound:
|
||||||
path: /Audio/White/Object/Misc/Suhariki/tooth_drop_1.ogg
|
path: /Audio/White/_Engi/Object/Misc/Suhariki/tooth_drop_1.ogg
|
||||||
- type: EmitSoundOnCollide
|
- type: EmitSoundOnCollide
|
||||||
sound:
|
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: SpaceGarbage
|
||||||
- type: StaticPrice
|
- type: StaticPrice
|
||||||
price: 100
|
price: 100
|
||||||
@@ -6,10 +6,10 @@
|
|||||||
description: A makeshift mirror with a handle, used as dubious laser protection.
|
description: A makeshift mirror with a handle, used as dubious laser protection.
|
||||||
components:
|
components:
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: White/Objects/Weapons/ghetto_mirror_shield.rsi
|
sprite: White/_Engi/Objects/Weapons/ghetto_mirror_shield.rsi
|
||||||
state: icon
|
state: icon
|
||||||
- type: Item
|
- type: Item
|
||||||
sprite: White/Objects/Weapons/ghetto_mirror_shield.rsi
|
sprite: White/_Engi/Objects/Weapons/ghetto_mirror_shield.rsi
|
||||||
size: Ginormous
|
size: Ginormous
|
||||||
- type: Tag
|
- type: Tag
|
||||||
tags:
|
tags:
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
- type: customGhost
|
- type: customGhost
|
||||||
id: big_zi_348-ghost
|
id: big_zi_348-ghost
|
||||||
ckey: BIG_Zi_348
|
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
|
alpha: 0.9
|
||||||
ghostName: BIG_Zi_348
|
ghostName: BIG_Zi_348
|
||||||
ghostDescription: Как хорошо быть кем-то в этой жизни.
|
ghostDescription: Как хорошо быть кем-то в этой жизни.
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
suffix: fluff
|
suffix: fluff
|
||||||
components:
|
components:
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: White/Fluff/_Engi/Rikka/rikka-plushie.rsi
|
sprite: White/_Engi/Fluff/Rikka/rikka-plushie.rsi
|
||||||
state: icon
|
state: icon
|
||||||
- type: Item
|
- type: Item
|
||||||
size: Normal
|
size: Normal
|
||||||
@@ -29,13 +29,13 @@
|
|||||||
- tag: MirrorShieldGhetto
|
- tag: MirrorShieldGhetto
|
||||||
name: самодельный зеркальный щит
|
name: самодельный зеркальный щит
|
||||||
icon:
|
icon:
|
||||||
sprite: White/Objects/Weapons/ghetto_mirror_shield.rsi
|
sprite: White/_Engi/Objects/Weapons/ghetto_mirror_shield.rsi
|
||||||
state: icon
|
state: icon
|
||||||
amount: 1
|
amount: 1
|
||||||
- tag: MirrorShieldGhetto
|
- tag: MirrorShieldGhetto
|
||||||
name: самодельный зеркальный щит
|
name: самодельный зеркальный щит
|
||||||
icon:
|
icon:
|
||||||
sprite: White/Objects/Weapons/ghetto_mirror_shield.rsi
|
sprite: White/_Engi/Objects/Weapons/ghetto_mirror_shield.rsi
|
||||||
state: icon
|
state: icon
|
||||||
amount: 1
|
amount: 1
|
||||||
doAfter: 6
|
doAfter: 6
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
objectType: Item
|
objectType: Item
|
||||||
description: Сделанное на скорую руку зеркало с рукояткой для использования как сомнительная защита от лазеров.
|
description: Сделанное на скорую руку зеркало с рукояткой для использования как сомнительная защита от лазеров.
|
||||||
icon:
|
icon:
|
||||||
sprite: White/Objects/Weapons/ghetto_mirror_shield.rsi
|
sprite: White/_Engi/Objects/Weapons/ghetto_mirror_shield.rsi
|
||||||
state: icon
|
state: icon
|
||||||
|
|
||||||
- type: construction
|
- type: construction
|
||||||
@@ -22,5 +22,5 @@
|
|||||||
objectType: Item
|
objectType: Item
|
||||||
description: Два зеркала соединённые проводами для сомнительной защиты от лазеров.
|
description: Два зеркала соединённые проводами для сомнительной защиты от лазеров.
|
||||||
icon:
|
icon:
|
||||||
sprite: White/Clothing/OuterClothing/armor_reflect_ghetto.rsi
|
sprite: White/_Engi/Clothing/OuterClothing/armor_reflect_ghetto.rsi
|
||||||
state: icon
|
state: icon
|
||||||
3
Resources/Prototypes/_White/_Engi/tags.yml
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
# WD Engi Exclusive
|
||||||
|
- type: Tag
|
||||||
|
id: MirrorShieldGhetto
|
||||||
|
Before Width: | Height: | Size: 828 B After Width: | Height: | Size: 828 B |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 576 B After Width: | Height: | Size: 576 B |
|
Before Width: | Height: | Size: 319 B After Width: | Height: | Size: 319 B |
|
Before Width: | Height: | Size: 610 B After Width: | Height: | Size: 610 B |
|
Before Width: | Height: | Size: 607 B After Width: | Height: | Size: 607 B |
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 49 KiB |
|
Before Width: | Height: | Size: 772 B After Width: | Height: | Size: 772 B |
@@ -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
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 2.3 KiB |
|
After Width: | Height: | Size: 2.3 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"version": 1,
|
||||||
|
"license": "CC-BY-SA-3.0",
|
||||||
|
"copyright": "xd",
|
||||||
|
"size": {
|
||||||
|
"x": 32,
|
||||||
|
"y": 32
|
||||||
|
},
|
||||||
|
"states": [
|
||||||
|
{
|
||||||
|
"name": "icon"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
Before Width: | Height: | Size: 330 B After Width: | Height: | Size: 330 B |
|
Before Width: | Height: | Size: 758 B After Width: | Height: | Size: 758 B |
|
Before Width: | Height: | Size: 697 B After Width: | Height: | Size: 697 B |