diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl index c4244626e9..b7d9f1c3a1 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl @@ -29,6 +29,9 @@ ent-CP14BaseLightCrossbow = легкий арбалет ent-CP14Crossbolt = арбалетный болт .desc = Стержень с заостренным концом. Без оперения, это вам не лук. +ent-CP14WeaponRevolverNavy = револьвер "Марин" + .desc = Увесистый капсюльный револьвер серии "Марин". В настоящее время револьверы серии "Марин" стоят баснословные деньги, и их могут позволить себе исключительно преуспевающие моряки и торговцы. + # Coins ent-CP14CopperCoin = медная корона .desc = Минимальная экономическая единица на просторах Эберрона. Является одной десятой серебрянного соверена. diff --git a/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml b/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml index 2b8dce5f7f..d3c85ad33c 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml @@ -242,6 +242,8 @@ closeTimeTwo: 0 openTimeOne: 0 openTimeTwo: 0 + closedDrawDepth: Mobs + openDrawDepth: Mobs openingAnimationTime: 0 closingAnimationTime: 0 openSound: @@ -420,6 +422,8 @@ closeTimeTwo: 0 openTimeOne: 0 openTimeTwo: 0 + closedDrawDepth: Mobs + openDrawDepth: Mobs openingAnimationTime: 0 closingAnimationTime: 0 openSound: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/guns.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/guns.yml new file mode 100644 index 0000000000..ce3ed1b6f2 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/guns.yml @@ -0,0 +1,21 @@ +- type: entity + name: navy revolver + description: A weighty Marin revolver. The Marin revolvers nowadays cost fabulous sums of money, and can be afforded only by successful sailors and merchants. + id: CP14WeaponRevolverNavy + parent: BaseWeaponRevolver + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Ranged/navy_revolver.rsi + state: icon + - type: Clothing + sprite: _CP14/Objects/Weapons/Ranged/navy_revolver.rsi + - type: Gun + fireRate: 1 + - type: RevolverAmmoProvider + capacity: 5 + chambers: [ True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null ] + whitelist: + tags: + - SpeedLoaderRifle + proto: CartridgeRifle # TODO custom projectiles \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/wooden_fence.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/wooden_fence.yml index 1dfd06fd4e..ac80259f2f 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/wooden_fence.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/wooden_fence.yml @@ -165,7 +165,7 @@ components: - type: Sprite layers: - - state: end + - state: door_closed map: ["enum.DoorVisualLayers.Base"] - type: Fixtures fixtures: @@ -299,7 +299,7 @@ components: - type: Sprite layers: - - state: end_small + - state: door_closed_small map: ["enum.DoorVisualLayers.Base"] - type: Fixtures fixtures: diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/bolt-open.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/bolt-open.png new file mode 100644 index 0000000000..34267b4c67 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/bolt-open.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/equipped-BELT1.png new file mode 100644 index 0000000000..cf8bc1b98a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..362612a073 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/icon.png new file mode 100644 index 0000000000..7fbbbc5f49 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/inhand-left.png new file mode 100644 index 0000000000..5c859b75d3 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/inhand-right.png new file mode 100644 index 0000000000..3cadad4597 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/meta.json new file mode 100644 index 0000000000..dd52770735 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Prazat (discord) for CrystallPunk14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bolt-open" + }, + { + "name": "equipped-BELT1", + "directions": 4 + }, + { + "name": "equipped-BELT2", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file