diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index 90f987fdc69f..63206af1a6b3 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -146,6 +146,11 @@ - type: Battery maxCharge: 1080 startingCharge: 1080 +#ss220 kostyl for handmade gun buff begin + - type: Tag + tags: + - PowerCellHigh +#ss220 kostyl for handmade gun buff end - type: entity id: PowerCellHighPrinted diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index c525a40d4166..3fe3dc36a99d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -84,8 +84,8 @@ - type: Projectile damage: types: - Piercing: 3 - Slash: 3 + Piercing: 4 #ss220 handmade gun buff + Slash: 5 #ss220 handmade gun buff - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 57c54bb80bf3..be99f4be3180 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -169,6 +169,11 @@ - type: Battery maxCharge: 500 startingCharge: 500 +#ss220 handmade gun buff begin + - type: Construction + graph: WeaponMakeshiftLaserGraph + node: pistol +#ss220 handmade gun buff end - type: entity name: tesla gun diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index b30e5de536cc..b05c5d419f09 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -243,11 +243,16 @@ soundGunshot: # Corvax-Guns path: /Audio/Corvax/Weapons/Guns/Gunshots/shotgun_pipe.ogg - type: BallisticAmmoProvider - capacity: 1 + proto: null #ss220 handmade gun buff + capacity: 1 #ss220 handmade gun buff + # ss220 handmade gun buff (Оффы зачем-то сделали крафт обреза из пистолета, я убрал) + #- type: Construction + # graph: ShotgunSawn + # node: shotgunsawn + # deconstructionTarget: null - type: Construction - graph: ShotgunSawn - node: shotgunsawn - deconstructionTarget: null + graph: WeaponShotgunHandmadeGraph + node: HDpistol - type: StaticPrice price: 0 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml index 9b046a7aae63..fb0732c582d8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml @@ -37,3 +37,8 @@ slots: - Belt - suitStorage +#ss220 handmade gun buff begin + - type: Tag + tags: + - WeaponFlareGun +#ss220 handmade gun buff end \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun.yml index f8e7b64b90a3..650770425a95 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun.yml @@ -11,18 +11,26 @@ sprite: Structures/Piping/Atmospherics/pipe.rsi state: pipeStraight name: pipe - - tag: ModularReceiver - icon: - sprite: Objects/Misc/modular_receiver.rsi - state: icon - name: modular receiver + #ss220 handmade gun buff + #- tag: ModularReceiver + # icon: + # sprite: Objects/Misc/modular_receiver.rsi + # state: icon + # name: modular receiver - tag: RifleStock icon: sprite: Objects/Misc/rifle_stock.rsi state: icon name: rifle stock + #ss220 handmade gun buff begin + - tag: Igniter + icon: + sprite: Objects/Devices/igniter.rsi + state: icon + name: Igniter - material: Cloth amount: 3 - doAfter: 10 + doAfter: 25 + #ss200 handmade gun buff end - node: shotgun - entity: WeaponShotgunImprovised + entity: WeaponShotgunImprovised \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml index 9f666dd61c15..5ac9c6dc622b 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml @@ -8,69 +8,71 @@ steps: - material: Steel amount: 1 - doAfter: 0.5 - - material: Plastic - amount: 1 - doAfter: 0.5 + #ss220 handmade gun buff begin + # doAfter: 2 + #- material: Plastic + # amount: 1 + # doAfter: 0.5 - tag: GlassShard name: glass shard icon: sprite: Objects/Materials/Shards/shard.rsi state: shard1 - doAfter: 0.5 - - tag: GlassShard - name: glass shard - icon: - sprite: Objects/Materials/Shards/shard.rsi - state: shard2 - doAfter: 0.5 - - tag: GlassShard - name: glass shard - icon: - sprite: Objects/Materials/Shards/shard.rsi - state: shard1 - doAfter: 0.5 - - tag: GlassShard - name: glass shard - icon: - sprite: Objects/Materials/Shards/shard.rsi - state: shard3 - doAfter: 0.5 - - tag: Matchstick - name: match stick - icon: - sprite: Objects/Tools/matches.rsi - state: match_unlit - doAfter: 0.5 - - tag: Matchstick - name: match stick - icon: - sprite: Objects/Tools/matches.rsi - state: match_unlit - doAfter: 0.5 - - tag: Matchstick - name: match stick - icon: - sprite: Objects/Tools/matches.rsi - state: match_unlit - doAfter: 0.5 + # doAfter: 0.5 + #- tag: GlassShard + # name: glass shard + # icon: + # sprite: Objects/Materials/Shards/shard.rsi + # state: shard2 + # doAfter: 0.5 + # tag: GlassShard + # name: glass shard + # icon: + # sprite: Objects/Materials/Shards/shard.rsi + # state: shard1 + # doAfter: 0.5 + #- tag: GlassShard + # name: glass shard + # icon: + # sprite: Objects/Materials/Shards/shard.rsi + # state: shard3 + # doAfter: 0.5 - tag: Matchstick name: match stick icon: sprite: Objects/Tools/matches.rsi state: match_unlit - doAfter: 0.5 + # doAfter: 0.5 - tag: Matchstick name: match stick icon: sprite: Objects/Tools/matches.rsi state: match_unlit - doAfter: 0.5 + # doAfter: 0.5 - tag: Matchstick name: match stick icon: sprite: Objects/Tools/matches.rsi state: match_unlit - doAfter: 0.5 + doAfter: 20 # (вместо странного удлинения скорости крафта после каждого компонента задал единую скорость тут) + #- tag: Matchstick + # name: match stick + # icon: + # sprite: Objects/Tools/matches.rsi + # state: match_unlit + # doAfter: 0.5 + #- tag: Matchstick + # name: match stick + # icon: + # sprite: Objects/Tools/matches.rsi + # state: match_unlit + # doAfter: 0.5 + #- tag: Matchstick + # name: match stick + # icon: + # sprite: Objects/Tools/matches.rsi + # state: match_unlit + # doAfter: 0.5 + #ss220 handmade gun buff end - node: shell entity: ShellShotgunImprovised diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml index 38d254c1416d..ae56ce944e46 100644 --- a/Resources/Prototypes/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml @@ -137,6 +137,34 @@ sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi state: icon +#ss220 handmade gun buff begin +- type: construction + name: makeshift laser pistol + id: WeaponMakeshiftLaser + graph: WeaponMakeshiftLaserGraph + startNode: start + targetNode: pistol + category: construction-category-weapons + objectType: Item + description: A shitty, single-shot shotgun made from salvaged and hand-crafted gun parts. Ammo not included. + icon: + sprite: Objects/Weapons/Guns/Battery/makeshift.rsi + state: icon + +- type: construction + name: Hand made pistol + id: WeaponShotgunHandmade + graph: WeaponShotgunHandmadeGraph + startNode: start + targetNode: HDpistol + category: construction-category-weapons + objectType: Item + description: A shitty, single-shot shotgun made from salvaged and hand-crafted gun parts. Ammo not included. + icon: + sprite: Objects/Weapons/Guns/Shotguns/hm_pistol.rsi + state: icon +#ss220 handmade gun buff end + - type: construction name: improvised shotgun shell id: ShellShotgunImprovised diff --git a/Resources/Prototypes/SS220/Recipes/Crafting/Graphs/improvised/handmade_shotgun.yml b/Resources/Prototypes/SS220/Recipes/Crafting/Graphs/improvised/handmade_shotgun.yml new file mode 100644 index 000000000000..61b7b9b3c7dd --- /dev/null +++ b/Resources/Prototypes/SS220/Recipes/Crafting/Graphs/improvised/handmade_shotgun.yml @@ -0,0 +1,26 @@ +- type: constructionGraph + id: WeaponShotgunHandmadeGraph + start: start + graph: + - node: start + edges: + - to: HDpistol + steps: + - tag: Pipe + icon: + sprite: Structures/Piping/Atmospherics/pipe.rsi + state: pipeStraight + name: pipe + - tag: RifleStock + icon: + sprite: Objects/Misc/rifle_stock.rsi + state: icon + name: rifle stock + - tag: WeaponFlareGun + icon: + sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi + state: icon + name: Flare Gun + doAfter: 25 + - node: HDpistol + entity: WeaponShotgunHandmade \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Recipes/Crafting/Graphs/improvised/makeshift_laser_pistol.yml b/Resources/Prototypes/SS220/Recipes/Crafting/Graphs/improvised/makeshift_laser_pistol.yml new file mode 100644 index 000000000000..89ca72710138 --- /dev/null +++ b/Resources/Prototypes/SS220/Recipes/Crafting/Graphs/improvised/makeshift_laser_pistol.yml @@ -0,0 +1,34 @@ +- type: constructionGraph + id: WeaponMakeshiftLaserGraph + start: start + graph: + - node: start + edges: + - to: pistol + steps: + - material: Steel + amount: 2 + doAfter: 5 + - material: Cable + amount: 5 + doAfter: 5 + - tag: CapacitorStockPart + name: capacitor + icon: + sprite: Objects/Misc/stock_parts.rsi + state: capacitor + doAfter: 5 + - tag: CapacitorStockPart + name: capacitor + icon: + sprite: Objects/Misc/stock_parts.rsi + state: capacitor + doAfter: 5 + - tag: PowerCellHigh + name: Power Cell High + icon: + sprite: Objects/Power/power_cells.rsi + state: high + doAfter: 5 + - node: pistol + entity: WeaponMakeshiftLaser \ No newline at end of file diff --git a/Resources/Prototypes/SS220/tags.yml b/Resources/Prototypes/SS220/tags.yml index f6ae420776e3..635a8c3785d4 100644 --- a/Resources/Prototypes/SS220/tags.yml +++ b/Resources/Prototypes/SS220/tags.yml @@ -78,3 +78,10 @@ - type: Tag id: Rapier + +# handmade gun buff +- type: Tag + id: PowerCellHigh + +- type: Tag + id: WeaponFlareGun \ No newline at end of file