diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index ae7bbfde1f..3279eb7879 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -312,24 +312,6 @@ ent-CP14ClothingPantsMercenaryTrousers = брюки наемника ent-CP14ClothingPantsSouthernMagician = платье южного фокусника .desc = Традиционная юбка южного мага, довольно свободная. -ent-CP14ClothingShirtCottonBlue = хлопковая синяя рубаха - .desc = { ent-CP14ClothingShirtCottonBlue.desc } - -ent-CP14ClothingShirtCottonBlack = хлопковая черная рубаха - .desc = { ent-CP14ClothingShirtCottonBlue.desc } - -ent-CP14ClothingShirtCottonPurple = хлопковая фиолетовая рубаха - .desc = { ent-CP14ClothingShirtCottonBlue.desc } - -ent-CP14ClothingShirtCottonRed = хлопковая красная рубаха - .desc = { ent-CP14ClothingShirtCottonBlue.desc } - -ent-CP14ClothingShirtCottonWhite = хлопковая белая рубаха - .desc = { ent-CP14ClothingShirtCottonBlue.desc } - -ent-CP14ClothingShirtCottonYellow = хлопковая желтая - .desc = { ent-CP14ClothingShirtCottonBlue.desc } - ent-CP14ClothingShirtSteampunk = укрепленная латунью рубашка .desc = Белая рубашка, укрепленная латунными вставками. diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml index 09864f20a2..41aedc0157 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml @@ -2,6 +2,7 @@ abstract: true parent: Clothing id: CP14ClothingShirtBase + description: Pleasant to the touch material, in a comfortable loose shirt shape. categories: [ ForkFiltered ] components: - type: Clothing @@ -16,7 +17,6 @@ parent: CP14ClothingShirtBase id: CP14ClothingShirtCottonBlue name: cotton blue shirt - description: Pleasant to the touch material, in a comfortable loose shirt shape. components: - type: Sprite sprite: _CP14/Clothing/Shirt/Cotton/blue.rsi @@ -27,7 +27,6 @@ parent: CP14ClothingShirtBase id: CP14ClothingShirtCottonBlack name: cotton black shirt - description: Pleasant to the touch material, in a comfortable loose shirt shape. components: - type: Sprite sprite: _CP14/Clothing/Shirt/Cotton/black.rsi @@ -38,7 +37,6 @@ parent: CP14ClothingShirtBase id: CP14ClothingShirtCottonPurple name: cotton purple shirt - description: Pleasant to the touch material, in a comfortable loose shirt shape. components: - type: Sprite sprite: _CP14/Clothing/Shirt/Cotton/purple.rsi @@ -49,7 +47,6 @@ parent: CP14ClothingShirtBase id: CP14ClothingShirtCottonRed name: cotton red shirt - description: Pleasant to the touch material, in a comfortable loose shirt shape. components: - type: Sprite sprite: _CP14/Clothing/Shirt/Cotton/red.rsi @@ -60,7 +57,6 @@ parent: CP14ClothingShirtBase id: CP14ClothingShirtCottonWhite name: cotton white shirt - description: Pleasant to the touch material, in a comfortable loose shirt shape. components: - type: Sprite sprite: _CP14/Clothing/Shirt/Cotton/white.rsi @@ -71,7 +67,6 @@ parent: CP14ClothingShirtBase id: CP14ClothingShirtCottonYellow name: cotton yellow shirt - description: Pleasant to the touch material, in a comfortable loose shirt shape. components: - type: Sprite sprite: _CP14/Clothing/Shirt/Cotton/yellow.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/base.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/base.yml index 68c1e3e6b6..7204121b41 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/base.yml @@ -16,4 +16,6 @@ closedDrawDepth: Mobs openDrawDepth: Mobs - type: Lock - locked: false \ No newline at end of file + locked: false + - type: PlacementReplacement + key: walls \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors.yml new file mode 100644 index 0000000000..b62ecc136b --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors.yml @@ -0,0 +1,44 @@ +- type: entity + id: CP14IronDoor + parent: + - CP14BaseDoor + name: iron door + description: Well, if there's a solid iron door, there must be something valuable behind it. + suffix: Opened + components: + - type: Sprite + sprite: _CP14/Structures/Doors/iron_door.rsi + layers: + - state: closed + map: ["enum.DoorVisualLayers.Base"] + - type: Door + openSound: + path: /Audio/Effects/door_open.ogg + closeSound: + path: /Audio/Effects/door_close.ogg + - type: Damageable + damageContainer: Inorganic + damageModifierSet: StructuralMetallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 500 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + #- type: Construction + # graph: CP14WoodenDoor + # node: CP14WoodenDoor + +- type: entity + id: CP14IronDoorMirrored + parent: CP14IronDoor + suffix: Opened, Mirrored + components: + - type: Door + openSpriteState: open_mirrored + closedSpriteState: closed_mirrored + #- type: Construction + # graph: CP14WoodenDoor + # node: CP14WoodenDoorMirrored diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors_windowed.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors_windowed.yml new file mode 100644 index 0000000000..2beca49e70 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors_windowed.yml @@ -0,0 +1,47 @@ +- type: entity + id: CP14IronDoorWindowed + parent: + - CP14BaseDoor + name: iron windowed door + description: a solid iron door with a small window. You can look through it, of course, but it's hard to put your hand through. + suffix: Opened + components: + - type: Sprite + sprite: _CP14/Structures/Doors/iron_windowed_door.rsi + layers: + - state: closed + map: ["enum.DoorVisualLayers.Base"] + - type: Occluder + enabled: false + - type: Door + occludes: false + openSound: + path: /Audio/Effects/door_open.ogg + closeSound: + path: /Audio/Effects/door_close.ogg + - type: Damageable + damageContainer: Inorganic + damageModifierSet: StructuralMetallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 500 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + #- type: Construction + # graph: CP14WoodenDoor + # node: CP14WoodenDoor + +- type: entity + id: CP14IronDoorWindowedMirrored + parent: CP14IronDoorWindowed + suffix: Opened, Mirrored + components: + - type: Door + openSpriteState: open_mirrored + closedSpriteState: closed_mirrored + #- type: Construction + # graph: CP14WoodenDoor + # node: CP14WoodenDoorMirrored diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/closed.png b/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/closed.png new file mode 100644 index 0000000000..d85c694740 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/closed.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/closed_mirrored.png b/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/closed_mirrored.png new file mode 100644 index 0000000000..91532b13c3 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/closed_mirrored.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/meta.json b/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/meta.json new file mode 100644 index 0000000000..3055dbd90c --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "By TheShuEd", + "size": { + "x": 64, + "y": 96 + }, + "states": [ + { + "name": "closed", + "directions": 4 + }, + { + "name": "open", + "directions": 4 + }, + { + "name": "open_mirrored", + "directions": 4 + }, + { + "name": "closed_mirrored", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/open.png b/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/open.png new file mode 100644 index 0000000000..36b3666b8a Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/open.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/open_mirrored.png b/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/open_mirrored.png new file mode 100644 index 0000000000..4bf14bca57 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/open_mirrored.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/closed.png b/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/closed.png new file mode 100644 index 0000000000..dc9cf82dd7 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/closed.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/closed_mirrored.png b/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/closed_mirrored.png new file mode 100644 index 0000000000..07e43b3c3c Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/closed_mirrored.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/meta.json b/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/meta.json new file mode 100644 index 0000000000..3055dbd90c --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "By TheShuEd", + "size": { + "x": 64, + "y": 96 + }, + "states": [ + { + "name": "closed", + "directions": 4 + }, + { + "name": "open", + "directions": 4 + }, + { + "name": "open_mirrored", + "directions": 4 + }, + { + "name": "closed_mirrored", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/open.png b/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/open.png new file mode 100644 index 0000000000..03c35ea264 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/open.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/open_mirrored.png b/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/open_mirrored.png new file mode 100644 index 0000000000..047603433f Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/open_mirrored.png differ