Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
156 commits
Select commit Hold shift + click to select a range
159b209
weh
DogZeroX May 19, 2022
9739111
Merge branch 'space-wizards:master' into master
DogZeroX May 19, 2022
a1c6ef5
Eh
metalgearsloth May 20, 2022
3bd316b
Inputs which are much nicer
metalgearsloth May 20, 2022
aca7868
AAAAAAA
metalgearsloth May 20, 2022
d8f27c3
stuff
metalgearsloth May 21, 2022
c9dab75
re-fix
metalgearsloth May 21, 2022
4798f9f
gunz
ElectroJr May 21, 2022
207bda5
Merge branch 'space-wizards:master' into master
DogZeroX May 21, 2022
b869f2f
Merge pull request #4 from ElectroJr/gunz
metalgearsloth May 22, 2022
650ebe0
Firemode
metalgearsloth May 22, 2022
e3eca64
Selective fire
metalgearsloth May 22, 2022
6270d90
Select fire mode stuff
metalgearsloth May 22, 2022
5023999
Selector sound
metalgearsloth May 22, 2022
e054c2d
Selector popup
metalgearsloth May 22, 2022
54ada49
Bunch more work
May 22, 2022
cca1162
Merge branch 'space-wizards:master' into master
DogZeroX May 23, 2022
231528a
Revolvers working
metalgearsloth May 23, 2022
d0f268e
Organize and cull
DogZeroX May 23, 2022
b9773d9
Shoo deprecated spawners
DogZeroX May 23, 2022
6ad5a2e
Weeeewerererere
DogZeroX May 23, 2022
661b276
dork
metalgearsloth May 23, 2022
cbe033b
solve some yaml linter errors
DogZeroX May 23, 2022
8b3dd7f
moar
DogZeroX May 23, 2022
ea6a29e
susssy fix
DogZeroX May 23, 2022
f1baa60
aaaa
DogZeroX May 23, 2022
6c51086
A
metalgearsloth May 23, 2022
c1e10e4
Skub and fix construction
DogZeroX May 23, 2022
8159896
AAA
metalgearsloth May 23, 2022
468f744
Battery work
metalgearsloth May 23, 2022
a30acf3
Battery guns working
metalgearsloth May 24, 2022
041a6c2
Start hitscan
metalgearsloth May 24, 2022
fe4ddb5
Hitscan stuffsies
metalgearsloth May 24, 2022
7ef0dcd
Hitscan working
metalgearsloth May 24, 2022
3c194e2
Muzzle flashes working
metalgearsloth May 24, 2022
cff9a37
Fix dummy entities
metalgearsloth May 24, 2022
7d0ac1a
Ammo counter structure
metalgearsloth May 24, 2022
cef21ab
AmmoCounter
metalgearsloth May 25, 2022
cc274c4
Garbage shitcode prototype
metalgearsloth May 25, 2022
8e91b95
Battery visuals working
metalgearsloth May 25, 2022
13b82ed
Bunch of magazine logic
metalgearsloth May 25, 2022
f35830f
mlem
metalgearsloth May 25, 2022
0b117ff
appearance
metalgearsloth May 25, 2022
313bf2e
Ballistic fixes
metalgearsloth May 25, 2022
b7601e1
Manual cycle updates
metalgearsloth May 25, 2022
37eaa1d
No autocycle
metalgearsloth May 25, 2022
4b70dfe
firerate to fix shenanigans
metalgearsloth May 25, 2022
7e06106
Fixes
metalgearsloth May 26, 2022
5d296a4
Gun sounds
metalgearsloth May 26, 2022
08bd793
xray and effects cleanup
metalgearsloth May 26, 2022
17b54e5
also ignore
metalgearsloth May 26, 2022
cf7a06e
Merge remote-tracking branch 'upstream/master' into 2022-05-20_gun-re…
metalgearsloth May 26, 2022
74d08bc
Charger tweaks
metalgearsloth May 26, 2022
45acb84
Map stuff
metalgearsloth May 28, 2022
17475c9
Merge remote-tracking branch 'upstream/master' into Guns-Antibloat
metalgearsloth May 28, 2022
6419415
maps
metalgearsloth May 28, 2022
84e8b14
delete protos
metalgearsloth May 28, 2022
56d41eb
Merge branch 'Guns-Antibloat' into 2022-05-20_gun-refactor
metalgearsloth May 28, 2022
6ddc592
More rebalancing
metalgearsloth May 28, 2022
72e0812
saltern y
metalgearsloth May 28, 2022
be5c80b
Merge branch 'Guns-Antibloat' into 2022-05-20_gun-refactor
metalgearsloth May 28, 2022
46abcdb
aaaaaatlas
metalgearsloth May 28, 2022
1322c70
Merge branch 'Guns-Antibloat' into 2022-05-20_gun-refactor
metalgearsloth May 28, 2022
86f72dc
rebalance some more
metalgearsloth May 28, 2022
7b6422c
formatting
metalgearsloth May 28, 2022
db41c29
Snipers done
metalgearsloth May 28, 2022
fcfa321
shotguns done
metalgearsloth May 28, 2022
731949f
shotgun errors
metalgearsloth May 28, 2022
72edbaa
Gun sprite fixes
metalgearsloth May 28, 2022
eee7621
Cycling tweaks
metalgearsloth May 28, 2022
382783c
Shotgun spread
metalgearsloth May 28, 2022
070d45d
pulse fix
metalgearsloth May 28, 2022
3362ab5
fixies
metalgearsloth May 28, 2022
e5638e4
Revolver stuffsies
metalgearsloth May 28, 2022
576cbcd
AAAAAAAAAA
metalgearsloth May 28, 2022
75c8741
Merge branch 'Guns-Antibloat' into 2022-05-20_gun-refactor
metalgearsloth May 28, 2022
17a12ca
Revolver cleanup
metalgearsloth May 28, 2022
3789a18
Revolver ammo provider
metalgearsloth May 28, 2022
0ef1183
Fix revolver states
metalgearsloth May 28, 2022
e5f3912
a
metalgearsloth May 28, 2022
ccdf542
lame-ea
metalgearsloth May 28, 2022
2626328
clear containers
metalgearsloth May 28, 2022
c2abb5d
aaaaaaaaaaAAAAAAAAAAAAAAAAAAAAAAAAA
metalgearsloth May 28, 2022
d56a5d7
Merge branch 'Guns-Antibloat' into 2022-05-20_gun-refactor
metalgearsloth May 28, 2022
6b338c8
chamber work started
metalgearsloth May 29, 2022
a89a84d
Chamber code
metalgearsloth May 29, 2022
e363475
Merge remote-tracking branch 'upstream/master' into 2022-05-20_gun-re…
metalgearsloth May 29, 2022
4ca36d9
chamber mags
metalgearsloth May 29, 2022
c533348
More ammo count stuff for chambered
metalgearsloth May 29, 2022
5b34356
chamber guns
metalgearsloth May 29, 2022
98ed6f8
component cleanup
metalgearsloth May 29, 2022
d53adbf
bolt sprite changes
metalgearsloth May 29, 2022
3ea46eb
Sprite fixes
metalgearsloth May 29, 2022
1268169
pistols + smgs done
metalgearsloth May 29, 2022
07a217e
More prototype work
May 29, 2022
ce1a764
snoff snoff
May 29, 2022
84c4d27
System cleanup time
May 29, 2022
73249d9
AAAAAAAAAAAAAAAAAAAAAA DONT UPDATE MAPS
May 29, 2022
fe89bba
Significant texture removal
May 29, 2022
4015f10
b
May 29, 2022
3065f7f
delete garbage
May 29, 2022
b4cea93
fixies
metalgearsloth May 30, 2022
a132c41
A
metalgearsloth May 30, 2022
448a743
dork
metalgearsloth May 30, 2022
553df27
B
metalgearsloth May 30, 2022
f655668
speed_load deez nutz I guess
metalgearsloth May 30, 2022
5685f16
ingame again
metalgearsloth May 30, 2022
b4fbf62
fixies
metalgearsloth May 30, 2022
9873c7f
saul taurus
metalgearsloth May 30, 2022
7d003b9
typeserializer moment
metalgearsloth May 30, 2022
98dbcb4
tests work les fucking go
metalgearsloth May 30, 2022
b91abad
rsidiff plz
metalgearsloth May 30, 2022
ce187cd
Remove nasty ref and cleanup
metalgearsloth May 30, 2022
47c1d87
friction
metalgearsloth May 30, 2022
37002b5
a
metalgearsloth May 30, 2022
f1f58f8
Examines
metalgearsloth May 30, 2022
c2fd580
gus
metalgearsloth May 30, 2022
63911c1
recoil
metalgearsloth May 30, 2022
da5056e
Revolvers good enough
metalgearsloth May 30, 2022
982bb72
comment
metalgearsloth May 30, 2022
82464b9
a
metalgearsloth May 30, 2022
a8a6a7b
Merge remote-tracking branch 'upstream/master' into 2022-05-20_gun-re…
metalgearsloth May 30, 2022
d2f12c1
You bloody bastard
metalgearsloth May 30, 2022
7f97751
so many cooked containers
metalgearsloth May 30, 2022
9c49fdc
noh
metalgearsloth May 30, 2022
21f7915
minigun + cartridge deletion
metalgearsloth May 31, 2022
aa86f22
A tale of shotguns and revolvers
metalgearsloth May 31, 2022
53bde47
a
metalgearsloth May 31, 2022
822dd59
revolver cartridgtes and spin
metalgearsloth May 31, 2022
3b004dd
mandella effect
metalgearsloth May 31, 2022
3eeee82
Remove safety
metalgearsloth May 31, 2022
b783f7d
Fix flare
metalgearsloth May 31, 2022
fbe72a1
Throwing fix
metalgearsloth May 31, 2022
463943d
a
metalgearsloth May 31, 2022
ccf7a08
L6 fix
metalgearsloth May 31, 2022
894c8cc
cartridge whitelists
metalgearsloth May 31, 2022
8a344d2
values update
metalgearsloth May 31, 2022
a2e912d
a
metalgearsloth May 31, 2022
01f5bbc
a
metalgearsloth May 31, 2022
912b7f2
values
metalgearsloth May 31, 2022
a7baa0e
Localisation
metalgearsloth Jun 1, 2022
f5d4b1a
rebiews
metalgearsloth Jun 1, 2022
be45738
spent ammo ECS
metalgearsloth Jun 1, 2022
6283497
a
metalgearsloth Jun 1, 2022
0b3596a
a
metalgearsloth Jun 1, 2022
4308742
Merge branch 'master' into 2022-05-20_gun-refactor
metalgearsloth Jun 1, 2022
1d98c32
mergies
metalgearsloth Jun 1, 2022
d2f9dae
Update Content.Client/Weapons/Ranged/Systems/GunSystem.ChamberMagazin…
metalgearsloth Jun 1, 2022
e86c929
Update Content.Client/Weapons/Ranged/Systems/GunSystem.Magazine.cs
metalgearsloth Jun 1, 2022
fed1897
Update Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs
metalgearsloth Jun 1, 2022
d099361
Update Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs
metalgearsloth Jun 1, 2022
c5bebec
Update Content.Client/Weapons/Ranged/Components/MagVisualizer.cs
metalgearsloth Jun 1, 2022
b1f10f3
A
metalgearsloth Jun 1, 2022
819b593
effect distance
metalgearsloth Jun 1, 2022
c9c98af
ebents
metalgearsloth Jun 1, 2022
2af2ed0
ass
metalgearsloth Jun 1, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion Content.Client/Content.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
</ItemGroup>

