a4fd13ae70
Fix current test fails
2024-02-08 13:05:23 +01:00
ac052e4666
Revert "Make flare gun explode, damage and stun the player when used … ( #24679 )
...
* Revert "Make flare gun explode, damage and stun the player when used with the wrong ammo (#22349 )"
This reverts commit e301378114b245fa6927372f83c19868cb90b13c.
# Conflicts:
# Content.Shared/Weapons/Ranged/Components/GunComponent.cs
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
* Fix revert conflicts
* Update Content.Shared/Weapons/Ranged/Components/GunComponent.cs
(cherry picked from commit e1901aa6b602516f0f7cc3f29844c77e90c77977)
2024-02-08 11:52:32 +01:00
823d9dd892
BatteryWeaponFireModes refactor ( #24502 )
...
* BatteryWeaponFireModes refactor
Made the code a bit better but still needs integrating into attachments.
* murder
* Fix serialization
* weh
* weh
(cherry picked from commit 58b55ba06c5de031079915a607ccf3adad781f93)
2024-02-08 11:52:31 +01:00
5329280378
Add events for GunComponent values, muzzle flashes and cartridge spread ( #24077 )
...
* Add a modifier event for GunComponent values
* Add docs
* Add VV readwrite to modified values
* Add more docs
* More docs
* Add Gun parameter to GunRefreshModifiersEvent
* Add another event for handling cartridge spread
* Fix pneumatic speed
(cherry picked from commit 4e8b1fb0d3ef23c79ea3ca0cec05932de03601f5)
2024-02-08 11:52:29 +01:00
145c2158ca
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>
(cherry picked from commit a2d5d74b46060d330e5aa14e166692f32dcce7a9)
2024-01-27 23:40:06 +01:00
7a8c81f71d
Grappling fixes ( #23709 )
...
(cherry picked from commit c9b700a2d4ea7e25cfa014bf83720258bb43cae9)
2024-01-26 22:10:57 +01:00
a908b24ba1
Make flare gun explode, damage and stun the player when used with the wrong ammo ( #22349 )
...
* Flare gun can now only be loaded with actual flares
* Make flare gun loadable with other shells, but destroy it and damage and stun the user when used
* tweak
* Logic fix + QOL add-ons
* damageOnWrongAmmo in gun component
* cleanup
2023-12-16 20:30:33 +01:00
b1ee2d48ff
Unrevert audio ( #21330 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-12-02 20:16:36 +01:00
33537f03eb
Make more fields VV-writeable ( #21754 )
2023-11-19 22:23:30 +01:00
fd2cc8570d
Sync master up to 1/10 ( #74 )
...
* Automatic changelog update
* Make NPC names proper nouns & fix some genders (#20534 )
* Proper names & genders
* Uppercase proper names
* Make Smile female
* fix bingus wrinkly head (#20531 )
* rouny meat and steak (#20526 )
* lost friendship flavor
* add rouny steak
* rouny special meat
* rouny meat textures
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Automatic changelog update
* Wearable Wet Floor Sign and 'Janitorial Suicide Vest' (#20311 )
* Explosive wet floor sign & janitorial suicide vest
* fix attributions
* Remove name & desc from explosive wet floor sign
* Make wet floor sign chameleonable
* Automatic changelog update
* Minor slippery stuff (#20535 )
* Update submodule to 162.2.0 (#20570 )
* Predicted armor (#20560 )
* clean up some lines in smile the slime prototype (#20552 )
* Revert "Use full file path for temp replays (#19002 )" (#20545 )
* Add EyesGlasses into ClothesMate (#20523 )
* Automatic changelog update
* Fix Punpun crew monitor sensor (#20484 )
* Automatic changelog update
* EasyPry airlocks for arrivals. Now also prying refactor I guess (#19394 )
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Automatic changelog update
* Make arcades hackable again (#20555 )
* Automatic changelog update
* Health alert tweaks (#20557 )
* Automatic changelog update
* Add active and ended game rule components, generic TryRoundStartAttempt and minPlayers field (#20564 )
* Improve active game rule querying, add generic try round start attempt method, move minPlayers to GameRuleComponent
* Nukeops todo and cleanup
* Remove Active field
* Add EndedGameRuleComponent
* bartender suit (#20521 )
* give me a drink bartender
* guh
* aARG
* Necropolis and mine walls (#20578 )
* Automatic changelog update
* archaic accent tweaks (#20567 )
* Automatic changelog update
* Add confirmation to kick and respawn in the admin player actions panel (#20542 )
* Remove windows-latest CI runs, remove unused build-test-release.yml (#20540 )
* Change .editorconfig to keep existing attribute arrangement (#20538 )
* Automatic changelog update
* Catch replay start and end errors on round restarts (#20565 )
* Update trivial components to use auto comp states (#20539 )
* Fix role unbans not applying in real time (#20547 )
* Disable AHelp buttons when no player is selected, update button styling (#20568 )
* Automatic changelog update
* Added a toggle fullscreen button (default F11) (#20272 )
* Added a toggle fullscreen button (default F11)
* Removed un-needed comments
* Review Requested Changes
* Fixed Acidental Spacing Change
* bwoink, removed extraneous code
* nothing, litterally
* Automatic changelog update
* Fix not networking markings (#20588 )
* Automatic changelog update
* Update RobustToolbox to v162.2.1 (#20590 )
* Automatic changelog update
* Glorfcode (force say on damage/stun/crit) (#20562 )
* Automatic changelog update
* Fix AHelp progressively showing more AHelp panels (#20591 )
* Automatic changelog update
* caninsert entitystorage tweaks (#20589 )
* Automatic changelog update
* Fix mapping actions crashing on load (#20592 )
* Fix loading a map with a ThirstComponent crashing the game (#20594 )
* Fix electrocution displaying real name of disguised players (#20603 )
* Organ fixes (#20488 )
* Automatic changelog update
* Kettle medical rework (#20435 )
* Initial try at medical rework for kettle
* Re-add decal decorations to Kettle's medical
* Add more lockers to kettle's med
* Actually upload kettle's map, not its proto
* Automatic changelog update
* Added blocked visuals to volumetric pump (#20610 )
* Automatic changelog update
* Move TimedDespawn to engine (#20515 )
* Update submodule to 163.0.0 (#20616 )
* Remove v0.1 version number from local main menu screen (#20617 )
* Remove cloneData parameter from AutoNetworkedField (#20596 )
* Update submodule to 164.0.0 (#20618 )
* fix cognizine ghost role (#20632 )
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Automatic changelog update
* Move ID layer one pixel to correct alignment (#20630 )
* Update nukie hardsuit descriptions (#20529 )
* Make holofans destructable (#20445 )
* Automatic changelog update
* bowl is open (#20453 )
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Add TestPair.WaitCommand() (#20615 )
* Rename ThreatPrototype and mark fields as required (#20611 )
* Adjust hard bomb shape (#20608 )
* dragon refactor, objectives and use GenericAntag (#20201 )
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Automatic changelog update
* Added generic empty liquids tank (#20563 )
* Move view variables verb to the top of the list with no category and localize it (#20546 )
* saltern update (#20325 )
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Fix followers leaking (#20643 )
* Add Winter Boots (#20622 )
* add
* fix prototype
* Add QM mantle (#20621 )
* add
* fix prototype
* Automatic changelog update
* Slime mobs breathe nitrogen and resprite their organs (#20577 )
* Slimes breathe nitrogen and resprite their organs
* ups
* mmm
* Automatic changelog update
* Fix the new lizard horn's consistency + issue (#20620 )
* fix
* add
* Revert "add"
This reverts commit a054a3204a8f185a94ceb80b1bd3bc9f30423711.
* Add RandomHumanoidAppearance component to for space ninjas (#20605 )
* Automatic changelog update
* Space cat breathes space (#20550 )
* Space cat breathes space
Made Space Cat lungs ROBUST
* Made Space Cat's lungs ROBUST 2.0
* Automatic changelog update
* Wide anomaly locator (#20581 )
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
* add textures
* fix encoding
* fix 2
* Automatic changelog update
* Fixed Telescopic Shield Lighting (#20650 )
* Fixed Telescopic Shield Lighting Bug fix #20199
* no need for these at all
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Automatic changelog update
* Add a special hardsuit for nukie medic (#20471 )
* Automatic changelog update
* Carry over other mutations when doing species mutation (#20551 )
* Automatic changelog update
* Add Spanish accent to poncho and sombrero (#20377 )
---------
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: LEVELcat <68501903+LEVELcat@users.noreply.github.com>
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Doru991 <75124791+Doru991@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Skarletto <122584947+Skarletto@users.noreply.github.com>
Co-authored-by: NULL882 <104377798+NULL882@users.noreply.github.com>
Co-authored-by: lunarcomets <140772713+lunarcomets@users.noreply.github.com>
Co-authored-by: Miro Kavaliou <miraslauk@gmail.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: Kacper Urbańczyk <kacperjaroslawurbanczyk@gmail.com>
Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
Co-authored-by: daerSeebaer <61566539+daerSeebaer@users.noreply.github.com>
Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
Co-authored-by: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com>
Co-authored-by: Kacper Urbańczyk <mikrel071204@gmail.com>
Co-authored-by: Tox Cruize <141375638+TexCruize@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Michael Cu <43478115+michaelcu@users.noreply.github.com>
2023-10-03 14:15:46 -05:00
99cb2627bd
multi-gun nerf ( #20194 )
2023-09-27 21:59:12 +02:00
c9648da984
Content update for NetEntities ( #18935 )
2023-09-27 21:59:12 +02:00
c71f97e3a2
Refactor actions to be entities with components ( #19900 )
2023-09-08 18:16:05 -07:00
5ead3d5108
magazine fill repeating doafter ( #19780 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-03 21:49:49 -07:00
bc00a635b9
Makes Plant-B-Gone available to cargo, and Diona vulnerable. ( #19555 )
...
* Adds WeekKiller storage tanks and allows Cargo to purchase them.
* Delete CellMemberRoll.cs
Woops, this template file snuck in after I reset my local. It doesn't do anything, just empty classes.
* Switched from WeedKiller to PlantBeGone because WeedKiller is too deadly. Honestly is probably shouldn't be in Botany so readily.
Made Diona take damage from PlantBeGone and WeedKiller.
Adjusted waterguns to use less reagent per shot.
Added admeme watergun.
Adjusted watergun cargo crate.
* Fixing small .yml formatting hiccups.
* Fixing small .yml formatting.
* Fix Typo.
* watergun min solution match shot size
Makes watergun's minimum solution transfer match shot size (5u).
* I pass tests now, please?
Nothing.
* Lower Diona herbicide damages
Remove slime changes
Lower super water blaster size to 500u (100 shots)
2023-09-01 22:32:08 -07:00
3ab346f471
Remove Ammo component references ( #19537 )
2023-08-31 14:33:28 -07:00
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
8acac895fc
(Re)Adds open bolt animations for gun sprites ( #17219 )
...
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-08-13 15:58:07 +10:00
657d15751b
Disposable turret balance changes ( #18155 )
...
* tweaked stats
* change comment
2023-07-19 20:16:09 -06:00
580d481710
Make clumsy entities able to shoot funny weapons ( #18156 )
...
* Make clumsy entities able to shoot funny weapons
* remove unneeded line
2023-07-19 15:22:07 -06:00
6537e683b0
Make PKA require wielding ( #16638 )
2023-06-01 12:27:19 +10:00
552fbb0585
Adds grappling gun ( #16662 )
2023-05-27 14:15:15 +10:00
347dcfbeb5
Add reflection for crystals ( #16426 )
2023-05-15 15:21:05 +10:00
6417bb4fa0
Proto-kinetic crusher ( #16277 )
...
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
2023-05-14 13:15:18 +10:00
84e1b6f695
Gun + PKA fixes ( #16244 )
2023-05-08 22:37:40 +10:00
98481fb9a2
Spray Nozzle & Backpack Water Tank ( #16133 )
2023-05-06 11:50:09 +10:00
2564ff8918
Tweaks to ContainerAmmoProvider ( #15945 )
2023-04-30 20:49:26 +10:00
47262a6998
Gun auto state handlers ( #15186 )
...
* battery auto state
* basic entity autostate
* ballistic autostate
* flyby
* cartridge ammo
* gun
* Revert "battery auto state"
This reverts commit 35b7d62f303fddb0edd9eb7a922e3c26b7a5f7fb.
* silly
2023-04-13 18:08:56 -07:00
7575c0944b
Allow direct transfer between specific BallisticAmmoProviders. ( #12964 )
2023-01-20 08:08:17 -08:00
7253592126
Gunify pneumatic cannon ( #13296 )
2023-01-16 08:56:09 -08:00
678c612833
Bump projectile speed ( #13387 )
2023-01-10 04:31:26 -08:00
a66790f158
fix emitter examining ( #13369 )
2023-01-10 22:48:05 +11:00
6908f27cd1
Use time offsets for gun and melee ( #13041 )
...
Doesn't stop the pickup serialization.
2022-12-15 15:35:08 -06:00
b4688bc682
Revolver fixes ( #12697 )
2022-12-06 15:38:10 -08:00
7fbc2608e8
Remove redundant read-only VV from datafields ( #12626 )
2022-11-16 20:22:11 +01:00
b627b2b34d
Fly-by sound tweaks ( #10658 )
2022-08-17 19:32:39 -07:00
3f74141c93
Makes projectile speed configurable in gun system ( #10535 )
2022-08-12 12:49:46 +10:00
c7ad6b709e
Audio System Rejig ( #9635 )
2022-07-29 12:13:12 +10:00
ad7889e8a9
Magic staves + wands ( #9070 )
2022-07-14 19:45:27 -07:00
cd4b7bd85c
Muzzle flash enhancements ( #9527 )
2022-07-14 23:03:48 +10:00
e06cabecbb
Gun spread overlay ( #8588 )
2022-06-04 14:19:14 +10:00
49dfa9034a
Shotgun nerfs ( #8590 )
...
- Bojevic firerate dropped from 3 to 2
- Pellet damage from 13 to 8 (3 shotting players instead of 2 shot)
- Slightly more spread in line with the design doc. Slug spread I made as accurate as an SMG (so not quite full-screen mob hits but pretty close).
2022-06-03 00:57:39 -07:00
e74dfd7826
Hotfix revolver serialization ( #8561 )
...
* Hotfix revolver serialization
* a
2022-06-03 10:38:21 +10:00
227a86f494
Re-implement hitscan sounds ( #8581 )
...
I forgor. Also added RW to ballistic prototype for funsies.
2022-06-02 12:01:50 +10:00
fb943a61dc
Gun refactor ( #8301 )
...
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: T-Stalker <le0nel_1van@hotmail.com>
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-06-01 19:59:58 +10:00
bc68ac96dd
Cleanup the namespaces ( #8132 )
2022-05-13 17:59:03 +10:00
17db0775c8
Auto comp ( #6416 )
2022-02-02 14:35:40 +11:00
b5724feb27
ECS guns ( #6229 )
...
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2022-01-30 17:39:46 +11:00
c67160ae19
Disable warnings that would be refactored anyway ( #5047 )
2021-10-27 18:10:40 +02:00
b7dc3c81ae
Remove redundant #nullable enable ( #4275 )
2021-07-16 17:37:09 -07:00
Debug
metalgearsloth
DrSmugleaf
Ed
Nemanja
MendaxxDev
LordEclipse
deltanedas
IProduceWidgets
TaralGit
Arendian
AJCM-git
Kara
Vordenburg
Leon Friedrich
wrexbe
Visne