Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Commit

Permalink
Merge 06/16 (space-wizards#224)
Browse files Browse the repository at this point in the history
* Reduce the amount of drinks per robust softdrinks machine (space-wizards#8629)

* Automatic changelog update

* Makes ERT roles not show up on role select (space-wizards#8630)

* Fixes circuit printing for generators and emitter (space-wizards#8613)

* Automatic changelog update

* Fix nullable error (space-wizards#8632)

* Prevent inflatables from being placed on walls/doors (space-wizards#8624)

* Check if tile is blocked

* Move check to IsTileClear

* Automatic changelog update

* Don't cancel pulling a corpse because the player ghosted (space-wizards#8621)

* Check if pullable is dead

* Update SharedPullableSystem.cs

Co-authored-by: wrexbe <[email protected]>

* Automatic changelog update

* Revolver fix (again) (space-wizards#8635)

* Gun spread overlay (space-wizards#8588)

* Fixes ID/Names for Sterile masks / latex gloves. Adds nitrile glove box (space-wizards#8607)

* fixes box ID/names for mask and gloves. Adds nitrile box

* map update for ID change

* crate fills fix

* Automatic changelog update

* Change map prototype for gloves/mask

* Fix shotgun spent visuals (space-wizards#8639)

* Make shift laser gun (space-wizards#8125)

* Added the TechFabCircuitboards and made them spawn in the head's lockers

* Added the construction graph for makeshift laser

* Added the construction graph to the yml of makeshiftlaser

* Resolving branching issues

* resolving branching issues

* resolving branching issues

* Small fixes

* Update battery_guns.yml

* Update battery_guns.yml

* Update battery_guns.yml

Co-authored-by: wrexbe <[email protected]>
Co-authored-by: wrexbe <[email protected]>

* Automatic changelog update

* LMG nerf (space-wizards#8637)

* Fix docking fixture crash (space-wizards#8640)

* Automatic changelog update

* Missing nullables (space-wizards#8634)

* Refactor magvisualizer (space-wizards#8568)

* Fix comms consoles not working (space-wizards#8644)

Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* update

* Revert "update"

This reverts commit bab6c6c.

* Marathon Update 1.8 (space-wizards#8647)

* Add files via upload

* Name sec medical camera

Co-authored-by: wrexbe <[email protected]>

* Fix floor tile lattice bug (space-wizards#8653)

* Set subfloor sprites to invisible by default (space-wizards#8571)

* Set subfloor sprites to invisible by default

* s

* Revert "s"

This reverts commit 3ed9c3c.

* Give post-lights interaction outlines (space-wizards#8656)

they were missing.

* Automatic changelog update

* More nullable component fixes (space-wizards#8659)

* Remove .ToArray() allocations from StepTriggerSystem Update (space-wizards#8658)

* Add a merge conflict check. (space-wizards#8626)

* Add a merge conflict check.

This is directly copied from OpenDreamProject/OpenDream#648

* Update .github/workflows/conflict-labeler.yml

Co-authored-by: ike709 <[email protected]>

Co-authored-by: ike709 <[email protected]>

* Buff crates (space-wizards#8622)

* Set PDA music user to allow OnMidiEventRx to send the sound to other players (space-wizards#8580)

* Automatic changelog update

* Iconsmoothing: Subtile metrics (🦆 Edition) (space-wizards#8307)

* Remove emitter hitsound (space-wizards#8666)

* Automatic changelog update

* Stop NPCs steering around non-hard fixtures (space-wizards#8668)

* Automatic changelog update

* Add editor copy keybinding (space-wizards#8369)

* Automatic changelog update

* Anchorable popups (space-wizards#8667)

* Automatic changelog update

* Spread items when dumping contents out of a bag (space-wizards#8678)

Co-authored-by: Kara <[email protected]>

* Automatic changelog update

* Port stethoscopes + innate verbs from nyano (space-wizards#8228)

* port stethoscopes from nyanotrasen

* remove mono crash wtf

* don't touch puddle

* Switch to using action

* both verb and action

* Address reviews

* Automatic changelog update

* Update submodule

* Remove Shuttle Powering Crate from cargo catalogue (space-wizards#8664)

* Automatic changelog update

* Muted status effect + 2 reagent sources of it (space-wizards#8673)

* Automatic changelog update

* Fix dual port vents 2: Electric Boogaloo (space-wizards#8396)

* Remove "nogga black" (space-wizards#8684)

* Update submodule

* use matrix CreateTransform (space-wizards#8687)

* chr (space-wizards#8674)

* weh

Multiplies the amount of power used by the battery guns, triple-ish for the laser cannon and a fuckton more for the xray

* chr

chr

* Update chair.yml

* Update chairs.yml

* Revert submodule

* Opt-in nukies (space-wizards#8541)

* save changes

* naming rules

* changes

* changes

* last touches

* e

* use default

* better looping

* better prototype ig

* f

* c

* Revert "changes"

This reverts commit 111a7f3

* fuck i'm bad at git

* changes

* mfw

* e

* e

* Change default preset to secret (space-wizards#8694)

It gets voted for at the start every time anyway and traitor isn't even voteable.

* Automatic changelog update

* Syndicate Names (space-wizards#8692)

* Syndicate Names

* Update syndicate.yml

* Update NukeopsRuleSystem.cs

Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* Fix roundstart audio

* Fix some friend access violations by allowing others access. (space-wizards#8594)

Rename Friend attribute to Access attribute.
Updates submodule to v0.21.0.0 as well.

* Revert "Fix some friend access violations by allowing others access. (space-wizards#8594) (space-wizards#8703)

* Revert "Revert "Fix some friend access violations by allowing others access. (space-wizards#8594) (space-wizards#8703)" (working this time) (space-wizards#8704)

* ConstructionSystem handles InteractUsing before AnchorableSystem. (space-wizards#8700)

* Automatic changelog update

* buffs tables and counters (space-wizards#8698)

25 (+10) health for metal, 15 for wood

* Automatic changelog update

* Clear cancel token on failed use (space-wizards#8705)

* Bagel Update 13.7 (space-wizards#8690)

* fuck shit ass shit

* Add files via upload

* blurgy bop boo botto (space-wizards#8689)

* Automatic changelog update

* Fix mind unvisit crash (space-wizards#8682)

* Add loc strings and completions to mapping command (space-wizards#8726)

* fix match-matchbox interaction (space-wizards#8715)

* Automatic changelog update

* Fix character ui crash (space-wizards#8717)

* Update wires-component.ftl (space-wizards#8714)

* Automatic changelog update

* Atlas: The Video Game (Update 2.0) (space-wizards#8725)

* Update some nugets (space-wizards#8738)

* Device network DeviceLists and the NetworkConfigurator (Makes air alarms usable) (space-wizards#7697)

* Implement DeviceList
Implement NetworkConfigurator
I sould really get into the habit of making smaller commits

* Remove ApcNetworkComponent from vents, scrubbers anf firelocks

* Change BeforeBroadcastAttemptEvent#Recepients to readonly IReadonlySet and add a ModifiedRecepients field

* Address revievs in NetworkConfigurationSystem

* Fix red and green button styles

* Change NetworkConfiguratorSystem#UpdateState to remove saved entites that don't exist anymore

* Add AtmosDevices device net id

* Add const strings for style classes
Fix wrong margin for NetworkConfiguratorConfigurationMenu

* Hello? Github?

* Add access check before opening the configuration ui

* Address reviews

* Fix call to access reader

* You shall not live again IgnoreComponent

* Fix interaction verb check

* Fix configuration window not closing when target gets deleted / out of range

* Change device is already saved message to say 'network device: ... is already saves'

* Apply suggestions from code review

Co-authored-by: Leon Friedrich <[email protected]>

* Fix applied suggestion

Co-authored-by: wrexbe <[email protected]>
Co-authored-by: Leon Friedrich <[email protected]>

* Automatic changelog update

* Fix friend -> Access for some components

* Nuget fix (space-wizards#8742)

* Add default lag (space-wizards#8739)

* Add whitelist to captain/hop pda (space-wizards#8746)

* Automatic changelog update

* Fix nukies (space-wizards#8759)

* Automatic changelog update

* Add priorities to items slots (space-wizards#8748)

* Update trash.yml (space-wizards#8736)

* Automatic changelog update

* Fix seldom seen bug with food trash (space-wizards#8762)

* Marathon Update 1.9 moment (space-wizards#8764)

* Slows down parallax significantly. (space-wizards#8691)

* Automatic changelog update

* Update submodule

* Fix wrapped foods (chocolate bars, brownies, nutribrick) (space-wizards#8735)

* wrappables fix

* Update snacks.yml

* Update snacks.yml

* Automatic changelog update

* Hotfix door bumps (space-wizards#8665)

Co-authored-by: Leon Friedrich <[email protected]>

* Tweak stun batons to use a battery instead of power cell (space-wizards#8716)

* Allow baton/battery to be inserted into recharger

* Revert "Allow baton/battery to be inserted into recharger"

This reverts commit ccf1f3d.

* Refactor stun batons to use internal batteries

* Automatic changelog update

* Round end sound now respects lobby music option toggle. (space-wizards#8699)

Now it only plays when the round restarts *after* a regular roundend.
Meaning that if you spam the "restartroundnow" command, it won't play even if you have roundend sounds enabled in the options.

* Automatic changelog update

* Adds cameras to Waystation (space-wizards#8733)

* Adds cameras to Waystation

* Fixes the salvage maint door

* Automatic changelog update

* Remove uses of PrototypeLayerData.New() (space-wizards#8676)

* Remove Explicit GridId References (space-wizards#8315)

Co-authored-by: metalgearsloth <[email protected]>

* Fix some indefinite article loc issues (space-wizards#8064)

Co-authored-by: wrexbe <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>

* Ore bags! (YAML, RSI) (space-wizards#8425)

* Adding orebags hooray

* Adds ore bags to salvage lockers.

* no ic in ooc!!!!! (fixed typo)

i managed to type ic instead of id in the yaml file, real

* deleted the ore bags from cargodrobes, the pr lies!!!

* not 100, not 150, should be 200 next, right?

WRONG!!! 175!!!

* adds orebags to salvage spawn salvage equipment boxes

* Automatic changelog update

* Revamp guns: Revival (space-wizards#8675)

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: metalgearsloth <[email protected]>

* layers moment (space-wizards#8766)

* Format redial wait time (space-wizards#8767)

* Automatic changelog update

* Update VoteCommands.cs (space-wizards#8729)

* Makes asteroids low yield, adds normal yield variant for mining (space-wizards#8701)

* Adds low yield mining loot table

* adds low yield variant of asteroids

* Automatic changelog update

* Fully remove Saltern Power prototypes / file (space-wizards#8545)

Co-authored-by: metalgearsloth <[email protected]>

* Renames jobban to roleban so all role commands follow the pattern roleX. (space-wizards#8754)

Co-authored-by: metalgearsloth <[email protected]>

* Implement game rule configs. Game rules are now proper prototypes instead of just an alias for a system. (space-wizards#8539)

* More container pruning (space-wizards#8576)

* Fix master

* Fix master + prototypes (space-wizards#8772)

* Cull even more map lines (space-wizards#8773)

* Cull delta components (space-wizards#8774)

* Cull atlas prototypes (space-wizards#8775)

* Cull barratry prototypes (space-wizards#8776)

* Cull infiltrator prototypes (space-wizards#8777)

* Cull knightship prototypes (space-wizards#8778)

* Cull marathon prototypes (space-wizards#8779)

* Cull moose prototypes (space-wizards#8780)

* Cuttle shuttleert + fix prototype (space-wizards#8783)

* Cull pirate prototypes (space-wizards#8784)

* Cull pillar prototypes (space-wizards#8781)

* Cull saltern prototypes (space-wizards#8785)

* Cull splitstation prototypes (space-wizards#8786)

* Cull packedstation prototypes (space-wizards#8782)

* Cull syndiepuddle prototypes (space-wizards#8787)

* Cull waystation prototypes (space-wizards#8788)

* Increase gun item sizes (gun nerf) (space-wizards#8683)

* Automatic changelog update

* Adds new APC types (space-wizards#8763)

Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* Zombie Rework & Polymorph Expansion (space-wizards#8413)

Co-authored-by: Kara <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* Make HeatCapacity use FixturesMass (space-wizards#8661)

* ERT Update (space-wizards#8617)

* removes ert shuttle and adds dartv2 by Schiene

* missing headsets

* makes ghost role sentient

* fixes duplicating helmets

* culling

Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* Fix cross grid movement (space-wizards#8790)

* temporary test fix (space-wizards#8791)

* Make decal gridinit use gridentityid (space-wizards#8792)

* Fix SMG box sizes (space-wizards#8793)

* Fix winter coats holding more than what they weigh (space-wizards#8750)

* Tweak Commands (space-wizards#8769)

* Prevent accidental crayon eating (space-wizards#8799)

* Add ReadExecute perms to all of DamageableComponent (space-wizards#8800)

* Fix microwave eating wrench (space-wizards#8801)

* Reorders Sound Systems signatures to match Popup Systems. (space-wizards#8728)

* Submodule Update (space-wizards#8802)

* Vote commands completions. (space-wizards#8758)

* Prevent door remote zaps (space-wizards#8803)

* TauCeti smoothing mode (space-wizards#8723)

* Fix firelock prying (space-wizards#8804)

* Automatic changelog update

* Slight DoAfterSystem improvement (space-wizards#8806)

* Use correct PRGlass parent (space-wizards#8805)

* Make two overlays use OverlayDrawArgs aabbs. (space-wizards#8808)

* Fix large_casing sprite and cobra mag (space-wizards#8809)

* Automatic changelog update

* Remove merge conflict comment (space-wizards#8819)

* Revert "Remove merge conflict comment" (space-wizards#8820)

* Captain laser self recharge (space-wizards#8826)

* Update coffee.yml (space-wizards#8830)

* Automatic changelog update

* Nerf pistol firerate slightly (space-wizards#8810)

* Don't flag merge conflicts on draft PRs (space-wizards#8821)

* Automatic changelog update

* Guns will now eject magazines first instead of chamber (space-wizards#8827)

* Removal interaction without hands (space-wizards#8843)

* Automatic changelog update

* Disable lag rand (space-wizards#8847)

* Make doorbumps quiet (space-wizards#8812)

* Syndicate gas mask flash protection (space-wizards#8818)

* Syndicate gas masks protect from flashbangs

* fix var name

* update to loop through all slots

* update based on review comments

* Fix grenade whitelists (space-wizards#8851)

* Automatic changelog update

* fixes static not appearing inbetween camera changes client-side (space-wizards#8846)

* 39 buried 0 found (space-wizards#8856)

* The Rat King [Antag] (space-wizards#8706)

* vending machine go spit

* who's da rat, bozo

* fixes

* crown + fixes

* aaaa

* aa

* lololol

* removing vending shit + most annoying fix alive

* paul review

* moony fixes

* sloth review

* Minor diseasesystem fix

* inverse moment

* A

* Also reduce args allocations

Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* Increase fireplace brightness and radius (space-wizards#8870)

* Automatic changelog update

* Can't break other people's drags on cuffed people (space-wizards#8868)

* works on my machine

* speedrun

* Automatic changelog update

* Fishy swarmers: Carp content and Space Dragon! (space-wizards#7395)

Co-authored-by: mirrorcult <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* Add docking window to shuttle consoles (space-wizards#8756)

* lewd

* A

* Realtime

* Sleepy dork

* Draw radar position

* Accurate infiltrator

* experiments

* Better drawing

* Labels

* I need aan adult

* Cleanup

* Show toggles

* display I guess

* A

* fix

* fix

* cleanupsies

* Bit more polish

* Make sure mass scanners actually work

* Remove dummy state

* fren

* opposite

* aghost crash

* comment

* What's in a name

* woops

* Show docking ports

* Dock highlighting

* Drawing dock

* Shitty docks

* Lots of docking drawing

* Autodock working

* dork

* More graceful shutdown

* zoomies

* Lines and distance change

* revert

* Good enough

* cleanup

* Fix default range

* Dock UI and loc update

* Update on undock

* Loc fixes

* Automatic changelog update

* Update submodule

* Reduce door hacking time (space-wizards#8852)

* Fix damagestatevisualizer (space-wizards#8876)

* Nerf gun damage (space-wizards#8853)

* Automatic changelog update

* One more damagestatevisualizer funny (space-wizards#8877)

* Fix damagestatevisualizer (space-wizards#8879)

* Make holofans use power cells (space-wizards#8813)

* Automatic changelog update

* Nerf dragon audio + do_after (space-wizards#8880)

* Power cell culling (space-wizards#8814)

* Automatic changelog update

* Fix powercell (space-wizards#8882)

* Individual bar sign entities (space-wizards#8159)

* Fixed rotation check for pulling (space-wizards#8845)

Co-authored-by: metalgearsloth <[email protected]>

* Reduced laser pistols to 10 size (space-wizards#8840)

* Automatic changelog update

* Fix carbine size

* make animals gibbable (space-wizards#8875)

* Automatic changelog update

* Fix addatmos from griduid artifact

* Station Specific Jobs: Reporter and Psychologist (space-wizards#8865)

* Update jobs.yml

* Add files via upload

* id moment

* Update identification_cards.yml

* Update pda.yml

* Add files via upload

* psych

* roleyml psych

* real

* Update jumpsuits.yml

* Add files via upload

* Add files via upload

* Add files via upload

* Update jobs.yml

* Update meta.json

* Update meta.json

* Update meta.json

* Update bagel.yml

* Update marathon.yml

* job iconz

* Update meta.json

* Basic Medication Overdoses (Chemistry 1984) (space-wizards#8844)

* 1984 george orwell

* Update medicine.yml

* Update medicine.yml

* Update medicine.yml

* Automatic changelog update

* Fix admin announce eui (space-wizards#8869)

Co-authored-by: metalgearsloth <[email protected]>

* Removes extra Sound from slippery component (space-wizards#8841)

* Add a Wiki Button to the escape menu (space-wizards#8837)

* UI change

* lang file change

* C# change

* fix wiki button

Co-authored-by: Just-a-Unity-Dev <[email protected]>

* Automatic changelog update

* Move cuffs to users hand when removed (space-wizards#8862)

* move cuffs to users hand when removed

* review

Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* Make ghost timer a cvar (space-wizards#8817)

Co-authored-by: Just-a-Unity-Dev <[email protected]>
Co-authored-by: Just-a-Unity-Dev <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>

* Automatic changelog update

* reduced duck yaml bloat (space-wizards#8858)

Co-authored-by: metalgearsloth <[email protected]>

* Fix mousetrap crate icon (space-wizards#8835)

* Fix bagel yml artifact (space-wizards#8885)

* Fix wide attacking in containers (space-wizards#8886)

* Automatic changelog update

* Clean up door remote (space-wizards#8829)

Co-authored-by: metalgearsloth <[email protected]>

* ECS containmentfieldgeneratorcomponent (space-wizards#8757)

* ECS containmentfieldgeneratorcomponent

* Fix tests and clean up one line

* check for anchored in a better way

* Fix dependency exception

I'm not really happy with this solution, it's not very good but I'm not
sure how to do it better without refactoring way more than I want to. Maybe
I'm missing something.

* review

Co-authored-by: metalgearsloth <[email protected]>

* water (space-wizards#8903)

* Cleanup the remainder of dragon (space-wizards#8881)

* Cleanup the remainder of dragon

- Fixed some of the niscellaneous changes made to yml
- Made devour use a whitelist
- Fixed spelling

* name fix

* a

* YAML passes

* Whoops

Co-authored-by: EmoGarbage404 <[email protected]>
Co-authored-by: PJBot <[email protected]>
Co-authored-by: Peptide90 <[email protected]>
Co-authored-by: Leon Friedrich <[email protected]>
Co-authored-by: themias <[email protected]>
Co-authored-by: wrexbe <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: Ripmorld <[email protected]>
Co-authored-by: wrexbe <[email protected]>
Co-authored-by: Veritius <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: Visne <[email protected]>
Co-authored-by: Emisse <[email protected]>
Co-authored-by: Pieter-Jan Briers <[email protected]>
Co-authored-by: Moony <[email protected]>
Co-authored-by: ike709 <[email protected]>
Co-authored-by: 20kdc <[email protected]>
Co-authored-by: WilliamECrew <[email protected]>
Co-authored-by: Kara <[email protected]>
Co-authored-by: ShuttleEnjoyer <[email protected]>
Co-authored-by: T-Stalker <[email protected]>
Co-authored-by: Pancake <[email protected]>
Co-authored-by: Vera Aguilera Puerto <[email protected]>
Co-authored-by: lapatison <[email protected]>
Co-authored-by: Julian Giebel <[email protected]>
Co-authored-by: Chris <[email protected]>
Co-authored-by: TimrodDX <[email protected]>
Co-authored-by: Acruid <[email protected]>
Co-authored-by: ninruB <[email protected]>
Co-authored-by: TaralGit <[email protected]>
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: Júlio César Ueti <[email protected]>
Co-authored-by: Jessica M <[email protected]>
Co-authored-by: keronshb <[email protected]>
Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>
Co-authored-by: Morber <[email protected]>
Co-authored-by: KIBORG04 <[email protected]>
Co-authored-by: Flipp Syder <[email protected]>
Co-authored-by: Delete69 <[email protected]>
Co-authored-by: CrudeWax <[email protected]>
Co-authored-by: eclips_e <[email protected]>
Co-authored-by: Just-a-Unity-Dev <[email protected]>
Co-authored-by: Profane McBane <[email protected]>
Co-authored-by: Just-a-Unity-Dev <[email protected]>
Co-authored-by: ScalyChimp <[email protected]>
  • Loading branch information
Show file tree
Hide file tree
Showing 538 changed files with 144,586 additions and 3,126 deletions.
1 change: 1 addition & 0 deletions .github/workflows/conflict-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
jobs:
Label:
runs-on: ubuntu-latest
if: github.event.pull_request.draft == false
steps:
- name: Check for Merge Conflicts
uses: eps1lon/actions-label-merge-conflict@513a24fc7dca40990863be2935e059e650728400
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/AI/ClientPathfindingDebugSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ protected override void Draw(in OverlayDrawArgs args)

var screenHandle = args.ScreenHandle;
screenHandle.UseShader(_shader);
var viewport = _eyeManager.GetWorldViewport();
var viewport = args.WorldAABB;

if ((Modes & PathfindingDebugMode.Route) != 0)
{
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Actions/ActionsSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ protected override bool PerformBasicActions(EntityUid user, ActionType action)
}

if (action.Sound != null)
SoundSystem.Play(Filter.Local(), action.Sound.GetSound(), user, action.AudioParams);
SoundSystem.Play(action.Sound.GetSound(), Filter.Local(), user, action.AudioParams);

return performedAction;
}
Expand Down
4 changes: 2 additions & 2 deletions Content.Client/Administration/AdminNameOverlay.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Robust.Client.Graphics;
using Robust.Client.Graphics;
using Robust.Client.ResourceManagement;
using Robust.Shared.Enums;
using Robust.Shared.GameObjects;
Expand Down Expand Up @@ -29,7 +29,7 @@ public AdminNameOverlay(AdminSystem system, IEntityManager entityManager, IEyeMa

protected override void Draw(in OverlayDrawArgs args)
{
var viewport = _eyeManager.GetWorldViewport();
var viewport = args.WorldAABB;

foreach (var playerInfo in _system.PlayerList)
{
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Administration/BwoinkSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
var localPlayer = _playerManager.LocalPlayer;
if (localPlayer?.UserId != message.TrueSender)
{
SoundSystem.Play(Filter.Local(), "/Audio/Effects/adminhelp.ogg");
SoundSystem.Play("/Audio/Effects/adminhelp.ogg", Filter.Local());
_clyde.RequestWindowAttention();
}

Expand Down
6 changes: 2 additions & 4 deletions Content.Client/Audio/AmbientSoundSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -259,11 +259,9 @@ private void ProcessNearbyAmbience(EntityCoordinates coordinates)
.WithPlayOffset(_random.NextFloat(0.0f, 100.0f))
.WithMaxDistance(comp.Range);

var stream = SoundSystem.Play(
var stream = SoundSystem.Play(sound,
Filter.Local(),
sound,
comp.Owner,
audioParams);
comp.Owner, audioParams);

if (stream == null) continue;

Expand Down
4 changes: 2 additions & 2 deletions Content.Client/Audio/BackgroundAudioSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ private void StartAmbience()
EndAmbience();
if (!CanPlayCollection(_currentCollection)) return;
var file = _robustRandom.Pick(_currentCollection.PickFiles).ToString();
_ambientStream = SoundSystem.Play(Filter.Local(), file, _ambientParams.WithVolume(_ambientParams.Volume + _configManager.GetCVar(CCVars.AmbienceVolume)));
_ambientStream = SoundSystem.Play(file, Filter.Local(), _ambientParams.WithVolume(_ambientParams.Volume + _configManager.GetCVar(CCVars.AmbienceVolume)));
}

private void EndAmbience()
Expand Down Expand Up @@ -255,7 +255,7 @@ public void StartLobbyMusic()
{
return;
}
_lobbyStream = SoundSystem.Play(Filter.Local(), file, _lobbyParams);
_lobbyStream = SoundSystem.Play(file, Filter.Local(), _lobbyParams);
}

private void EndLobbyMusic()
Expand Down
4 changes: 2 additions & 2 deletions Content.Client/Audio/ClientAdminSoundSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Content.Client.Audio;
public sealed class ClientAdminSoundSystem : SharedAdminSoundSystem
{
[Dependency] private readonly IConfigurationManager _cfg = default!;

private bool _adminAudioEnabled = true;
private List<IPlayingAudioStream?> _adminAudio = new(1);

Expand All @@ -34,7 +34,7 @@ private void PlayAdminSound(AdminSoundEvent soundEvent)
{
if(!_adminAudioEnabled) return;

var stream = SoundSystem.Play(Filter.Local(), soundEvent.Filename, soundEvent.AudioParams);
var stream = SoundSystem.Play(soundEvent.Filename, Filter.Local(), soundEvent.AudioParams);
_adminAudio.Add(stream);
}

Expand Down
33 changes: 22 additions & 11 deletions Content.Client/DoAfter/DoAfterSystem.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using Content.Client.DoAfter.UI;
using Content.Shared.DoAfter;
using Content.Shared.Examine;
Expand Down Expand Up @@ -30,6 +30,7 @@ public sealed class DoAfterSystem : EntitySystem
[Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly IPlayerManager _player = default!;
[Dependency] private readonly ExamineSystemShared _examineSystem = default!;
[Dependency] private readonly SharedTransformSystem _xformSystem = default!;

/// <summary>
/// We'll use an excess time so stuff like finishing effects can show.
Expand Down Expand Up @@ -186,6 +187,8 @@ public void Cancel(DoAfterComponent component, byte id)
component.Gui?.CancelDoAfter(id);
}

// TODO move this to an overlay
// TODO separate DoAfter & ActiveDoAfter components for the entity query.
public override void Update(float frameTime)
{
base.Update(frameTime);
Expand All @@ -203,30 +206,38 @@ public override void Update(float frameTime)

var occluded = _examineSystem.IsOccluded(attached.Value);
var viewbox = _eyeManager.GetWorldViewport().Enlarged(2.0f);
var entXform = Transform(attached.Value);
var playerPos = entXform.MapPosition;
var xforms = GetEntityQuery<TransformComponent>();
var entXform = xforms.GetComponent(attached.Value);
var playerPos = _xformSystem.GetWorldPosition(entXform, xforms);

foreach (var (comp, xform) in EntityManager.EntityQuery<DoAfterComponent, TransformComponent>(true))
{
var doAfters = comp.DoAfters;
var compPos = xform.MapPosition;

if (doAfters.Count == 0 ||
compPos.MapId != entXform.MapID ||
!viewbox.Contains(compPos.Position))
if (doAfters.Count == 0 || xform.MapID != entXform.MapID)
{
Disable(comp);
continue;
}

var range = (compPos.Position - playerPos.Position).Length + 0.01f;
var compPos = _xformSystem.GetWorldPosition(xform, xforms);

if (!viewbox.Contains(compPos))
{
Disable(comp);
continue;
}

var range = (compPos - playerPos).Length + 0.01f;

if (occluded &&
comp.Owner != attached &&
// Static ExamineSystemShared.InRangeUnOccluded has to die.
!ExamineSystemShared.InRangeUnOccluded(
playerPos,
compPos, range,
(comp.Owner, attached), predicate))
new(playerPos, entXform.MapID),
new(compPos, entXform.MapID), range,
(comp.Owner, attached), predicate,
entMan: EntityManager))
{
Disable(comp);
continue;
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Doors/DoorSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ protected override void UpdateAppearance(EntityUid uid, DoorComponent? door = nu
protected override void PlaySound(EntityUid uid, string sound, AudioParams audioParams, EntityUid? predictingPlayer, bool predicted)
{
if (GameTiming.InPrediction && GameTiming.IsFirstTimePredicted)
SoundSystem.Play(Filter.Local(), sound, uid, audioParams);
SoundSystem.Play(sound, Filter.Local(), uid, audioParams);
}
}
1 change: 1 addition & 0 deletions Content.Client/EscapeMenu/UI/EscapeMenu.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<ui:VoteCallMenuButton />
<Button Name="OptionsButton" Text="{Loc 'ui-escape-options'}" />
<Button Name="RulesButton" Text="{Loc 'ui-escape-rules'}" />
<Button Name="WikiButton" Text="{Loc 'ui-escape-wiki'}" />
<Button Name="DisconnectButton" Text="{Loc 'ui-escape-disconnect'}" />
<Button Name="QuitButton" Text="{Loc 'ui-escape-quit'}" />
</BoxContainer>
Expand Down
9 changes: 9 additions & 0 deletions Content.Client/EscapeMenu/UI/EscapeMenu.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
using Robust.Client.UserInterface;
using Content.Client.Links;
using Robust.Shared.GameObjects;

namespace Content.Client.EscapeMenu.UI
Expand All @@ -28,6 +30,7 @@ public EscapeMenu(IClientConsoleHost consoleHost)
QuitButton.OnPressed += OnQuitButtonClicked;
RulesButton.OnPressed += _ => new RulesAndInfoWindow().Open();
DisconnectButton.OnPressed += OnDisconnectButtonClicked;
WikiButton.OnPressed += OnWikiButtonClicked;
}

private void OnQuitButtonClicked(BaseButton.ButtonEventArgs args)
Expand All @@ -47,6 +50,12 @@ private void OnOptionsButtonClicked(BaseButton.ButtonEventArgs args)
_optionsMenu.OpenCentered();
}

private void OnWikiButtonClicked(BaseButton.ButtonEventArgs args)
{
var uriOpener = IoCManager.Resolve<IUriOpener>();
uriOpener.OpenUri(UILinks.Wiki);
}

protected override void Dispose(bool disposing)
{
base.Dispose(disposing);
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/GameTicking/Managers/ClientGameTicker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ private void RoundRestartCleanup(RoundRestartCleanupEvent ev)
if (string.IsNullOrEmpty(RestartSound))
return;

SoundSystem.Play(Filter.Empty(), RestartSound);
SoundSystem.Play(RestartSound, Filter.Empty());

// Cleanup the sound, we only want it to play when the round restarts after it ends normally.
RestartSound = null;
Expand Down
24 changes: 19 additions & 5 deletions Content.Client/Ghost/Roles/UI/GhostRoleRulesWindow.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,37 +1,51 @@
using System;
using Content.Shared.Ghost.Roles;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Localization;
using Robust.Shared.Timing;
using Robust.Shared.Utility;

using Content.Shared.CCVar;
using Robust.Shared.Configuration;

namespace Content.Client.Ghost.Roles.UI
{
[GenerateTypedNameReferences]
public sealed partial class GhostRoleRulesWindow : DefaultWindow
{
private float _timer = 5.0f;
[Dependency] private readonly IConfigurationManager _cfg = IoCManager.Resolve<IConfigurationManager>();
private float _timer;

public GhostRoleRulesWindow(string rules, Action<BaseButton.ButtonEventArgs> requestAction)
{
RobustXamlLoader.Load(this);
TopBanner.SetMessage(FormattedMessage.FromMarkupPermissive(rules + "\n" + Loc.GetString("ghost-roles-window-rules-footer")));
var ghostRoleTime = _cfg.GetCVar(CCVars.GhostRoleTime);
_timer = ghostRoleTime;

if (ghostRoleTime > 0f)
{
RequestButton.Text = Loc.GetString("ghost-roles-window-request-role-button-timer", ("time", $"{_timer:0.0}"));
TopBanner.SetMessage(FormattedMessage.FromMarkupPermissive(rules + "\n" + Loc.GetString("ghost-roles-window-rules-footer", ("time", ghostRoleTime))));
RequestButton.Disabled = true;
}

RequestButton.OnPressed += requestAction;
}


protected override void FrameUpdate(FrameEventArgs args)
{
base.FrameUpdate(args);
if (!RequestButton.Disabled) return;
if (_timer > 0.0)
{
_timer -= args.DeltaSeconds;
RequestButton.Text = Loc.GetString("ghost-roles-window-request-role-button-timer", ("time", $"{_timer:0.0}"));
}
else
{
RequestButton.Disabled = false;
RequestButton.Text = Loc.GetString("ghost-roles-window-request-role-button");
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions Content.Client/Kitchen/EntitySystems/MicrowaveSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ public void StartSoundLoop(MicrowaveComponent microwave)
{
StopSoundLoop(microwave);

microwave.PlayingStream = SoundSystem.Play(Filter.Local(), microwave.LoopingSound.GetSound(), microwave.Owner,
AudioParams.Default.WithMaxDistance(5).WithLoop(true));
microwave.PlayingStream = SoundSystem.Play(microwave.LoopingSound.GetSound(), Filter.Local(),
microwave.Owner, AudioParams.Default.WithMaxDistance(5).WithLoop(true));
}

public void StopSoundLoop(MicrowaveComponent microwave)
Expand Down
5 changes: 2 additions & 3 deletions Content.Client/Light/Visualizers/ExpendableLightVisualizer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@ void TryStopStream(IPlayingAudioStream? stream)
TryStopStream(expendableLight.PlayingStream);
if (expendableLight.LoopedSound != null)
{
expendableLight.PlayingStream = SoundSystem.Play(Filter.Local(),
expendableLight.LoopedSound, expendableLight.Owner,
SharedExpendableLightComponent.LoopedSoundParams.WithLoop(true));
expendableLight.PlayingStream = SoundSystem.Play(expendableLight.LoopedSound, Filter.Local(),
expendableLight.Owner, SharedExpendableLightComponent.LoopedSoundParams.WithLoop(true));
}
break;
}
Expand Down
Loading

0 comments on commit 9040065

Please sign in to comment.