]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Star Wars 14: Shuttle weapon update (#23644)
authorEd <96445749+TheShuEd@users.noreply.github.com>
Sun, 21 Jan 2024 08:58:40 +0000 (11:58 +0300)
committerGitHub <noreply@github.com>
Sun, 21 Jan 2024 08:58:40 +0000 (19:58 +1100)
commita2d5d74b46060d330e5aa14e166692f32dcce7a9
tree5bec2af0493590b926d95011d0b4725afb0d63f9
parent2cf77d3a5795d2fa308607f58cf952d92b0e7603
Star Wars 14: Shuttle weapon update (#23644)

* setup codebase

* make auto-fire, but its broken

* collider problem

* fix rate, add toggle port

* add laser

* power cages

* ginormous cells

* fix inhand

* add pirate cannon

* salvage gun

* functional Nuke cannon

* rewrite to standart grenade

* fix naming, add emp sprite

* grenade cartridge

* thruster fix

* nuke cannon

* audio + visual polish

* balance tweak

* tweaks

* laser balance tweak: new Electronic damage modifier set, reduce structural cannon damage

* resprite energy cages, start implementing in game

* fix cage recharger craft

* add small laser gun

* fix colliders

* add  lasers and ptk to research and crafting

* finish implementing weapon to rnd and sec

* some fixes

* splitted grenades and cannon balls

* integrate new cannon balls

* tweaks stick

* move circuits to sectechfab, fix

* fix?

* add ability to E shoot, without signals

* fix!

* fix?!?! and naming tweak

* go!

* Lank fix

* oh

* mornings don't start with coffee.

* the morning starts with bug fixes.

* fucking bugs!

* finally

* it is now possible to craft projectiles separately from cartridges

* +2 fix

* refactor

* piu

* More weight

* add AutoShootGunComponent

* move autoshoot to partial

* SetEnabled()

* some fixes

* remove CanShootWithoutUser field

* remove null-checks ToCoordinates from AttemptShoot()

* war without reason

* return to home

* ?

* forgot remove it

* review

* Fix formatting and update path

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
93 files changed:
Content.Server/DeviceLinking/Components/GunSignalControlComponent.cs [new file with mode: 0644]
Content.Server/DeviceLinking/Systems/GunSignalControlSystem.cs [new file with mode: 0644]
Content.Server/PneumaticCannon/PneumaticCannonSystem.cs
Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs [new file with mode: 0644]
Content.Server/Weapons/Ranged/Systems/GunSystem.cs
Content.Shared/Weapons/Ranged/Components/AutoShootGunComponent.cs [new file with mode: 0644]
Content.Shared/Weapons/Ranged/Components/GunComponent.cs
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.AutoFire.cs [new file with mode: 0644]
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
Resources/Locale/en-US/research/technologies.ftl
Resources/Prototypes/Damage/modifier_sets.yml
Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
Resources/Prototypes/Entities/Objects/Power/powercells.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Resources/Prototypes/Entities/Structures/Power/chargers.yml
Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
Resources/Prototypes/Recipes/Lathes/electronics.yml
Resources/Prototypes/Recipes/Lathes/powercells.yml
Resources/Prototypes/Recipes/Lathes/security.yml
Resources/Prototypes/Research/arsenal.yml
Resources/Prototypes/tags.yml
Resources/Textures/Objects/Power/power_cages.rsi/high.png [new file with mode: 0644]
Resources/Textures/Objects/Power/power_cages.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Power/power_cages.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Power/power_cages.rsi/medium.png [new file with mode: 0644]
Resources/Textures/Objects/Power/power_cages.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Power/power_cages.rsi/o1.png [new file with mode: 0644]
Resources/Textures/Objects/Power/power_cages.rsi/o2.png [new file with mode: 0644]
Resources/Textures/Objects/Power/power_cages.rsi/small.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/emp.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi/base.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi/mag-1.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi/mag-2.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi/mag-3.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi/mag-4.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/beam_heavy2.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_beam_heavy2.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_beam_heavy2.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/kinetic.rsi/mag-1.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/kinetic.rsi/mag-2.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/kinetic.rsi/mag-3.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/kinetic.rsi/mag-4.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/kinetic.rsi/mag-5.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/kinetic.rsi/mag-6.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/kinetic.rsi/mag-7.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/kinetic.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/kinetic.rsi/ptk-800.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/laser.rsi/lse-1200c.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/laser.rsi/lse-400c.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/laser.rsi/mag-unshaded-0.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/laser.rsi/mag-unshaded-1.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/laser.rsi/mag-unshaded-2.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/laser.rsi/mag-unshaded-3.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/laser.rsi/mag-unshaded-4.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/laser.rsi/mag-unshaded-5.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/laser.rsi/mag-unshaded-6.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/laser.rsi/mag-unshaded-7.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/laser.rsi/mag-unshaded-8.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/laser.rsi/mag-unshaded-9.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/laser.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/launcher.rsi/exp-2100g.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/launcher.rsi/exp-320g.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/launcher.rsi/mag-1.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/launcher.rsi/mag-2.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/launcher.rsi/mag-3.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/launcher.rsi/mag-4.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/launcher.rsi/mag-5.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/launcher.rsi/mag-6.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/launcher.rsi/mag-7.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/launcher.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/pirate_cannon.rsi/base.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shuttles/pirate_cannon.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Power/cage_recharger.rsi/empty.png [new file with mode: 0644]
Resources/Textures/Structures/Power/cage_recharger.rsi/full.png [new file with mode: 0644]
Resources/Textures/Structures/Power/cage_recharger.rsi/light-charged.png [new file with mode: 0644]
Resources/Textures/Structures/Power/cage_recharger.rsi/light-charging.png [new file with mode: 0644]
Resources/Textures/Structures/Power/cage_recharger.rsi/light-empty.png [new file with mode: 0644]
Resources/Textures/Structures/Power/cage_recharger.rsi/light-off.png [new file with mode: 0644]
Resources/Textures/Structures/Power/cage_recharger.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Power/cage_recharger.rsi/open.png [new file with mode: 0644]