Vigers Ray
|
ed0a30bb64
|
Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
# Content.Client/Weapons/Ranged/Systems/GunSystem.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Entry/EntryPoint.cs
# Content.Server/Ghost/GhostSystem.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
# Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/Follower/FollowerSystem.cs
# Resources/Locale/en-US/_strings/actions/actions/dna-scrambler.ftl
# Resources/Locale/en-US/_strings/administration/commands/change-cvar-command.ftl
# Resources/Locale/en-US/discord/vote-notifications.ftl
# Resources/Prototypes/Catalog/Fills/Crates/armory.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/Voice/speech_emotes.yml
|
2025-02-19 13:16:37 +03:00 |
|
slarticodefast
|
d171057680
|
UseInHandEvent cleanup (#35231)
|
2025-02-18 23:27:30 +11:00 |
|
Vigers Ray
|
67a1903332
|
Смена клавиши для взаимодействия с затвором и магазинами
|
2024-12-07 07:40:41 +03:00 |
|
geraeumig
|
ab8b3ecec2
|
Fix magazine sprites after Auto Eject (#28859)
Co-authored-by: geraeumig <alfenos@proton.me>
|
2024-06-12 22:23:15 -04:00 |
|
DrSmugleaf
|
13cef85a6e
|
Fix rockets and lasers looking like they have nothing loaded (#26933)
|
2024-04-14 13:17:17 +10: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
|
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 |
|
metalgearsloth
|
330bb7bb14
|
Remove gun .Owners (#14585)
|
2023-03-11 20:08:22 +11:00 |
|
Scribbles0
|
058e2e2b56
|
Revolver Tweaks and Det Buff (#13725)
* revolver changes and det yml
* remove ammo box
* remove comma
* other ammo providers change
|
2023-01-26 12:15:20 -06:00 |
|
metalgearsloth
|
007b079330
|
Fix some comp dirty / appearance warnings (#13193)
* Fix some comp dirty / appearance warnings
* also dis
|
2022-12-27 17:58:53 +01:00 |
|
metalgearsloth
|
f38bef562c
|
Fix gun ItemStatus (#12225)
|
2022-10-26 07:46:13 -07:00 |
|
Leon Friedrich
|
581a805063
|
Replace ItemSlotChangedEvent with EntInsertedIntoContainerMessage (#11934)
|
2022-10-15 13:03:37 -07:00 |
|
metalgearsloth
|
600c0e3255
|
Fix a few warnings (#11576)
|
2022-10-04 14:24:19 +11:00 |
|
metalgearsloth
|
5cdec951c7
|
Only show gun examines in detail range (#10697)
The most important 2 are fire mode and how much ammo is left.
|
2022-08-23 09:04:50 -05:00 |
|
metalgearsloth
|
4901201b2d
|
Change gun activates to uses (#10699)
|
2022-08-19 19:15:53 -07:00 |
|
Kara
|
ad7889e8a9
|
Magic staves + wands (#9070)
|
2022-07-14 19:45:27 -07:00 |
|
metalgearsloth
|
7f984792a1
|
Cleanup gun containers (probably last time) (#8575)
- snake_case instead of kebab-case
- Remove old MagazineBarrel containers
- Remove old event
|
2022-06-02 00:37:55 +10:00 |
|
metalgearsloth
|
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 |
|