diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/improvised_gun_parts.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/improvised_gun_parts.yml new file mode 100644 index 00000000000..a092f5839d7 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/improvised_gun_parts.yml @@ -0,0 +1,56 @@ +- type: entity + parent: BaseItem + id: ModularBreech + name: modular breech + description: Loads the projectile and propellent into the chamber of the gun. Used in the creation of flintlock muskets. + components: + - type: Item + size: Small + - type: Sprite + sprite: DeltaV/Objects/Misc/modular_breech.rsi + state: base + - type: Construction + graph: ModularBreechGraph + node: modularbreech + - type: Tag + tags: + - Metal + - ModularBreech + +- type: entity + parent: BaseItem + id: ModularTrigger + name: modular trigger + description: Makes gun go pew when activated. Used in the creation of guns. + components: + - type: Item + size: Small + - type: Sprite + sprite: DeltaV/Objects/Misc/modular_trigger.rsi + state: base + - type: Construction + graph: ModularTriggerGraph + node: modulartrigger + - type: Tag + tags: + - Metal + - ModularTrigger + +- type: entity + parent: BaseItem + id: Bayonet + name: bayonet + description: Often placed on guns to go stabby stabby. + components: + - type: Item + size: Small + - type: Sprite + sprite: DeltaV/Objects/Misc/bayonet.rsi + state: base + - type: Construction + graph: BayonetGraph + node: bayonet + - type: Tag + tags: + - Metal + - Bayonet \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/musket.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/musket.yml new file mode 100644 index 00000000000..c5b913515ab --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/musket.yml @@ -0,0 +1,19 @@ +- type: entity + parent: BaseCartridge + id: CartridgeMusket + name: cartridge (musket) + description: A paper musket cartridge used to load a musket. + components: + - type: Tag + tags: + - Cartridge + - CartridgeMusket + - type: CartridgeAmmo + proto: BulletMusket + deleteOnSpawn: true + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Ammunition/Casings/musket_casing.rsi + state: base + - type: Construction + graph: CartridgeMusketGraph + node: musketcartridge \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/musket.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/musket.yml new file mode 100644 index 00000000000..4c44414b8ff --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/musket.yml @@ -0,0 +1,10 @@ +- type: entity + id: BulletMusket + name: bullet (musket) + parent: BaseBullet + noSpawn: true + components: + - type: Projectile + damage: + types: + Piercing: 30 #4 shot kill for a musket \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 6f4d5b52301..a44a671fd20 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -108,3 +108,27 @@ containers: gun_magazine: !type:ContainerSlot gun_chamber: !type:ContainerSlot + +- type: entity + name: flintlock + suffix: "craftable" + parent: WeaponPistolFlintlock + id: WeaponPistolFlintlockCrafted + description: An old flintlock, feels like 1800s gang warfare. Uses musket cartridges. + components: + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgeMusket + capacity: 1 + proto: CartridgeMusket + - type: Gun #Smoothbore + minAngle: 0 + maxAngle: 30 + fireRate: .125 #slow firerate + resetOnHandSelected: false #Dual Wielding Muskets + - type: Construction + graph: WeaponPistolFlintlockCraftedGraph + node: flintlock + - type: UseDelay + delay: 0 #Straight up doesn't work for guns \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 92eda08624b..202961b8394 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -178,3 +178,31 @@ sprite: DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi - type: Clothing sprite: DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi + +- type: entity + name: musket + id: WeaponRifleMusket + parent: Musket + suffix: "craftable" + description: An old flintlock musket. Uses musket cartridges. + components: + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgeMusket + capacity: 1 + proto: CartridgeMusket + - type: Gun #Smoothbore + fireRate: .125 + resetOnHandSelected: false + minAngle: 20 + maxAngle: 43 + - type: Wieldable + - type: GunWieldBonus + minAngle: -20 + maxAngle: -40 + - type: Construction + graph: WeaponRifleMusketGraph + node: musket + - type: UseDelay + delay: 0 #Straight up doesn't work for guns \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/improvised/bayonet.yml b/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/improvised/bayonet.yml new file mode 100644 index 00000000000..f40872844f0 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/improvised/bayonet.yml @@ -0,0 +1,14 @@ +#In its own file and not musket.yml in case anyone ever wants to add more guns that use it. +- type: constructionGraph + id: BayonetGraph + start: start + graph: + - node: start + edges: + - to: bayonet + steps: + - material: Steel + amount: 1 + doAfter: 4 + - node: bayonet + entity: Bayonet \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/improvised/modular_breech.yml b/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/improvised/modular_breech.yml new file mode 100644 index 00000000000..8131a08783d --- /dev/null +++ b/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/improvised/modular_breech.yml @@ -0,0 +1,14 @@ +#In its own file and not musket.yml in case anyone ever wants to add more guns that use it. +- type: constructionGraph + id: ModularBreechGraph + start: start + graph: + - node: start + edges: + - to: modularbreech + steps: + - material: Steel + amount: 3 + doAfter: 8 + - node: modularbreech + entity: ModularBreech \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/improvised/modular_trigger.yml b/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/improvised/modular_trigger.yml new file mode 100644 index 00000000000..e87fd9a7d98 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/improvised/modular_trigger.yml @@ -0,0 +1,14 @@ +#In its own file and not musket.yml in case anyone ever wants to add more guns that use it. +- type: constructionGraph + id: ModularTriggerGraph + start: start + graph: + - node: start + edges: + - to: modulartrigger + steps: + - material: Steel + amount: 2 + doAfter: 4 + - node: modulartrigger + entity: ModularTrigger \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/improvised/musket.yml b/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/improvised/musket.yml new file mode 100644 index 00000000000..09f47eb2363 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/improvised/musket.yml @@ -0,0 +1,77 @@ +- type: constructionGraph + id: WeaponRifleMusketGraph + start: start + graph: + - node: start + edges: + - to: musket + steps: + - tag: Pipe + icon: + sprite: Structures/Piping/Atmospherics/pipe.rsi + state: pipeStraight + name: pipe + - tag: ModularBreech + icon: + sprite: DeltaV/Objects/Misc/modular_breech.rsi + state: base + name: modular breech + - tag: ModularTrigger + icon: + sprite: DeltaV/Objects/Misc/modular_trigger.rsi + state: base + name: modular trigger + - tag: RifleStock + icon: + sprite: Objects/Misc/rifle_stock.rsi + state: icon + name: rifle stock + - tag: Bayonet + icon: + sprite: DeltaV/Objects/Misc/bayonet.rsi + state: base + name: bayonet + - material: WoodPlank + amount: 3 + doAfter: 10 + - node: musket + entity: WeaponRifleMusket + +- type: constructionGraph + id: WeaponPistolFlintlockCraftedGraph + start: start + graph: + - node: start + edges: + - to: flintlock + steps: + - tag: GasPipeHalf + icon: + sprite: Structures/Piping/Atmospherics/pipe.rsi + state: pipeHalf + name: half pipe + - tag: ModularBreech + icon: + sprite: DeltaV/Objects/Misc/modular_breech.rsi + state: base + name: modular breech + - tag: ModularTrigger + icon: + sprite: DeltaV/Objects/Misc/modular_trigger.rsi + state: base + name: modular trigger + - tag: RifleStock + icon: + sprite: Objects/Misc/rifle_stock.rsi + state: icon + name: rifle stock + - tag: Bayonet + icon: + sprite: DeltaV/Objects/Misc/bayonet.rsi + state: base + name: bayonet + - material: WoodPlank + amount: 2 + doAfter: 10 + - node: flintlock + entity: WeaponPistolFlintlockCrafted \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/improvised/musket_cartridge.yml b/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/improvised/musket_cartridge.yml new file mode 100644 index 00000000000..1043b244d5e --- /dev/null +++ b/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/improvised/musket_cartridge.yml @@ -0,0 +1,20 @@ +- type: constructionGraph + id: CartridgeMusketGraph + start: start + graph: + - node: start + edges: + - to: musketcartridge + steps: + - tag: Paper + icon: + sprite: Objects/Misc/bureaucracy.rsi + state: paper + name: paper + - material: Gunpowder + amount: 1 + - material: Steel + amount: 1 + doAfter: 1 + - node: musketcartridge + entity: CartridgeMusket \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Recipes/Crafting/improvised.yml b/Resources/Prototypes/DeltaV/Recipes/Crafting/improvised.yml new file mode 100644 index 00000000000..759c1a382ad --- /dev/null +++ b/Resources/Prototypes/DeltaV/Recipes/Crafting/improvised.yml @@ -0,0 +1,77 @@ +- type: construction + name: musket + id: WeaponRifleMusket + graph: WeaponRifleMusketGraph + startNode: start + targetNode: musket + category: construction-category-weapons + objectType: Item + description: An old flintlock musket. Uses musket cartidges. + icon: + sprite: Objects/Weapons/Guns/Snipers/musket.rsi + state: base + +- type: construction + name: modular breech + id: ModularBreech + graph: ModularBreechGraph + startNode: start + targetNode: modularbreech + category: construction-category-weapons + objectType: Item + description: Loads the projectile and propellent into the chamber of the gun. Used in the creation of flintlock muskets. + icon: + sprite: DeltaV/Objects/Misc/modular_breech.rsi + state: base + +- type: construction + name: modular trigger + id: ModularTrigger + graph: ModularTriggerGraph + startNode: start + targetNode: modulartrigger + category: construction-category-weapons + objectType: Item + description: Makes gun go pew when activated. Used in the creation of guns. + icon: + sprite: DeltaV/Objects/Misc/modular_trigger.rsi + state: base + +- type: construction + name: bayonet + id: Bayonet + graph: BayonetGraph + startNode: start + targetNode: bayonet + category: construction-category-weapons + objectType: Item + description: Often placed on guns to go stabby stabby. + icon: + sprite: DeltaV/Objects/Misc/bayonet.rsi + state: base + +- type: construction + name: cartridge (musket) + id: CartridgeMusket + graph: CartridgeMusketGraph + startNode: start + targetNode: musketcartridge + category: construction-category-weapons + objectType: Item + description: A paper musket cartridge used to load a musket. + icon: + sprite: DeltaV/Objects/Weapons/Guns/Ammunition/Casings/musket_casing.rsi + state: base + +- type: construction + name: flintlock + id: WeaponPistolFlintlockCrafted + graph: WeaponPistolFlintlockCraftedGraph + startNode: start + targetNode: flintlock + category: construction-category-weapons + objectType: Item + description: An old flintlock, feels like 1800s gang warfare. Uses musket cartidges. + icon: + sprite: Objects/Weapons/Guns/Snipers/musket.rsi + state: base diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml index 211e38d46d3..44542e67935 100644 --- a/Resources/Prototypes/DeltaV/tags.yml +++ b/Resources/Prototypes/DeltaV/tags.yml @@ -1,5 +1,8 @@ ## This is for Nyano and Delta V tags +- type: Tag + id: Bayonet #Craftable Musket + - type: Tag id: BeltSlotNotBelt #not a 'belt' @@ -8,6 +11,9 @@ - type: Tag id: CartridgeSpecial # For the .38 special ammo and revolver + +- type: Tag + id: CartridgeMusket #For the Craftable Musket - type: Tag id: Directional @@ -26,6 +32,12 @@ - type: Tag id: MagazinePistolSpecial # For the .38 special ammo and pistol + +- type: Tag + id: ModularBreech #Craftable Musket + +- type: Tag + id: ModularTrigger #Craftable Musket - type: Tag id: SecDogWearable # allows Laika to wear meson goggles (and more later?) diff --git a/Resources/Textures/DeltaV/Objects/Misc/bayonet.rsi/base.png b/Resources/Textures/DeltaV/Objects/Misc/bayonet.rsi/base.png new file mode 100644 index 00000000000..5c946db59ee Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/bayonet.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Misc/bayonet.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Misc/bayonet.rsi/inhand-left.png new file mode 100644 index 00000000000..2ad59899510 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/bayonet.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Misc/bayonet.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Misc/bayonet.rsi/inhand-right.png new file mode 100644 index 00000000000..f53b1a561f2 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/bayonet.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Misc/bayonet.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/bayonet.rsi/meta.json new file mode 100644 index 00000000000..1c4508e81a8 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Misc/bayonet.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Pato Grone for SS14, edited by Tryded", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "base" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Objects/Misc/modular_breech.rsi/base.png b/Resources/Textures/DeltaV/Objects/Misc/modular_breech.rsi/base.png new file mode 100644 index 00000000000..83622d8e09a Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/modular_breech.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Misc/modular_breech.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Misc/modular_breech.rsi/inhand-left.png new file mode 100644 index 00000000000..8fc52b15fe4 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/modular_breech.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Misc/modular_breech.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Misc/modular_breech.rsi/inhand-right.png new file mode 100644 index 00000000000..c297980f0a6 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/modular_breech.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Misc/modular_breech.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/modular_breech.rsi/meta.json new file mode 100644 index 00000000000..1c4508e81a8 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Misc/modular_breech.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Pato Grone for SS14, edited by Tryded", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "base" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Objects/Misc/modular_trigger.rsi/base.png b/Resources/Textures/DeltaV/Objects/Misc/modular_trigger.rsi/base.png new file mode 100644 index 00000000000..2c24631d66f Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/modular_trigger.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Misc/modular_trigger.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/modular_trigger.rsi/meta.json new file mode 100644 index 00000000000..f186bc80a53 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Misc/modular_trigger.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Pato Grone for SS14, edited by Tryded", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Casings/musket_casing.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Casings/musket_casing.rsi/base.png new file mode 100644 index 00000000000..0cb544ac8b8 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Casings/musket_casing.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Casings/musket_casing.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Casings/musket_casing.rsi/meta.json new file mode 100644 index 00000000000..fee7e3a5ffb --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Casings/musket_casing.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Original work by Tryded", + "states": [ + { + "name": "base" + } + ] +}