* TGUI upgrade project: Port initial TGUI 4.0 changes from TG (#23440)
* tgui4.0
* bugfix for un-interaction
* fix for input not resetting on close
* NTOS restore
* fix all interfaces having scrollbars, fix colours
* bundle update
* dep bumps
* bumps the deps as much as possible
* button regression fix
* TGUI test map rev 1
* fix theme and some component regression
* fix login screen regression
* fixes regression with uplink cart
* bundle
* fix regressions
* fix the input issue, again
* regression fixes, stylesheet edition, hash restore
* fixes GPS BSOD
* draggable control regression
* dev server dep regression
* byondUI regression fix
* section regression fix
* fix secure storage weirdness
* Fixed mining vendor scrolling
* Arthri review pass 1
* mining vendor double-scroll
* fix for RPD, AirAlarm, and Radio
* arthri review pass 2
* arthri review pass 3
* sanitize var setting, fix colours, delete unused file
* adds CI to branch
* god damn AI making random changes
* I should remember to compile when changes are made
* fixes scrollbar issues
* fix camera console, fix flexGrow for sections
* CI fix
* nanomap fix
* Update code/modules/atmospherics/machinery/airalarm.dm
* restore margin
* style semicolon
* TGUIv4 - Moves TGUI Window Sizing from DM to JS (#23524)
* Initial commit
* Transferring the remaining windows to JS
* Resizing part 1
* Resizing part 2
* Some reverts and polish
* Forgot that
* undeployed nuke window size
---------
Co-authored-by: Aylong <alexanderkitsa@gmail.com>
* TGUIv4: Remove force_open (#23537)
* First state fixes
* Removes "force_open"
* TGUIv4 - TGUI Version 4.1 (#23547)
* Reduced Logging Changes
* setSharedState early return for non-interactive UI
* TGUI version bump to 4.1
* Fix sending updates for non-interactive UIs
* Scalablue UI Stylesheet Changes
* CSS Tgui Bundle
* JavaScript TGUI Style Changes
* Update tgui/packages/tgui/styles/base.scss
Co-authored-by: Aylong <69762909+Aylong220@users.noreply.github.com>
* Additional changes to Input and Button scalability
* TGUI logging proc update
* Indentation fix for logging proc
* Update code/__HELPERS/_logging.dm
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* Additional log_tgui changes
---------
Co-authored-by: Aylong <69762909+Aylong220@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* dev server hotfix (#23584)
* ui_interact object constructor argument check (#23594)
* feat: add smart asset cache, add CDN support for assets, properly group assets (#23585)
* feat: add smart asset cache, add CDN support for assets, properly group assets
* fix: make tgui actually work
* fix: keeping local name for `tgui.bundle.js` and `tgui.bundle.css` for debug and dev server functioning
* fix: make `fontawesome` assets finally work
* fix: make proper identation for `if`
* fix: add `resolveAsset` to `NanoMap.js`
* refactor: update `claw_game` and `chess` to new asset framework
* refactor/tweak: don't use string concatenation for browser `content` and `head_content`, use list instead. Don't use `common.css` for paper UI, keep local name for stamp image assets, replace hard ref of browser to `atom` (rare case) to `UID`
* refactor: remove redundant debug logs
* refactor: remove space betwee `if` and `(`
* refactor: remove one more redundant log, properly reload UI resources
* rafactor: change names of asset files
* fix: adjust existing UIs to properly use assets
* fix: properly pass args to to `onclose` proc
* Update code/modules/asset_cache/transports/asset_transport.dm
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* Update code/modules/asset_cache/transports/asset_transport.dm
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* TGUI 4.2: TGchat + Refactor Asset Delivery + Yarn Berry (#23643)
* tgchat
* Little cleanup
* Refactor Asset Delivery (Part 2)
* Little tweaks
* fix code styling issues
* fix file name duplications
* Browser window options fix @gaxeer
* transfer valve fixes
* yarn berry initial
* vsc tasks
* yarn berry working
* node 20
* fix dev server (lol wrong yarn)
* bloody regressions
* fixes that damn scrolltracking bug
* Some tweaks and flexGrow deletions
It still doesn't work as it should, which makes me nervous
* remove unneeded deps
* 514 regression fix
* change stuff to not conflict with other servers
* name it as requested
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* revert test_TGUI map addition
* TGUI 4.3: Stack, Webpack 5 & UI Tweaks, Yarn 3.6.4, TS support, Jest (#23677)
* Stack & UI's Refactor
Almost final, polish required
Stack & UI's Refactor (Part 1)
Stack & UI's Refactor (Part 2)
Stack & UI's Refactor (Part 3)
* Prettier
Maybe bad
* ClearChat & some tweaks
* Adds a Chat Reliability Layer https://github.com/tgstation/tgstation/pull/79479
* Fix chat BSOD
https://github.com/tgstation/tgstation/pull/79821
* WebPack 5 (Didn't work)
I hate this shit
* Yarn 3.6.4
* make it all work
* revert snowflake fix
* Stories
* adds TS support
* re-enable test and prettier
* update yarn sdk's
* Fix some box regression
* ping/reply
* Fixes regressions and some things
* Zebra and Fix chat button transfer
+rebuild
* make VSC use the proper local typescript lib
* Popper Tooltips https://github.com/tgstation/tgstation/pull/58980
* Popper Tooltips performancy fixes
* Dropdown v2 https://github.com/tgstation/tgstation/pull/75164
Without Icon.tsx
* BB test map
* run build
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* we moved these
* change test values
* ignore scss files
* change hash function
* TGUIv4: TGchat fix traitor codeword highlighting (#23720)
* Codeword highlighting for TGUIv4
* null safeties
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* TGUIv4 - updates standalone build tooling (#23721)
* swap `xxhash64` for `md4`
* remove hash function
* remove old file
* TGUI 4.3+4.4: Newscaster fix, `inline-block` replacements and other fixes (#23722)
* TGUI 4.3 fixes
Newscaster fix + inline-blocks
* Be gone Box
* Mod Chat -> Mentor Chat
* Some warning filters
* Rebuild
* Delete tgui-common.bundle.js
* please work
* try it like this
* 4.3.1
* 4.3.2
* fix
* i forgot to build
* 4.4.0
* give me more diff details please so I can fix you
* its not binary pls git
* test without svgs
* removes an un-needed SVG file
* inlined SVGs test
* fix code styling
* comment these
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* TGUIv4 - Removes resizable and improves drag code (#23719)
* Initial commit
* bundle rebuild
* Fixes Radio Sizing
* Updates Radio sizing to fix wrapping issues
* fix dev server
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* fix hotkeys not being passed to BYOND
* Apply suggestions from code review
* bump deps
* forgot these deps
* ci fix
* ChemDispenser fixes and HoloControl cooldown
* Station Traits TGUI
+Rebuild
* CI
* fix CI for real this time
* I have no idea
* fix station trait panel
* Update code/controllers/subsystem/SSping.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/controllers/subsystem/SSticker.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/controllers/subsystem/SSping.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* deterministic module IDs
* TGUI fixes. Again... (#23762)
* TGUI Fixes: Part 1
ORM icon for reinforced glass now showing correctly
Mining vendor moved to Stack
Exofab UI buttons descended from the heavens to the earth
* TGUI Fixes: Part 2
DestTagger now works, forgot import LabeledList
PowerMonitor graph displays correct
Request Console updated to 2.0, BUT, problem with message priority, it was there before the changes, maybe even before the project, I'll have to check it out
* TGUI Fixes: Part 2
Fixed `onEnter` input
Fixed Cloning Console storage (Im dumbass)
Some windows resizing
Fixed bad picture in security and medical records console
Fixed scrollable dropdown
Added translucent color for buttons
* Fucking uplink DONE, and Button.Input fix
* NT Recruiter and Uplink polish
* Del LabeledList from dest. tagger
* ChemMaster and OreRedemption log deletion
* Update test_tiny.dmm
* Translucent button story
* Filter for SQL error
* del: `log_debug` in `hear_say.dm`
* Some little fixes and SpecMenu Stack
* Panel.js: mx -> mr
* fix ghost spawners
* null check
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* fix material name in protolathe
* fix various UI interacts
* card machine runtime fix
* remove legacy folders
* TGUIv4 - TGchat Theme Adjustments (#23772)
* Initial commit
* Changes rule grouping
* Robot class style changes and webpack config
* Reverts webpack/font changes and subs robot font
* revert a state changed in error
* fix uninteractable UIs due to chunky fingers
* TGUIv4: More fixes, tweaks and fixes for tweaks (#23781)
* I fuckin hate PDA
* Vending
* Add `|` to highlight splitters and some light mode tweaks
* Teleporter rewrite
* APC and AiAirlock (God forgive me)
* clarify highlight syntax
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* TGUIv4 - Abductor Experiment Machine TGUI (#23776)
* Experiment Console TGUI
* Update for TGUIv4
* UI Size adjustment
* ui state and ghost attack update
* remove this
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* fix
* TGUIv4 - Adjustments, Fixes, and Tweaks (#23785)
* Photocopier layout adjustments
* Autolathe Text and Button spacing adjustment
* Hotkey fix for moving bug
* Removes rule sets for visited links
* Fixes ordering multiples on cargo console
* fix possible wonky json payloads
* fix admin log input list stuff
* TGUIv4: Reconnect fix and some other fixes + tweaks (#23790)
* Fix reconnecting and transfer it to TSX
* RPD polish
* RCD, AccessList, GuestPass
* Focus reset fix when camera switched. God forgive me again...
* Purple box and identation fixes
For votes and health scanner
* ChemMaster and ChemDispenser
ChemMaster - translucent pills buttons and no grow produce section
ChemDuspenser - dynamic height
* ShuttleManipulator Tabs
* RCD buttons
* make input bar mode more prominent
* fix chem master icons
* tab fix
* Properly sanitizes loaded messages in tgui chat
* TGUIv4 - Adjustments, Fixes, and Tweaks v2 (#23795)
* Fixes icon spacing for nanobank tabs
* Tweaks Dropdown styling
* Fixes sending stuff to old chat
* OpenDream TGUI fix
* Resizes Station Traits window
* Adjusts health analyzer messages for chat tabs
* Revert "Properly sanitizes loaded messages in tgui chat"
This reverts commit 4c32a7094a.
* Revert "Revert "Properly sanitizes loaded messages in tgui chat""
This reverts commit 24afa55922.
* Changes how tgui handles static data
* Reenable no-undef rule. Enable Format On Save for VSCode (#23803)
* Enable Format On Save for VSCode
* Re-enable and fix no-undef
---------
Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
* pda scanner message improvements
* fix mentor/admin PMs being sent to the "unsorted" category
* fix garbled custom vote messages
* moves cyborg analyser to use chatboxes
* fixes regression
* Prevent F5 reload
* TGUIv4: Themes polish and some new ones + misc fixes (#23814)
* Little themes tweaks
* NTOS chat theme
* Update tgui-panel.bundle.js
* Capitalize themes
* Paradise theme v1.0
* Little StationTraitsPanel cleanup
* Update member_content.dmi
* NoCapitalize
* Rebuild
* Delete Paradise.scss
* Create paradise.scss
* Forgot
* Rewritten Security Records Console
For Jesus fucking christ...
* Vending and Wires sizes tweaks
* ThermoMachine
* Syndicate Theme
* Little darker
* Rewritten Medical Records Console
* PDA Nanobank fix
* Syndicate Theme Darker
* Rebuild TGUI
* Wires section grow fix
* fixes the enshittified paradise icon
* Sirryan+Warrior reviews
* bloody define comments
* comment correction
* unprivate these
* errant . begone (how did this not cause a compiler error)
* TGUIv4 - Adjustments, Fixes, and Tweaks v3 (#23807)
* Fixes ERT Manager silenced message function
* Adjusts progress bar on ExosuitFabricator
* Sets Dropdown selected to align left
* Removes the use of self_state select interfaces
* Exosuit Fabricator style adjustments
* fix sextractor UI
* remove empty tochat string
* fix human air alarm interactions
* fix modals
* add F12/IEChooser
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
---------
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Aylong <alexanderkitsa@gmail.com>
Co-authored-by: Aylong <69762909+Aylong220@users.noreply.github.com>
Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Arthri <41360489+Arthri@users.noreply.github.com>
Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
* Rework Syndie Research Base
* Fixing
* Fixing..
* work you cu-
* SPAACE
* Pack of changes:
- Removed Toilets and replaced them with "Dressing" room.
- Added Genetics, because person on discord wished for it.
- Placed Atmos pipes (scrubbers and supply)
* Changes:
- Added Pathing for ed209 (syndicate)
- Removed random_spawners custom spawner made before.
- Added "security" room with allow you to control turrets and see all base cameras.
* Fixing turret control panel
* Fixing turrets.. again
* huh?
* Changes:
- Decreased Beacons amount from 20 to 10 (they give same path, just less stops).
- Added special room to "store" ed209 syndicate, if you want to activate it: View Variables -> patrol = 1.
- Added light switches everywhere.
- Added Air alarms and fire alarms everywhere, and made sure there are fire doors to stop potential fires.
- Added 2 more areas, Genetics and "control room".
* Placed Power Cables.
* Added disposals
Lets fuckign Gooooo
* Changes:
- Made button from drive actually open doors and shoot stuff to toxin range.
- Added emergency PACMAN generator, in case someone join late and whole base will be de-powered.
- Added CCTV to caves, now you can see intruders.
* Added 2 more boxes of plant disc.
* Changes:
- Added new variant of free drobes, now syndicate can get drip for free.
- Added "hidden" safe at vault with contain 10000credits and stethoscope nearby to help, its only for syndicate researcher, if explorer steal it, they should get bounty on them by syndicate.
- Added a lot of vendors refilling units, to make sure that you cannot run out by "accident".
* Changed Toxin Test arena to indestructable walls.
* Bunch of Changes:
- Replaced "grenade casings" (with are foam grenades) with new created "Foam Grenades Box" so its more oblivious what it is.
- Added paper note near PACMAN Generator with contain basic instruction how to use it.
- Added missing fire doors for "drooms".
- Added fire extinguishers EVERYWHERE so syndicate OSHA will be happy.
- Changed "genetics" room, now instead of supporing 4 people, it support now only 2 in exchange for "faster" DNA researching.
- Added "Foam Grenades Box" around base and in storage, so if there any breaches just throw kanu- grenades at them.
- Named and connected disposal to "toxin launcher" so now you can disposal your constractions inside.
- Added 4 buttons for "Chemical" testing room (with is not for explosives) so now you cannot get trapped inside.
- Made special disposal Ride for genetics "monkeys" to turret so they will be killed (its made this way to avoid researchers spacing themselfs allowing them to escape)
- Increased Toxin Storage room, by increasing oxygen and plasma tanks amount by tanks 2 each.
- Moved AIR container to engine, now they are replaced with "tank container" to storage... custom plasma mixes without destroying main plasma containers.
* fixes
* Changed Genetics:
- Now genetics layout got changed, now instead of supporting 4 genetics people it only support 2 in exchange for more efficency in making DNA syringes.
- Now you can dispose bodies for turrets to shoot holes trough... its funny.
* Added Mirrors to dressing room-
And Fixed hallway curve
* Made cryo and sleepers face themselfs
* Added RPD for toxin launcher room
- now if you run out of valves, you can just "spawn" new ones.
* Used merge conflict fixing tool
- and for *some* reason it keep showing merge conflict? (whot)
* Requested changes:
- Replaced NT machine with syndie cigarette machine.
- Removed random blueshield note.
- replaced syndie donk machines to secured variant.
* Changes full build consoles to unbuild.
* Fixes:
- Fixed storage, somehow one rack with mats got exaporated.
- Added tachyon-doppler array for tracking explosion size.
- Removed duplicated buttons from toxin mixing room.
- Removed console and placed in storage.
- Storage now have items with offsets so they are more visible in stack pile.
- Removed Air alarm from toxing testing arena, considering it dont have pipes.
* Add RPD in toxing mixing
* batch of fixes (?)
- Changed Art vendor and critter care to free variant.
- Fixed spelling on paper to requested one.
- Now syndicate researchers spawn with 100 credits in their backpack for claw machine, if you run out, ask your coworkers to borrow more cash on game.
* batch of changes:
- Did most requested changes by S34N (except defib one)
- Added APC to hallway, so now hallway use power too.
- Made new subtype of syndicate APC's with offset depending on direction.
* fix stripes issue
* Removed random stripes and syndie having cash
* refactor: datumize security levels
* refactor: implement `SSsecurity_level` for handling security level related stuff
* feat: returns back old `delta_alarm` sound
* refactor: adjust existing code to use `SSsecurity_level`
* fix: remove redundunt new init order
* fix: fix type in var
* refactor: apply reviewer changes
* fix: replace `can_fire=FALSE` with `ss_flags = SS_NO_FIRE`, as subsystem will never fire
* fix: use `flags` instead of `ss_flags` for subsystem
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
* fix: replace old security level interactions
* feat: implement `Recover` proc for `SSsecurity_level`
* refactor: add clearer doc for `security_level_set_timer_id` propery of `SSsecurirt_level`
* refactor: swap `security_level` datum properties to make it clearer to read
* refactor: move initialization code from `New` to `Initialize` for `/obj/machinery/firealarm`
* fix: revert back `delta_alarm` annoing sound, use `delta_claxon` on change to delta security level
---------
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
* proof-of-concept implementation
* clear being_hijacked on death
* it glows in the dark
* oops
* machinery interactions and some fixes
* consistency, correctness, fixes
* stop usage of the \the text macro
* list inits in Initialize
* fix control flow spacing
* review compliance
* event code and some tweaks
* upgradable spell abilities and some tweaks
* how did that happen
* cycle cameras spell
* stat upgrades (no sprites for now)
* tweaking
* sounds
* jecties code
* more tweaks and fixes
* some review stuff
* alt-click user param and charger icon fix
* Remove unused default amounts in objectives
* Comply with sirryan review (part 1)
* Move isapc definition
* Add autodoc comments to all pulse_demon vars
* Give random number in name on init
* Fix merge conflicts
* Remove pulse demon from traitors on Destroy
* Fix mulebot relaymove override
* Fix airlock TGUI actions
* Fix loop over mobs in cablehop
* Attempt to fix overload runtime
* Half-fix gun cooldown issue
* Fix chat related issues
* Attempt to fix overload runtime (take 2)
* Make ion projectiles collide
* Tweak pulse demon speed
* Make demon survive loc being deleted
* Send message when saved by self-sustaining
* Fix vv_edit_var for charge
* Stop people disabling hijacked bots
* Make demon lose more health when not on wires
* Increase costs of stat upgrades
* Allow demon to change its drain speed
* Stop demon obliterating xenos
* Comply with review (partial)
* Fix issues pointed out in reviews
* Allow demon to drain charge of reachable items
* Adjust volume of demon sounds
* Improve cell interactions
* Bump up event weight (for testmerge)
* Give pulse demon a highlight section on orbit menu
* Give demon an experimental soft-counter to insuls
* Reduce volume of most common sounds (again)
* Update demon cable overlay when required
* Stop AI using its tracking ability on pulse demons
* Add wizard spawner for pulse demon
* Tweak EMP behaviour and numbers
* Clear references in Destroy
* Make appear on end of round credits even when dead
* Prevent pulse demon from detonating cyborgs
* Generalise insulated structure check
* Clean up remaining review requests
* Add new sprites
* some addressed reviews
* Typepath changes, GC fixes
* I blame charlie
* good enough
* die or something
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* even more changes
* final tweaks
* what
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* bam
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* to_chatn't
* deconflicted
---------
Co-authored-by: unknownuser782 <126365777+unknownuser782@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Class D and C SM events
* see above
* B-Class events
* A-class events
* S-class events (ebents done)
* Start of console
* datumization p1
* supermatter_event
* beginning of tgui
* adds new circuitboard for anomaly monitoring
* more supermatter event code
* forgot to change last_events
* tgui progression
* fix the freakin errors
* forgot to move this to on_start()
* some small fixes - tgui stuff to change
* bug fixes
* TGUI take two - in progress
* TGUI and circuit board removal for anom console
* Fixes world time spamming events
* S class event fix
* Fixes D class events
* Fixes worldtime based event calling
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* ACTUAL logging
* I blame copypaste
* Goddamit
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Burzah <mbsx@proton.me>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
