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

Апстримчик #128

Merged
merged 26 commits into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d5d3784
Fix some mistakes with some of my first hairstyles I did. Whoops. (#726)
ZetaNull Nov 26, 2024
52b9604
Car/Van Collisions (#728)
ReginaeSpence Nov 26, 2024
2165dfa
Additional Hair Options (#733)
troytroy400 Nov 26, 2024
a8c05d6
Make Restart Great Again (#729)
TheDoktorZ Nov 26, 2024
db2e564
Swamp fix (#732)
bryan-hub Nov 26, 2024
f5932b8
Breaking Window Bars (#731)
TheDoktorZ Nov 27, 2024
147c904
sprite fixes requested by George W Bush aka squadleadextraordinaire (…
the-adom Nov 27, 2024
a5db16e
fix cooked meats turning into upstream steak (#735)
Peptide90 Nov 27, 2024
21c572c
Raiders Spawner & Sprite Fixes (#730)
TheDoktorZ Nov 27, 2024
a2d1b88
Rodent's Elite Ranger Fix (#723)
TheTrueRatKing Nov 27, 2024
617cac8
Sunnyvale v3.3 (#736)
TheDoktorZ Nov 27, 2024
439b7a4
Even More Hair (#738)
ZetaNull Nov 29, 2024
6cf52de
Remove RadiationReceiver from most mobs
Partmedia Dec 1, 2024
d8e08fc
Remove drains with autoDrain false
Partmedia Dec 1, 2024
5441d23
Update map
Partmedia Dec 1, 2024
9a517ce
Raider Fixes & Extras (#739)
TheDoktorZ Dec 1, 2024
c67dba1
Run all drain updates together
Partmedia Dec 1, 2024
4386496
Remove Drain from stock toilet and sink
Partmedia Dec 1, 2024
cd41ff6
Remove unnecessary list creation loop
Partmedia Dec 1, 2024
1092548
Slightly Greener Grass and Cold Mountain Rock tile. (#737)
ZetaNull Dec 2, 2024
2ae382c
bitterdrink buff (#740)
Berserker-88 Dec 2, 2024
6f08465
Slowdown tile1 (#718)
ReginaeSpence Dec 3, 2024
98b228e
Added training sword + Improved training sword (#727)
6SpadesLuke Dec 4, 2024
54f5dd8
God Howard Rises (#741)
ReginaeSpence Dec 5, 2024
2016e70
Merge remote-tracking branch 'upstream/master'
Zekins3366 Dec 5, 2024
ba1c3bf
Minifixes
Zekins3366 Dec 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions Content.Server/Body/Systems/MetabolizerSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,8 @@ public override void Update(float frameTime)
{
base.Update(frameTime);

var metabolizers = new ValueList<(EntityUid Uid, MetabolizerComponent Component)>(Count<MetabolizerComponent>());
var query = EntityQueryEnumerator<MetabolizerComponent>();

while (query.MoveNext(out var uid, out var comp))
{
metabolizers.Add((uid, comp));
}

foreach (var (uid, metab) in metabolizers)
while (query.MoveNext(out var uid, out var metab))
{
// Only update as frequently as it should
if (_gameTiming.CurTime < metab.NextUpdate)
Expand Down
19 changes: 11 additions & 8 deletions Content.Server/Fluids/EntitySystems/DrainSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ public sealed class DrainSystem : SharedDrainSystem
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;

private float DrainRunPeriod = 1f; // 1 second to make multiplying by DrainFrequency correct
private float Accumulator;

public override void Initialize()
{
base.Initialize();
Expand Down Expand Up @@ -108,7 +111,14 @@ private void Empty(EntityUid container, SpillableComponent spillable, EntityUid

public override void Update(float frameTime)
{
base.Update(frameTime);
Accumulator += frameTime;
if (Accumulator < DrainRunPeriod)
{
return;
}
Accumulator -= DrainRunPeriod;

base.Update(DrainRunPeriod);
var managerQuery = GetEntityQuery<SolutionContainerManagerComponent>();
var xformQuery = GetEntityQuery<TransformComponent>();
var puddleQuery = GetEntityQuery<PuddleComponent>();
Expand All @@ -117,13 +127,6 @@ public override void Update(float frameTime)
var query = EntityQueryEnumerator<DrainComponent>();
while (query.MoveNext(out var uid, out var drain))
{
drain.Accumulator += frameTime;
if (drain.Accumulator < drain.DrainFrequency)
{
continue;
}
drain.Accumulator -= drain.DrainFrequency;

// Disable ambient sound from emptying manually
if (!drain.AutoDrain)
{
Expand Down
4 changes: 2 additions & 2 deletions Content.Shared/CCVar/CCVars.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1398,7 +1398,7 @@ public static readonly CVarDef<bool>
/// Config for when the restart vote should be allowed to be called based on percentage of ghosts.
///
public static readonly CVarDef<int> VoteRestartGhostPercentage =
CVarDef.Create("vote.restart_ghost_percentage", 50, CVar.SERVERONLY);
CVarDef.Create("vote.restart_ghost_percentage", 20, CVar.SERVERONLY);

/// <summary>
/// See vote.enabled, but specific to preset votes
Expand All @@ -1416,7 +1416,7 @@ public static readonly CVarDef<bool>
/// The required ratio of the server that must agree for a restart round vote to go through.
/// </summary>
public static readonly CVarDef<float> VoteRestartRequiredRatio =
CVarDef.Create("vote.restart_required_ratio", 0.85f, CVar.SERVERONLY);
CVarDef.Create("vote.restart_required_ratio", 0.75f, CVar.SERVERONLY);

/// <summary>
/// Whether or not to prevent the restart vote from having any effect when there is an online admin
Expand Down
Binary file not shown.
4 changes: 4 additions & 0 deletions Resources/Audio/_Nuclear14/attributions2
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- files: ["you_should_upgrade_for_this.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Taken from Bloomberg News broadcast, in turn taken from Todd Howard 'you may need to upgrade your PC for this game' green screen by Green Screen Videos by Murdoink. Not sure how to attribute this.."
source: "https://www.youtube.com/watch?v=dgzlXXCV3NQ , the video"
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/_Nuclear14/N14GodHowardAS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
todd-has-risen = Todd has risen!
todd-has-risen-sender = ???
138 changes: 137 additions & 1 deletion Resources/Locale/en-US/deltav/accessories/hair.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,140 @@ marking-ZetaHairShortMessy = Short and Messy
marking-ZetaHairShortSpikehair = Short Spikehair
marking-ZetaHairSpikehawk = Spikehawk
marking-ZetaHairPolitical = The Political
marking-ZetaHairZetaBasicBraids = Basic Braids (Zeta)
marking-ZetaHairZetaBasicBraids = Basic Braids (Zeta)
marking-CMAfro = Afro (N14)
marking-CMAfrotwo = Afro 2 (N14)
marking-CMaveragejoe = Average Joe (N14)
marking-CMflyboy = Fly Boy (N14)
marking-CMbaldingotis = Otis Balding (N14)
marking-CMmorninghair = Morning Hair (N14)
marking-CMmorninghair2 = Morning Hair 2 (N14)
marking-CMmorninghair3 = Morning Hair 3 (N14)
marking-CMhivehair = Mutated Hair (N14)
marking-CMhivehair2 = Mutated Hair 2 (N14)
marking-CMbigafro = Huge Afro (N14)
marking-CMbobscurls = Bob Curls (N14)
marking-CMbobcut = Bob Cut (N14)
marking-CMbowlcut = Bowl Cut (N14)
marking-CMbowlcut2 = Bowl Cut 2 (N14)
marking-CMbraidedhair = Braided Hair (N14)
marking-CMbraidedhair2 = Braided Hair 2 (N14)
marking-CMmilitarystylebun = Military Style Bun (N14)
marking-CMtopmanbun = Top Man Bun (N14)
marking-CMtopmanknot = Top Man Knot (N14)
marking-CMbun12 = Tied Back Bun (N14)
marking-CMNCRstandardbuzzcut = NCR Standard Buzzcut (N14)
marking-CMbuzzcut = Buzzcut (N14)
marking-CMcleancuthair = Clean Cut (N14)
marking-CMciaalt = Blackburn Hair (N14)
marking-CMcoffeebarista = Coffee Barista (N14)
marking-CMcombover = Combed Over (N14)
marking-CMcombover2 = Combed Over 2 (N14)
marking-CMcrewcut = Crewcut (N14)
marking-CMlauracroft = Laura Croft (N14)
marking-CMfemalecurls = Female Curls (N14)
marking-CMcuthair = Cut Down (N14)
marking-CMdandy = Al Dandy (N14)
marking-CMdevillock = Devils Locks (N14)
marking-CMdreads = Dreads (N14)
marking-CMdrillruru = Drilling (N14)
marking-CMedgar = Edgar (N14)
marking-CMemo = Memo (N14)
marking-CMemobun = Memo Bun (N14)
marking-CMemolong = Memo Long (N14)
marking-CMfather = The Father (N14)
marking-CMbella = Bella (N14)
marking-CMfemalebun = Female Bun (N14)
marking-CMfemalebun2 = Female Bun 2 (N14)
marking-CMcornrows = Corn Rows (N14)
marking-CMfemalecurly2 = Female Curly (N14)
marking-CMeldrtich = Eldritch Horror (N14)
marking-CMfeather = Feather (N14)
marking-CMflair = Flair (N14)
marking-CMflair2 = Flair 2 (N14)
marking-CMflow = Flow (N14)
marking-CMpixie = Pixie (N14)
marking-CMpiexie2 = Pixie 2 (N14)
marking-CMfredding = Fredding (N14)
marking-CMfringletail = Fringe Ponytail (N14)
marking-CMfemalevasquez = Corporal Vasquez (N14)
marking-CMgantleponytail = Gentle Ponytail (N14)
marking-CMjellcombover = Comb Over Alternate (N14)
marking-CMgentle = Gentle (N14)
marking-CMgentle2 = Gentle Hair (N14)
marking-CMhalfbang = Half Bangs (N14)
marking-CMhalfbangalternate = Half Bangs Alternate (N14)
marking-CMhalfshaved = Half Shaved (N14)
marking-CMhbraid = Braids (N14)
marking-CMhighfade = High Fade (N14)
marking-CMhightight = High and Tight (N14)
marking-CMhimecut = Mime Cut (N14)
marking-CMhitop = High Top (N14)
marking-CMjensen = Jensen (N14)
marking-CMjoestar = Joe Star (N14)
marking-CMkagami = Kagami (N14)
marking-CMjusanagi = Jusangi (N14)
marking-CMlongshoulderlength = Long Shoulder Length (N14)
marking-CMlonghair = Long Drop Down (N14)
marking-CMlongovereye = Long Over Eye (N14)
marking-CMlowfade = Low Fade (N14)
marking-CMdoctorfade = Doctor Fade (N14)
marking-CMflattop = Flat Top (N14)
marking-CMhighandtight = High and Tight Alternate (N14)
marking-CMmiceman = Mouse Man (N14)
marking-CMprivatejoker = Private Joker (N14)
marking-CMenclavefade = Clave Fade (N14)
marking-CMmohawk = Mohawk Alternate (N14)
marking-CMmullet = Mullet (N14)
marking-CMmohawk2 = Mohawk 2 (N14)
marking-CMmohawkshaved = Mohawk Shaved (N14)
marking-CMmohawkshaved2 = Mohawk Shaved 2 (N14)
marking-CMasczak = Masczak (N14)
marking-CMmohawkshaved3 = Mohawk Shaved 3 (N14)
marking-CMshavedbalding = Shaved and Balding (N14)
marking-CMmulder = Mulder (N14)
marking-CMdaddy = Father (N14)
marking-CMnitori = Nitori (N14)
marking-CMnofade = No Fade (N14)
marking-CModango = Dango (N14)
marking-CMombre = Ombre (N14)
marking-CMoxton = Moxie (N14)
marking-CMparted = Parted (N14)
marking-CMpompadour = Pompadour (N14)
marking-CMponytail = Tied Back Alternate 1 (N14)
marking-CMponytailrough = Ponytail Rough Back (N14)
marking-CMenclavestandardponytail = Enclave Standard Ponytail (N14)
marking-CMponytail2 = Tied Back Ponytail (N14)
marking-CMponytail3 = Tied Back Ponytail 2 (N14)
marking-CMponytail4 = Tied Back Ponytail 3 (N14)
marking-CMponytail5 = Tied Back Ponytail 4 (N14)
marking-CMponytail8 = Tied Back Ponytail 5 (N14)
marking-CMpoofeduphair = Poofed Up (N14)
marking-CMfemalepunkhair = The Punk (N14)
marking-CMfemalepunkhairponytail = Punk Tied Back Ponytail (N14)
marking-CMfemalepunkhairsmallhawk = Punk Hawk Small (N14)
marking-CMfemalepunkhairsmallfringe = Punk Small Fringe (N14)
marking-CMreversemohawk = Reversed Mohawk (N14)
marking-CMdrillsergeant = NCR Drill Sergeant (N14)
marking-CMthiiningrear = Thinning Down (N14)
marking-CMundercut = Under The Cut (N14)
marking-ZetaHairJohnny = The Johnny
marking-ZetaHairMattedSpikes = Matted Spikes
marking-ZetaHairManageableMess = Manageable Mess
marking-ZetaHairPoofed = Poofed
marking-ZetaHairOverShoulderBraids = Over-shoulder Braids
marking-ZetaHairMonk = Monk
marking-ZetaHairMiniMattedSpikes = Mini Matted Spikes
marking-ZetaHairNaturalMessShort = Natural Mess (Short)
marking-ZetaHairNaturalMessLong = Natural Mess (Long)
marking-ZetaHairFrontSpikes = Front Spikes
marking-ZetaHairMessyPonytail = Messy Ponytail
marking-ZetaHairFaded = Faded
marking-ZetaHairHalfsies = Halfsies
marking-ZetaHairPorcupine = Porcupine
marking-ZetaHairHalfShavedBraids = Half-Shaved Braids
marking-ZetaHairLoneTail = Lone Tail
marking-ZetaHairRadical = Radical!
marking-ZetaHairTunnelSnake = Tunnel Snake
marking-ZetaHairOverTheShoulder = Over the Shoulder
marking-ZetaHairStandardAsymmetry = Standard Asymmetry
Loading
Loading