diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/syndicate.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/syndicate.ftl index 8fc1e7e6fc..be60328720 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/syndicate.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/syndicate.ftl @@ -1,4 +1,4 @@ -ent-CrateSyndicateSurplusBundle = { ent-CrateGenericSteel } - .desc = { ent-CrateGenericSteel.desc } -ent-CrateSyndicateSuperSurplusBundle = { ent-CrateGenericSteel } - .desc = { ent-CrateGenericSteel.desc } +ent-CrateSyndicateSurplusBundle = { ent-CrateSyndicate } + .desc = { ent-CrateSyndicate.desc } +ent-CrateSyndicateSuperSurplusBundle = { ent-CrateSyndicate } + .desc = { ent-CrateSyndicate.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/structures/storage/crates/crates.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/structures/storage/crates/crates.ftl new file mode 100644 index 0000000000..be1ef444db --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/structures/storage/crates/crates.ftl @@ -0,0 +1,2 @@ +ent-CrateSyndicate = syndicate crate + .desc = { ent-CrateBaseWeldable.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/storage/crates/crates.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/storage/crates/crates.ftl new file mode 100644 index 0000000000..9171ed037a --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/storage/crates/crates.ftl @@ -0,0 +1,2 @@ +ent-CrateSyndicate = ящик синдиката + .desc = { ent-CrateBaseWeldable.desc } diff --git a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml index 04c58c05b4..fac0cd8c94 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml @@ -1,13 +1,13 @@ - type: entity id: CrateSyndicateSurplusBundle - parent: CrateGenericSteel + parent: CrateSyndicate components: - type: SurplusBundle totalPrice: 50 - type: entity id: CrateSyndicateSuperSurplusBundle - parent: CrateGenericSteel + parent: CrateSyndicate components: - type: SurplusBundle totalPrice: 125 diff --git a/Resources/Prototypes/Corvax/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Corvax/Entities/Structures/Storage/Crates/crates.yml new file mode 100644 index 0000000000..bfce9145d4 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Structures/Storage/Crates/crates.yml @@ -0,0 +1,9 @@ +- type: entity + parent: CrateBaseWeldable + id: CrateSyndicate + name: syndicate crate + components: + - type: Icon + sprite: Corvax/Structures/Storage/Crates/syndicate.rsi + - type: Sprite + sprite: Corvax/Structures/Storage/Crates/syndicate.rsi diff --git a/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/base.png b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/base.png new file mode 100644 index 0000000000..91ff3ac770 Binary files /dev/null and b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/base.png differ diff --git a/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/closed.png b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/closed.png new file mode 100644 index 0000000000..041054878c Binary files /dev/null and b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/closed.png differ diff --git a/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/icon.png b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/icon.png new file mode 100644 index 0000000000..eb67948c54 Binary files /dev/null and b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/icon.png differ diff --git a/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/meta.json b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/meta.json new file mode 100644 index 0000000000..4ac171967c --- /dev/null +++ b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7687a28e7ceecea6b9e0aacdb58a2271b063f9d3 and lock display removed by github:Morb0 & custom welded sprite", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "welded" + }, + { + "name": "sparking", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/open.png b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/open.png new file mode 100644 index 0000000000..1a0f2ef3d8 Binary files /dev/null and b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/open.png differ diff --git a/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/sparking.png b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/sparking.png new file mode 100644 index 0000000000..87b78b9b46 Binary files /dev/null and b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/sparking.png differ diff --git a/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/welded.png b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/welded.png new file mode 100644 index 0000000000..db35bb850e Binary files /dev/null and b/Resources/Textures/Corvax/Structures/Storage/Crates/syndicate.rsi/welded.png differ