Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ReBELL ACT II : BRUTALITÄT #1056

Open
wants to merge 88 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
6dc8cb8
rewrite part 1
MightBeNotReal Dec 7, 2024
f080104
part 2
MightBeNotReal Dec 17, 2024
edcdc75
pain pain pain (part 3)
MightBeNotReal Dec 22, 2024
cbc9b80
prototypes
MightBeNotReal Dec 24, 2024
2024338
fixes I believe
MightBeNotReal Dec 25, 2024
51ac4ca
m
MightBeNotReal Dec 25, 2024
546231e
sfasfas
MightBeNotReal Dec 25, 2024
2275520
holy fuck I hate prototypes
MightBeNotReal Dec 25, 2024
11bd9a0
biological reproduction update
MightBeNotReal Dec 26, 2024
c2cab1e
mimimi 2
MightBeNotReal Dec 29, 2024
56edd42
fix: wound visuals layer
Spatison Dec 31, 2024
c0db602
Funny code
MightBeNotReal Jan 1, 2025
042853d
fixs
Spatison Jan 2, 2025
06b1226
chest and groin
Spatison Jan 2, 2025
4e6a276
trauma, pain and other stuff done (I can finally get some sleep)
MightBeNotReal Jan 2, 2025
f24dc55
woundable balancing stuff and trauma base, thresholds for pain later
MightBeNotReal Jan 3, 2025
f90d93e
fxs
MightBeNotReal Jan 5, 2025
6606109
fixes part 2
MightBeNotReal Jan 6, 2025
5d3c3be
fixes and visualiser stuff
MightBeNotReal Jan 7, 2025
2f3fa93
sasda
MightBeNotReal Jan 8, 2025
959b0f2
launch fix
kurokoTurbo Jan 21, 2025
fb38018
correct? component
kurokoTurbo Jan 21, 2025
c5cfea3
Merge pull request #1 from MightBeNotReal/consciousness
MightBeNotReal Jan 21, 2025
d30ce13
cool armor update
MightBeNotReal Jan 23, 2025
8a6bc84
quick armor fix
MightBeNotReal Jan 24, 2025
d2e3a4b
it works I guess
MightBeNotReal Jan 26, 2025
57a4e49
sfasfsa
MightBeNotReal Feb 2, 2025
0347413
fsafsa
MightBeNotReal Feb 4, 2025
6006771
more trauma backend, trauma balance, bleeds rework. yeah
MightBeNotReal Feb 7, 2025
1226806
A lot of backend stuff, bug fixes and other shi before I work on effects
MightBeNotReal Feb 9, 2025
0961bf8
cool stuff
MightBeNotReal Feb 10, 2025
43b79d0
some fixs
Spatison Feb 10, 2025
7ad190a
Bleeds rework done, Woundable Visuals stuff and also bodypartappearan…
MightBeNotReal Feb 13, 2025
700e06e
effects; part 1
MightBeNotReal Feb 13, 2025
95f7b81
backend and pain tweaks
MightBeNotReal Feb 13, 2025
097f9d9
fixes, test fixes and other backend shi
MightBeNotReal Feb 14, 2025
a09467e
yummer
MightBeNotReal Feb 14, 2025
29ef914
HOLYSHIT
trest100 Feb 16, 2025
9fe7b5c
shluhi
trest100 Feb 16, 2025
b33e402
extended
trest100 Feb 16, 2025
796a213
stuff
MightBeNotReal Feb 16, 2025
47bb5a7
Merge branch 'master' into pr/1056
Roudenn Feb 16, 2025
339be70
fix trest shit
Roudenn Feb 16, 2025
b51519a
A LOOOOOT of bug fixes. and balance
MightBeNotReal Feb 16, 2025
cc46d03
Merge branch 'woundingport' of https://github.com/MightBeNotReal/spac…
MightBeNotReal Feb 16, 2025
bbcda50
ALMOST fix YAML linter
Roudenn Feb 17, 2025
0e57382
Fix fox sprites
Roudenn Feb 17, 2025
d25912e
RAAAGH
Roudenn Feb 17, 2025
526d15f
RAAAAAAAAAAAAGH!!!!!!!!!!!!!!!!!!!!!!!!!
Roudenn Feb 17, 2025
87db87f
backend stuff on pain and other things I did
MightBeNotReal Feb 17, 2025
d5bc0df
Update RobustToolbox
MightBeNotReal Feb 17, 2025
5a1c781
stuff
MightBeNotReal Feb 17, 2025
9459215
Revert "Update RobustToolbox"
MightBeNotReal Feb 17, 2025
765c1be
funny
MightBeNotReal Feb 18, 2025
3042dd0
more stuff!!!!!!!!
MightBeNotReal Feb 18, 2025
4d128a8
Merge branch 'master' into pr/1056
Roudenn Feb 20, 2025
cacaa84
Merge branch 'woundingport' of https://github.com/MightBeNotReal/spac…
Roudenn Feb 20, 2025
e6f2342
minimal changes I did before passing out
MightBeNotReal Feb 20, 2025
5ea9c85
I lied
MightBeNotReal Feb 20, 2025
453e542
cool code
MightBeNotReal Feb 21, 2025
03184d6
Merge branch 'master' into pr/1056
Roudenn Feb 21, 2025
1abe000
fix
Roudenn Feb 21, 2025
6fd6c80
important stuff
MightBeNotReal Feb 22, 2025
850b73a
Merge branch 'woundingport' of https://github.com/MightBeNotReal/spac…
MightBeNotReal Feb 22, 2025
e068d83
Do not question
MightBeNotReal Feb 22, 2025
e30adfb
stuff for healing
MightBeNotReal Feb 22, 2025
d14f4c3
fix equipment not falling out
MightBeNotReal Feb 22, 2025
039c20b
whoops
MightBeNotReal Feb 22, 2025
171c329
tourniquets are real!
MightBeNotReal Feb 23, 2025
aee5005
Merge remote-tracking branch 'upstream/master' into woundingport
trest100 Feb 23, 2025
c02d84b
locale quick fix
MightBeNotReal Feb 24, 2025
5dd1028
Fix
Spatison Feb 24, 2025
5b58d1c
Fix map
trest100 Feb 24, 2025
de81478
Update haunted.yml
trest100 Feb 24, 2025
6b9c250
Update HealthAnalyzerWindow.xaml
trest100 Feb 26, 2025
d0fe2a0
Update TraumaSystem.Process.cs
trest100 Feb 26, 2025
c664d14
fixed map's
trest100 Feb 26, 2025
41e706c
Update corvax_split.yml
trest100 Feb 26, 2025
8dd62b5
Merge remote-tracking branch 'upstream/master' into woundingport
trest100 Feb 26, 2025
d57fc22
women can scream now too
MightBeNotReal Feb 26, 2025
8ccdef7
Merge branch 'woundingport' of https://github.com/MightBeNotReal/spac…
MightBeNotReal Feb 26, 2025
92bb27a
almost fixed tests
MightBeNotReal Feb 26, 2025
62304c8
fix tests and make visualiser work
MightBeNotReal Feb 27, 2025
85c8b65
I t hink it works now
MightBeNotReal Feb 27, 2025
b1e9627
tests work now
MightBeNotReal Feb 27, 2025
e760ddb
small fixes
MightBeNotReal Feb 28, 2025
b72607f
stuff and bug fixes
MightBeNotReal Mar 1, 2025
0887607
organ stuff
MightBeNotReal Mar 3, 2025
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
  •  
  •  
  •  