<Import Project="..\RobustToolbox\MSBuild\XamlIL.targets" />
<Import Project="..\RobustToolbox\MSBuild\Robust.Analyzers.targets" />
</Project>
17 changes: 17 additions & 0 deletions Content.Client/Effects/EffectVisualizerSystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using Robust.Client.Animations;
using Robust.Client.GameObjects;

namespace Content.Client.Effects;

public sealed class EffectVisualizerSystem : EntitySystem
{
public override void Initialize()
{
SubscribeLocalEvent<EffectVisualsComponent, AnimationCompletedEvent>(OnEffectAnimComplete);
}

private void OnEffectAnimComplete(EntityUid uid, EffectVisualsComponent component, AnimationCompletedEvent args)
{
QueueDel(uid);
}
}
8 changes: 8 additions & 0 deletions Content.Client/Effects/EffectVisualsComponent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace Content.Client.Effects;

[RegisterComponent]
public sealed class EffectVisualsComponent : Component
{
public float Length;
public float Accumulator = 0f;
}
5 changes: 1 addition & 4 deletions Content.Client/Items/ItemStatusMessages.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using Robust.Client.UserInterface;
using Robust.Shared.GameObjects;
using Robust.Client.UserInterface;

namespace Content.Client.Items
{
Expand Down

This file was deleted.

This file was deleted.

Loading