metalgearsloth
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
metalgearsloth
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
DrSmugleaf
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
Dakamakat
1afa84e323
Use can attach check on shot attempt ( #24396 )
...
refactor(SharedGunSystem): use can attach check on shot attempt
(cherry picked from commit 7b2e382929204d4fa39ff599c3365c1b237de2e9)
2024-01-27 23:46:42 +01:00
metalgearsloth
69d6935846
Bunch of revolver fixes ( #19649 )
...
* Bunch of revolver fixes
Some stuff wasn't working with prediction so this should fix all of it.
* a
* fix weh
* Also usedelay
(cherry picked from commit 9bb2781bfca68bde47ce52576cb894bb41ab6511)
2024-01-27 23:40:28 +01:00
Ed
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
metalgearsloth
e9bb444936
Fix gun bolt crash ( #24283 )
...
Deleting non-predicted entities moment.
(cherry picked from commit b535909a4983919b4764c72f7409d881cea02ae8)
2024-01-26 23:10:00 +01:00
keronshb
0c8d256d71
Moves ShootProjectile to shared ( #24007 )
...
(cherry picked from commit 2375a6cd1d2edfe6692c4a0ad388d2a3f5a3ce01)
2024-01-26 22:34:26 +01:00
metalgearsloth
a6a7514b0d
Fix gun cursor popup spam ( #23732 )
...
(cherry picked from commit cce9bde4cdcce6cfaa22f0bcb1ed1507cfd328fb)
2024-01-26 22:12:07 +01:00
I.K
11497a9d03
Improve visibility of gun bolts ( #23711 )
...
* add overlay
* ??????
(cherry picked from commit dc994f9c66f13f8195b7938f849003dc5b37464d)
2024-01-26 22:11:55 +01:00
Nemanja
7a8c81f71d
Grappling fixes ( #23709 )
...
(cherry picked from commit c9b700a2d4ea7e25cfa014bf83720258bb43cae9)
2024-01-26 22:10:57 +01:00
Kara
03b3e36d43
Examine prediction ( #23565 )
...
* Initial prediction
* new group handling
* groups for all examines that use multiple rn
* compile
* why was it doing this??
* handle newlines with sorting properly
(cherry picked from commit 0ae3858b69b695697ea9300609460f8ddb70ebbf)
2024-01-26 21:48:02 +01:00
AJCM-git
6b7e8b4f5b
UseDelay + ItemCooldown merge ( #22502 )
...
(cherry picked from commit 9c522c8b19f7a6f6b396c66342413572a22d7845)
2024-01-26 21:32:09 +01:00
TemporalOroboros
aebae6fab7
Content ecs containers ( #22484 )
...
(cherry picked from commit 7a77d6d5dd73a34be238fdebc284da5bc2917c67)
2024-01-22 18:47:55 +01:00
themias
10e71dd08e
Fix spray nozzle ( #22624 )
...
* Fix spray nozzle
* what
* no
2023-12-22 22:45:36 +01:00
MendaxxDev
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
themias
c320b23966
Fix spray nozzle ( #22492 )
2023-12-16 20:19:57 +01:00
Leon Friedrich
485d658bd1
Inventory slot enumerator rejig ( #21788 )
2023-12-16 19:30:03 +01:00
Bakke
a29c36d9bc
Prevent shooting while inside a duffelbag ( #510 )
...
Anyone shoved into a duffelbag gets an ItemComponent. This denies anyone
with an ItemComponent from shooting a gun.
2023-12-06 16:54:05 +01:00
metalgearsloth
b1ee2d48ff
Unrevert audio ( #21330 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com >
2023-12-02 20:16:36 +01:00
metalgearsloth
52104a45c1
Revert Arch testmerge 2 ( #21901 )
2023-12-02 19:05:12 +01:00
metalgearsloth
39ad6db5c3
Update submodule to 182.1.0 ( #21900 )
2023-12-02 19:05:11 +01:00
metalgearsloth
9741d9916c
Revert the other arch changes ( #21871 )
2023-12-02 19:05:11 +01:00
metalgearsloth
333096b19e
Content arch ( #20107 )
...
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com >
2023-12-02 19:04:08 +01:00
LordEclipse
33537f03eb
Make more fields VV-writeable ( #21754 )
2023-11-19 22:23:30 +01:00
DrSmugleaf
4257bd2c7e
Make all prototype types partial ( #21374 )
2023-11-12 20:29:57 +01:00
deltanedas
075d7bf393
Play sound when filling ammo ( #20691 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-08 19:53:54 +02:00
Debug
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
Nemanja
99cb2627bd
multi-gun nerf ( #20194 )
2023-09-27 21:59:12 +02:00
deltanedas
b8eb5f3acd
fix ninja no guns ( #20184 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-27 21:59:12 +02:00
metalgearsloth
c9648da984
Content update for NetEntities ( #18935 )
2023-09-27 21:59:12 +02:00
DrSmugleaf
c71f97e3a2
Refactor actions to be entities with components ( #19900 )
2023-09-08 18:16:05 -07:00
deltanedas
5ead3d5108
magazine fill repeating doafter ( #19780 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-03 21:49:49 -07:00
IProduceWidgets
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
metalgearsloth
3ab346f471
Remove Ammo component references ( #19537 )
2023-08-31 14:33:28 -07:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
Errant
cf68d38aaf
Dead mobs can no longer shoot guns ( #19020 )
...
* dead shooting hotfix
* dead shooting hotfix weh
* AttemptShoot check
* actionblocker check
---------
Co-authored-by: Errant <35878406+errant@users.noreply.github.com >
2023-08-21 14:27:08 -04:00
metalgearsloth
d7abbab082
Add gatherable break sounds ( #19360 )
2023-08-20 14:05:43 -07:00
Errant
70422845e2
Gun bolt fixes and QoL ( #19349 )
...
Co-authored-by: Errant <35878406+errant@users.noreply.github.com >
2023-08-20 21:42:36 +10:00
Volodius
59cdcd0fe3
Closing bolt no longer removes cartridge ( #19251 )
2023-08-20 21:32:19 +10:00
metalgearsloth
3fc81bca40
Fix bolt-less gun cycling ( #19051 )
...
Oop.
2023-08-13 01:07:59 -06:00
TaralGit
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
metalgearsloth
a5ed3af5b1
Gun cleanup ( #18682 )
2023-08-05 12:49:27 +10:00
metalgearsloth
868f3298e5
Xeno spitter fixes ( #18573 )
...
* Xeno spitter fixes
- Require hands for pickup compounds
- Ranged combat can force movement to ignore LOS checks if ranged wants better LOS.
* Also spirates
IDK how this worked before but TryGetGun shouldn't care about combatmode.
* 1 more
2023-08-02 15:34:54 -06:00
metalgearsloth
c31c848afd
Shooting NPCs and more ( #18042 )
...
* Add pirate shooting
* Shooting working
* Basics working
* Refactor time
* More conversion
* Update primitives
* Update yml
* weh
* Building again
* Draft
* weh
* b
* Start shutdown
* Starting to take form
* Code side done
* is it worky
* Fix prototypes
* stuff
* Shitty working
* Juke events working
* Even more cleanup
* RTX
* Fix interaction combat mode and compquery
* GetAmmoCount relays
* Fix rotation speed
* Juke fixes
* fixes
* weh
* The collision avoidance never ends
* Fixes
* Pause support
* framework
* lazy
* Fix idling
* Fix drip
* goobed
* Fix takeover shutdown bug
* Merge fixes
* shitter
* Fix carpos
2023-08-01 19:48:56 -05:00
Arendian
4cd70b241c
Disposable turret explodes when empty ( #18175 )
...
* turret go boom
* fix ammo
* universal function name
* Also explodes when destroyed
* comment added
* Triggerwhenemptycomponent added
* comment adjusted
* Updated uplink description
* Moved to own event file
* file namespace
* rerun tests
---------
Co-authored-by: Slava0135 <super.novalskiy_0135@inbox.ru >
2023-08-01 15:38:22 -04:00
Arendian
2c5f202dca
Eject casings some distance from the gun ( #18081 )
...
Makes bullet casings launch a bit away from you when shooting a gun. Cycling still drops it at your feet.
---------
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com >
2023-07-29 14:07:31 -07:00
metalgearsloth
d2123964a1
Truncate gun firerates ( #18413 )
...
screenshots-and-videos is the new bug channel.
2023-07-29 00:09:43 -06:00
metalgearsloth
e755509fc7
More miscellaneous compiler warning fixes ( #18228 )
2023-07-23 16:03:57 +10:00
Arendian
657d15751b
Disposable turret balance changes ( #18155 )
...
* tweaked stats
* change comment
2023-07-19 20:16:09 -06:00
