forked from Nyanotrasen/Nyanotrasen
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Mk 32 Pistol, Mark 1 Rifle, Wakizashi, and more (Nyanotrasen#1472)
* Add Mk 32 Universal, Mk 1 Rifle, Katana Sheath * Adds Mk 32 Universal - a robust .25 caseless pistol with enhanced offensive capabilities. * Adds Mark 1 Rifle - a reliable and much-loved design for .30 light rifle. Also comes in tasteful ceremonial colours. * Adds wakizashi - essentially a smaller katana. * Adds katana belt - holds both a katana and a wakizashi. * Adds CMO webbing - a chest rig in medical colours. * Resprites katana to fit a more modern art style. * Revises double barrel shotguns - they now automatically cycle. * Added Mk32 Sprites * Adds the sprites. I forgor * Updated tags * Added tag for MagazineUniversalCaselessRifle. Maybe this fixes it... * Added belts to head lockers, changed uplink * Added CMO rig to CMO locker * Added katana sheath filled to HoS locker * Changed the .30 rifle mag box to a .30 rifle speed loader box in uplink * Reverted .25 caseless rubber magazine changes * Reverted a change I made when tired. Will actually fix .25 caseless magazines and references properly later. * Removed erroneous katana sheath sprites * Removed erroneous sprites messing up the RSI validation. * Removed Filled Katana Sheath from HoS locker - Removed Filled Katana Sheath from HoS locker. Must now be mapped in manually. * Fix typo in snipers.yml Changed "anti-material" to "anti-materiel", as it should be * Moved planned additions from upstream files - Moved code occupying upstream files to Nyanotrasen folders - Left code that directly overrides upstream files * Fixed file swap issue Files for caseless mags were swapped, now it should be rectified. * Fixed another typo Damn these things * RSI file moved Everything actually works now * Updated belts.yml Changed capacity of CMO webbing from 60 to 30 Fixed spacing between Martial Artist belt and Katana belt * Minor fixes - Edited a few mis-capitalisations - Changed a couple of descriptions - Removed erroneously added RSI
- Loading branch information
1 parent
204f847
commit e502d63
Showing
66 changed files
with
631 additions
and
71 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
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
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
9 changes: 9 additions & 0 deletions
9
Resources/Prototypes/Nyanotrasen/Catalog/Fills/Items/belt.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 |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| - type: entity | ||
| id: ClothingBeltKatanaSheathFilled | ||
| parent: ClothingBeltKatanaSheath | ||
| suffix: Filled | ||
| components: | ||
| - type: StorageFill | ||
| contents: | ||
| - id: Katana | ||
| - id: Wakizashi |
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
108 changes: 108 additions & 0 deletions
108
...ototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/caseless_rifle.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 |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| - type: entity | ||
| id: BaseMagazineUniversalCaselessRifle | ||
| name: "Universal magazine (.25 caseless)" | ||
| parent: BaseMagazineCaselessRifle | ||
| abstract: true | ||
| components: | ||
| - type: Tag | ||
| tags: | ||
| - MagazineUniversalCaselessRifle | ||
| - type: BallisticAmmoProvider | ||
| whitelist: | ||
| tags: | ||
| - CartridgeCaselessRifle | ||
| proto: CartridgeCaselessRifle | ||
| capacity: 12 | ||
| - type: Item | ||
| size: 5 | ||
| - type: Sprite | ||
| netsync: false | ||
| sprite: Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi | ||
| layers: | ||
| - state: base | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-1 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
| - type: MagazineVisuals | ||
| magState: mag | ||
| steps: 12 | ||
| zeroVisible: false | ||
| - type: Appearance | ||
|
|
||
| # Magazines for the Universal Pistol | ||
|
|
||
| - type: entity | ||
| id: MagazineUniversalCaselessRifle | ||
| name: "Universal magazine (.25 caseless)" | ||
| parent: BaseMagazineUniversalCaselessRifle | ||
| components: | ||
| - type: BallisticAmmoProvider | ||
| proto: CartridgeCaselessRifle | ||
| capacity: 12 | ||
| - type: Sprite | ||
| layers: | ||
| - state: red | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-1 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
| - type: MagazineVisuals | ||
| magState: mag | ||
| steps: 12 | ||
| zeroVisible: false | ||
|
|
||
| - type: entity | ||
| id: MagazineUniversalCaselessRifleHighVelocity | ||
| name: "Universal magazine (.25 caseless high-velocity)" | ||
| parent: BaseMagazineUniversalCaselessRifle | ||
| components: | ||
| - type: BallisticAmmoProvider | ||
| proto: CartridgeCaselessRifleHighVelocity | ||
| capacity: 12 | ||
| - type: Sprite | ||
| layers: | ||
| - state: high_velocity | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-1 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
| - type: MagazineVisuals | ||
| magState: mag | ||
| steps: 12 | ||
| zeroVisible: false | ||
|
|
||
| - type: entity | ||
| id: MagazineUniversalCaselessRiflePractice | ||
| name: "Universal magazine (.25 caseless practice)" | ||
| parent: BaseMagazineUniversalCaselessRifle | ||
| components: | ||
| - type: BallisticAmmoProvider | ||
| proto: CartridgeCaselessRiflePractice | ||
| capacity: 12 | ||
| - type: Sprite | ||
| layers: | ||
| - state: practice | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-1 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
| - type: MagazineVisuals | ||
| magState: mag | ||
| steps: 12 | ||
| zeroVisible: false | ||
|
|
||
| - type: entity | ||
| id: MagazineUniversalCaselessRifleRubber | ||
| name: "Universal magazine (.25 caseless rubber)" | ||
| parent: BaseMagazineUniversalCaselessRifle | ||
| components: | ||
| - type: BallisticAmmoProvider | ||
| proto: CartridgeCaselessRifleRubber | ||
| capacity: 12 | ||
| - type: Sprite | ||
| layers: | ||
| - state: rubber | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-1 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
| - type: MagazineVisuals | ||
| magState: mag | ||
| steps: 12 | ||
| zeroVisible: false |
41 changes: 41 additions & 0 deletions
41
Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Pistols/pistols.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 |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| - type: entity | ||
| name: mk 32 "Universal" | ||
| parent: BaseWeaponPistol | ||
| id: WeaponPistolUniversal | ||
| description: An expensive and robust pistol with decent offensive capabilities. Uses .25 caseless ammo. | ||
| components: | ||
| - type: Sprite | ||
| sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi | ||
| layers: | ||
| - state: base | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-0 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
| - type: Clothing | ||
| sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi | ||
| - type: Gun | ||
| fireRate: 3 | ||
| soundGunshot: | ||
| path: /Audio/Weapons/Guns/Gunshots/hpistol.ogg | ||
| - type: ItemSlots | ||
| slots: | ||
| gun_magazine: | ||
| name: Magazine | ||
| startingItem: MagazineUniversalCaselessRifle | ||
| insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg | ||
| ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg | ||
| priority: 2 | ||
| whitelist: | ||
| tags: | ||
| - MagazineUniversalCaselessRifle | ||
| gun_chamber: | ||
| name: Chamber | ||
| startingItem: CartridgeCaselessRifle | ||
| priority: 1 | ||
| whitelist: | ||
| tags: | ||
| - CartridgeCaselessRifle | ||
| - type: ContainerContainer | ||
| containers: | ||
| gun_magazine: !type:ContainerSlot | ||
| gun_chamber: !type:ContainerSlot |
49 changes: 49 additions & 0 deletions
49
Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.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 |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| - type: entity | ||
| name: mark 1 rifle | ||
| parent: BaseWeaponSniper | ||
| id: WeaponSniperGrand | ||
| description: A heavy and reliable self-loading rifle, utilising a modified version of a centuries-old design. Uses .30 rifle ammo. | ||
| components: | ||
| - type: Sprite | ||
| sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi | ||
| - type: Clothing | ||
| sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi | ||
| - type: Gun | ||
| fireRate: 2 | ||
| selectedMode: SemiAuto | ||
| availableModes: | ||
| - SemiAuto | ||
| soundGunshot: | ||
| path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg | ||
| - type: BallisticAmmoProvider | ||
| autoCycle: true | ||
| capacity: 5 | ||
| proto: CartridgeLightRifle | ||
| whitelist: | ||
| tags: | ||
| - CartridgeLightRifle | ||
|
|
||
| - type: entity | ||
| name: ceremonial rifle | ||
| parent: BaseWeaponSniper | ||
| id: WeaponSniperCeremonial | ||
| description: A ceremonial variant of the Mark 1 Rifle, in tasteful blue and white. Uses .30 rifle ammo. | ||
| components: | ||
| - type: Sprite | ||
| sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/ceremonial_grand.rsi | ||
| - type: Clothing | ||
| sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/ceremonial_grand.rsi | ||
| - type: Gun | ||
| fireRate: 2 | ||
| selectedMode: SemiAuto | ||
| availableModes: | ||
| - SemiAuto | ||
| soundGunshot: | ||
| path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg | ||
| - type: BallisticAmmoProvider | ||
| autoCycle: true | ||
| capacity: 5 | ||
| proto: CartridgeLightRifle | ||
| whitelist: | ||
| tags: | ||
| - CartridgeLightRifle |
26 changes: 26 additions & 0 deletions
26
Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/sword.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 |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| - type: entity | ||
| name: wakizashi | ||
| parent: BaseItem | ||
| id: Wakizashi | ||
| description: A short, multi-purpose sword of plasteel construction. | ||
| components: | ||
| - type: Sharp | ||
| - type: Tag | ||
| tags: | ||
| - Katana | ||
| - type: Sprite | ||
| sprite: Nyanotrasen/Objects/Weapons/Melee/wakizashi.rsi | ||
| state: icon | ||
| - type: MeleeWeapon | ||
| attackRate: 2 | ||
| damage: | ||
| types: | ||
| Slash: 8 | ||
| - type: MeleeBloodletter | ||
| bloodReduction: | ||
| types: | ||
| Slash: 8.0 | ||
| - type: Item | ||
| size: 10 | ||
| sprite: Nyanotrasen/Objects/Weapons/Melee/wakizashi.rsi | ||
| - type: DisarmMalus |
Oops, something went wrong.