-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into Syndies-stuff
- Loading branch information
Showing
8 changed files
with
188 additions
and
150 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 10 additions & 10 deletions
20
...prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/magazines/M41-A_mag.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| ent-LPPBaseMagazineRifleM41A = Магазин для M41-A (.20 винтовочные) | ||
| .desc = { ent-BaseItem.desc } | ||
| ent-LPPBaseMagazineRifleM41AFull = Магазин для M41-A (.20 винтовочные Боевые) | ||
| .desc = { ent-LPPBaseMagazineRifleM41A.desc } | ||
| ent-LPPBaseMagazineRifleM41APractice = Магазин для M41-A (.20 винтовочные Учебные) | ||
| .desc = { ent-LPPBaseMagazineRifleM41A.desc } | ||
| ent-LPPBaseMagazineRifleM41ARubber = Магазин для M41-A (.20 винтовочные Резиновые) | ||
| .desc = { ent-LPPBaseMagazineRifleM41A.desc } | ||
| ent-LPPBaseMagazineRifleM41AUranium = Магазин для M41-A (.20 винтовочные Урановые) | ||
| .desc = { ent-LPPBaseMagazineRifleM41A.desc } | ||
| ent-LPPBaseMagazineRifleM41A = Магазин для M41-A (.30 винтовочные) | ||
| .desc = { ent-BaseItem.desc } | ||
| ent-LPPBaseMagazineRifleM41AFull = Магазин для M41-A (.30 винтовочные Боевые) | ||
| .desc = { ent-LPPBaseMagazineRifleM41A.desc } | ||
| ent-LPPBaseMagazineRifleM41APractice = Магазин для M41-A (.30 винтовочные Учебные) | ||
| .desc = { ent-LPPBaseMagazineRifleM41A.desc } | ||
| ent-LPPBaseMagazineRifleM41ARubber = Магазин для M41-A (.30 винтовочные Резиновые) | ||
| .desc = { ent-LPPBaseMagazineRifleM41A.desc } | ||
| ent-LPPBaseMagazineRifleM41AUranium = Магазин для M41-A (.30 винтовочные Урановые) | ||
| .desc = { ent-LPPBaseMagazineRifleM41A.desc } |
4 changes: 2 additions & 2 deletions
4
...ale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/rifles/M41-A.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| ent-LPPWeaponRifleM41 = М41-А | ||
| .desc = Старая винтовка, использовавшаяся во времена колониальной экспансии. Использует винтовочные патроны 20-го калибра. | ||
| ent-LPPWeaponRifleM41 = М41-А | ||
| .desc = Старая винтовка, использовавшаяся во времена колониальной экспансии. Использует винтовочные патроны 30-го калибра. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
180 changes: 90 additions & 90 deletions
180
...Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/M41-A_mag.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,90 +1,90 @@ | ||
| - type: entity | ||
| id: LPPBaseMagazineRifleM41A | ||
| name: "magazine M41-A (.20 rifle)" | ||
| parent: BaseItem | ||
| abstract: true | ||
| components: | ||
| - type: Tag | ||
| tags: | ||
| - MagazineRifleM41A | ||
| - type: Item | ||
| size: Small | ||
| - type: BallisticAmmoProvider | ||
| mayTransfer: true | ||
| whitelist: | ||
| tags: | ||
| - CartridgeRifle | ||
| capacity: 99 | ||
| - type: ContainerContainer | ||
| containers: | ||
| ballistic-ammo: !type:Container | ||
| - type: Sprite | ||
| sprite: _LostParadise/Objects/Weapons/Guns/Ammunition/Magazine/M41-A_mag.rsi | ||
| layers: | ||
| - state: base | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-1 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
| - type: MagazineVisuals | ||
| magState: mag | ||
| steps: 5 | ||
| zeroVisible: false | ||
| - type: Appearance | ||
|
|
||
| # Magazines | ||
| - type: entity | ||
| id: LPPBaseMagazineRifleM41AFull | ||
| name: "magazine M41-A (.20 rifle)" | ||
| parent: LPPBaseMagazineRifleM41A | ||
| components: | ||
| - type: BallisticAmmoProvider | ||
| proto: CartridgeRifle | ||
| - type: Sprite | ||
| layers: | ||
| - state: red | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-1 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
|
|
||
| - type: entity | ||
| id: LPPBaseMagazineRifleM41APractice | ||
| name: "magazine M41-A (.20 rifle practice)" | ||
| parent: LPPBaseMagazineRifleM41A | ||
| components: | ||
| - type: BallisticAmmoProvider | ||
| proto: CartridgeRiflePractice | ||
| - type: Sprite | ||
| layers: | ||
| - state: practice | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-1 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
|
|
||
| - type: entity | ||
| id: LPPBaseMagazineRifleM41ARubber | ||
| name: "magazine M41-A (.20 rifle rubber)" | ||
| parent: LPPBaseMagazineRifleM41A | ||
| components: | ||
| - type: BallisticAmmoProvider | ||
| proto: CartridgeRifleRubber | ||
| - type: Sprite | ||
| layers: | ||
| - state: rubber | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-1 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
|
|
||
|
|
||
| - type: entity | ||
| id: LPPBaseMagazineRifleM41AUranium | ||
| name: "magazine (.20 rifle uranium)" | ||
| parent: LPPBaseMagazineRifleM41A | ||
| components: | ||
| - type: BallisticAmmoProvider | ||
| proto: CartridgeRifleUranium | ||
| - type: Sprite | ||
| layers: | ||
| - state: uranium | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-1 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
| - type: entity | ||
| id: LPPBaseMagazineRifleM41A | ||
| name: "magazine M41-A (.30 rifle)" | ||
| parent: BaseItem | ||
| abstract: true | ||
| components: | ||
| - type: Tag | ||
| tags: | ||
| - MagazineRifleM41A | ||
| - type: Item | ||
| size: Small | ||
| - type: BallisticAmmoProvider | ||
| mayTransfer: true | ||
| whitelist: | ||
| tags: | ||
| - CartridgeRifle | ||
| capacity: 99 | ||
| - type: ContainerContainer | ||
| containers: | ||
| ballistic-ammo: !type:Container | ||
| - type: Sprite | ||
| sprite: _LostParadise/Objects/Weapons/Guns/Ammunition/Magazine/M41-A_mag.rsi | ||
| layers: | ||
| - state: base | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-1 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
| - type: MagazineVisuals | ||
| magState: mag | ||
| steps: 5 | ||
| zeroVisible: false | ||
| - type: Appearance | ||
|
|
||
| # Magazines | ||
| - type: entity | ||
| id: LPPBaseMagazineRifleM41AFull | ||
| name: "magazine M41-A (.30 rifle)" | ||
| parent: LPPBaseMagazineRifleM41A | ||
| components: | ||
| - type: BallisticAmmoProvider | ||
| proto: CartridgeRifle | ||
| - type: Sprite | ||
| layers: | ||
| - state: red | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-1 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
|
|
||
| - type: entity | ||
| id: LPPBaseMagazineRifleM41APractice | ||
| name: "magazine M41-A (.30 rifle practice)" | ||
| parent: LPPBaseMagazineRifleM41A | ||
| components: | ||
| - type: BallisticAmmoProvider | ||
| proto: CartridgeRiflePractice | ||
| - type: Sprite | ||
| layers: | ||
| - state: practice | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-1 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
|
|
||
| - type: entity | ||
| id: LPPBaseMagazineRifleM41ARubber | ||
| name: "magazine M41-A (.30 rifle rubber)" | ||
| parent: LPPBaseMagazineRifleM41A | ||
| components: | ||
| - type: BallisticAmmoProvider | ||
| proto: CartridgeRifleRubber | ||
| - type: Sprite | ||
| layers: | ||
| - state: rubber | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-1 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
|
|
||
|
|
||
| - type: entity | ||
| id: LPPBaseMagazineRifleM41AUranium | ||
| name: "magazine (.30 rifle uranium)" | ||
| parent: LPPBaseMagazineRifleM41A | ||
| components: | ||
| - type: BallisticAmmoProvider | ||
| proto: CartridgeRifleUranium | ||
| - type: Sprite | ||
| layers: | ||
| - state: uranium | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-1 | ||
| map: ["enum.GunVisualLayers.Mag"] |
92 changes: 46 additions & 46 deletions
92
Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Rifles/M41-A.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,47 @@ | ||
| - type: entity | ||
| name: M41-A | ||
| parent: BaseWeaponRifle | ||
| id: LPPWeaponRifleM41 | ||
| description: An old rifle used during the colonial expansion. Uses .20 rifle ammo. | ||
| components: | ||
| - type: Sprite | ||
| sprite: _LostParadise/Objects/Weapons/Guns/Rifles/M41-A.rsi | ||
| layers: | ||
| - state: base | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-0 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
| - type: Gun | ||
| fireRate: 7 | ||
| soundGunshot: | ||
| path: /Audio/_LostParadise/Weapons/Guns/Gunshots/M41-A.ogg | ||
| - type: ChamberMagazineAmmoProvider | ||
| soundRack: | ||
| path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg | ||
| - type: ItemSlots | ||
| slots: | ||
| gun_magazine: | ||
| name: Magazine | ||
| startingItem: LPPBaseMagazineRifleM41AFull | ||
| insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg | ||
| ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg | ||
| priority: 2 | ||
| whitelist: | ||
| tags: | ||
| - MagazineRifleM41A | ||
| gun_chamber: | ||
| name: Chamber | ||
| startingItem: CartridgeLightRifle | ||
| priority: 1 | ||
| whitelist: | ||
| tags: | ||
| - CartridgeLightRifle | ||
| - type: ContainerContainer | ||
| containers: | ||
| gun_magazine: !type:ContainerSlot | ||
| gun_chamber: !type:ContainerSlot | ||
| - type: MagazineVisuals | ||
| magState: mag | ||
| steps: 1 | ||
| zeroVisible: true | ||
| - type: entity | ||
| name: M41-A | ||
| parent: BaseWeaponRifle | ||
| id: LPPWeaponRifleM41 | ||
| description: An old rifle used during the colonial expansion. Uses .30 rifle ammo. | ||
| components: | ||
| - type: Sprite | ||
| sprite: _LostParadise/Objects/Weapons/Guns/Rifles/M41-A.rsi | ||
| layers: | ||
| - state: base | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-0 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
| - type: Gun | ||
| fireRate: 7 | ||
| soundGunshot: | ||
| path: /Audio/_LostParadise/Weapons/Guns/Gunshots/M41-A.ogg | ||
| - type: ChamberMagazineAmmoProvider | ||
| soundRack: | ||
| path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg | ||
| - type: ItemSlots | ||
| slots: | ||
| gun_magazine: | ||
| name: Magazine | ||
| startingItem: LPPBaseMagazineRifleM41AFull | ||
| insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg | ||
| ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg | ||
| priority: 2 | ||
| whitelist: | ||
| tags: | ||
| - MagazineRifleM41A | ||
| gun_chamber: | ||
| name: Chamber | ||
| startingItem: CartridgeLightRifle | ||
| priority: 1 | ||
| whitelist: | ||
| tags: | ||
| - CartridgeLightRifle | ||
| - type: ContainerContainer | ||
| containers: | ||
| gun_magazine: !type:ContainerSlot | ||
| gun_chamber: !type:ContainerSlot | ||
| - type: MagazineVisuals | ||
| magState: mag | ||
| steps: 1 | ||
| zeroVisible: true | ||
| - type: Appearance |