17 changes: 9 additions & 8 deletions Content.Client/Backmen/Surgery/SurgeryBui.cs
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,15 @@ int GetScore(BodyPartType? partType)
return partType switch
{
BodyPartType.Head => 1,
BodyPartType.Torso => 2,
BodyPartType.Arm => 3,
BodyPartType.Hand => 4,
BodyPartType.Leg => 5,
BodyPartType.Foot => 6,
// BodyPartType.Tail => 7, No tails yet!
BodyPartType.Other => 8,
_ => 9
BodyPartType.Chest => 2,
BodyPartType.Groin => 3,
BodyPartType.Arm => 4,
BodyPartType.Hand => 5,
BodyPartType.Leg => 6,
BodyPartType.Foot => 7,
// BodyPartType.Tail => 8, No tails yet!
BodyPartType.Other => 9,
_ => 10
};
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
using Content.Shared.Backmen.Surgery.Wounds;
using Content.Shared.FixedPoint;

namespace Content.Client.Backmen.Surgery.Wounds;

[RegisterComponent]
public sealed partial class WoundableVisualsComponent : Component
{
[DataField(required: true)] public Enum OccupiedLayer;

[DataField] public Dictionary<string, WoundVisualizerSprite>? DamageOverlayGroups = new();
[DataField] public string BleedingOverlay;

[DataField(required: true)] public List<FixedPoint2> Thresholds = [];
[DataField] public Dictionary<BleedingSeverity, FixedPoint2> BleedingThresholds = new()
{
{ BleedingSeverity.Minor, 2.6 },
{ BleedingSeverity.Severe, 7 },
};
}

// :fort:
[DataDefinition]
public sealed partial class WoundVisualizerSprite
{
[DataField(required: true)] public string Sprite = default!;

[DataField] public string? Color;
}
Loading
Loading