Commit Graph

35363 Commits

Author SHA1 Message Date
SkyratBot
5217a99d88 we hate jannies (#60883) (#7647)
Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
2021-08-19 19:39:51 -04:00
SkyratBot
ad35f582a9 i have moved some bible exorcism functionality to a signal on soulstones (#60768) (#7622)
moves functionality of exorcising soulstones to soulstones themselves

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-08-19 14:27:31 -04:00
SkyratBot
b95cc44e35 Fix mulebot movement while controlled by a player (#60909) (#7636)
Co-authored-by: Tim <timothymtorres@gmail.com>
2021-08-19 14:25:08 -04:00
GoldenAlpharex
67c0375d0b Removes what I added due to wrong order (#7640)
Didn't have time to propose the changes on the PR but oh well.
2021-08-19 12:00:32 -04:00
SkyratBot
40c5a53613 puts chem mass spectrometer inline with other machines (#60896) (#7634)
Co-authored-by: manofpepsi <71612753+manofpepsi@users.noreply.github.com>
2021-08-19 11:44:53 -04:00
SkyratBot
af632bec7f fix ntnet circuit components (#60917) (#7633)
* fix ntnet

* fix typos and switcheroos

* whoops, tracked a test circuit json.

Co-authored-by: Gurkenglas <gurkenglas@hotmail.de>
2021-08-19 11:44:07 -04:00
SkyratBot
d8436f2d9f Fixed duplicator (#60912) (#7632)
Co-authored-by: Watermelon914 <3052169-Watermelon914@users.noreply.gitlab.com>

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Watermelon914 <3052169-Watermelon914@users.noreply.gitlab.com>
2021-08-19 11:42:52 -04:00
SkyratBot
6857b80531 Lazy fix for wizards spawning without a spellbook when they roll the die of fate and missing a limb (#60506) (#7631)
Co-authored-by: jughu <melvin2626@live.nl>
2021-08-19 11:41:59 -04:00
SkyratBot
58d1efe477 Hahaha, Johnathan, you GAGS'ified my beret (#60884) (#7630)
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-08-19 11:41:10 -04:00
SkyratBot
c9f906c1cc Fix picture metadata storing json strings inside json. (#60911) (#7629)
Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
2021-08-19 11:40:19 -04:00
GoldenAlpharex
77d5f9cb43 [SEMI-MODULAR] Adds an override to allow the use of icon2html RARELY when we need it, fixing in the same swoop the in-game GAGS coloring screen (#7615)
* Adds an override to allow the use of icon2html in rare cases

* That should've been properly documented as SKYRAT EDIT, whoops
2021-08-18 02:29:25 +01:00
Gandalf
e845d444d0 Kills a few hardels we created. (#7614)
* a

* Update liquid_effect.dm

* Update create_and_destroy.dm

* Update create_and_destroy.dm

* Update kink_collars.dm

* Update pillow.dm

* Update zombie.dm
2021-08-18 00:21:00 +01:00
SkyratBot
169c42a262 [MIRROR] Refactors connect_loc_behalf into a component (#7613)
* Refactors connect_loc_behalf into a component (#60678)

See title. Also refactors caltrops into a component because they use connect_loc_behalf which requires them to hold the state.

This also fixes COMPONENT_DUPE_SELECTIVE from just outright not working.

connect_loc_behalf doesn't make sense as an element because it tries to hold states. There is also no way to maintain current behaviour and not have the states that it needs.
Due to the fact that it tries to hold states, it means the code itself is a lot more buggy because it's a lot harder to successfully manage these states without runtimes or bugs. 

On metastation, there is only 2519 connect_loc_behalf components at roundstart. MrStonedOne has told me that datums take up this much space:
image

If we do the (oversimplified) math, there are only ever 5 variables that'll likely be changed on most connect_loc_behalf components at runtime:
connections,
tracked,
signal_atom,
parent,
signal_procs

This means that on metastation at roundstart, we take up this amount: (24 + 16 * 5) * 2519 = 261.97600 kilobytes
This is not really significant and the benefits of moving this to a component greatly outweighs the memory cost.

(Basically the memory cost is outweighed by the maint cost of tracking down issues with the thing. It's too buggy to be viable longterm basically)

* Update glass.dm

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-17 20:29:11 +01:00
SkyratBot
cae8396538 [MIRROR] tgui maintenance chores (#7597)
* tgui maintenance chores

* AAAAAA

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-17 19:15:40 +01:00
SkyratBot
8ff0b49bc6 [MIRROR] Extends suspicious login logging to players with a banned account in their connection history. (#7590)
* Extra loog (#60869)

* Extends suspicious login logging to players with a banned account in their connection history.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-08-17 18:59:30 +01:00
SkyratBot
b0c01e40af [MIRROR] Del The World: Unit testing for hard deletes (#7589)
* Del The World: Unit testing for hard deletes (#59612)

Co-authored-by: SteelSlayer <42044220+SteelSlayer@ users.noreply.github.com>

* Del The World: Unit testing for hard deletes

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@ users.noreply.github.com>
2021-08-17 18:58:57 +01:00
death and coding
313a941538 [modular][ready]transfers the old cowboy poncho to the neckslot and adds obj sprites for mantles (#7586)
* [modular][ready]transfers the old cowboy poncho to the neckslot

* blood b gone

* Update cloaks.dm

* FINALLY

* AAAAAAAAAAAAAAAAAAAAA FIXES

* Update neck.dmi

Co-authored-by: louiseedwardstuart <bonniefluff>
2021-08-17 13:46:05 -04:00
Gandalf
a43b8c5fc4 Nanotrasen Fleet Command Expansion (#7418)
* A

* Update centcom_computers.dm

* a

* Update CommandReportConsole.js

* commandreporter

* Update command_report_computer.dm

* a

* FEET COMMAND

* a

* e

* e

* Update departments.dm

* F

* a

* a

* Update new_player.dm

* Update new_player.dm

* AAAAAA

* Update zombie.dm

* Update zombie.dm

* aaaaaaa

* 0

* a

* Update CentCom_skyrat.dmm

* aa

* Update nsstitan.dmm

* A

* Update station_goal_computer.dm

* Update station_goal_computer.dm

* Update bridge_officer.dm

* Update CentCom_skyrat.dmm

* Update pda.dm

* Revert "Update pda.dm"

This reverts commit fbe1823726f9edb7f7c3ba03c2d34b08b46ae294.

* logic

* cargo system

* 0

* Update import_console.dm

* Update cargo_skyrat.dmm

* noob coder

* Update cargo_shuttle_console.dm

* a

* Update deck_crew.dm

* Update export_console.dm

* Update deck_crew.dm

* 0

* Update CentCom_skyrat_z2.dmm

* AAAA

* 0

* Update CentCom_skyrat_z2.dmm

* Update cargo_shuttle_console.dm

* Update CentCom_skyrat_z2.dmm

* a

* SELLING CREW IS BAD.

* a

* Update supply.dm

* Update CentCom_skyrat_z2.dmm

* Update supply.dm

* A

* a

* a

* Update zombie.dm

* Update modular_skyrat/modules/central_command_module/code/jobs/fleetmaster.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-08-17 18:43:19 +01:00
GoldenAlpharex
1ed7db16bb Minor beret fixes (#7587) 2021-08-17 18:42:18 +01:00
SkyratBot
0d66c3ef14 [MIRROR] Fix a bad to_chat call (#7611)
* Fix a bad to_chat call (#60893)

* Fix a bad to_chat call

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2021-08-17 13:35:50 -04:00
SkyratBot
37268abb23 [MIRROR] Fixes NTNet Transmitters not working (#7592)
* Fixes NTNet Transmitters not working  (#60871)

* Fixes NTNet Transmitters not working

Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
2021-08-17 13:29:49 -04:00
jjpark-kb
4fc56175f2 small warning (#7606) 2021-08-17 16:13:30 +12:00
SkyratBot
8794b3bcff [MIRROR] Fixes right click on circuit controller (#7584)
* Fixes right click on circuit controller (#60840)

Co-authored-by: Colovorat <lolqwert569@ gmail.com>

* Fixes right click on circuit controller

Co-authored-by: Colovorat <35225170+Colovorat@users.noreply.github.com>
Co-authored-by: Colovorat <lolqwert569@ gmail.com>
2021-08-15 23:53:21 +01:00
SkyratBot
7a1d3700bb [MIRROR] Drugs of the 26th century. Three new hella rad drugs, one less lame drug and more! (#7481)
* Drugs of the 26th century. Three new hella rad drugs, one less lame drug and more!

* Update traits.dm

* Update maint_loot_trash.dm

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-15 23:52:58 +01:00
SkyratBot
1b4eb35853 [MIRROR] Fixes new ticket ahelp message double sanitizing (#7561)
* Fixes new ticket ahelp message double sanitizing

* Update adminhelp.dm

Co-authored-by: Wayland-Smithy <64715958+Wayland-Smithy@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-15 23:45:48 +01:00
SkyratBot
40cb513cfd [MIRROR] Mindshielding now sends a signal, and is dealt by the antagonist (#7573)
* Mindshielding now sends a signal, and is dealt by the antagonist (#60850)

Mindshielding people isn't hardcoded to the mindshield's implanting anymore, instead sending a signal, which I find better in the long run (especially for downstreams).

* Mindshielding now sends a signal, and is dealt by the antagonist

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
2021-08-15 23:44:03 +01:00
Gandalf
c46a2a7ac9 Ports pollution from Horizon - Original PR: https://github.com/hrzntal/horizon/pull/468 (Made by Azarak) (#7453)
* AAAAAAAAAAA

* pollution scrubbbies

* fires cause smoke, right? Also NSS journey has scrubbies

* washing things removes the smell!

* what the fuck were you doing last night

* Update temporary_pollution_emission_component.dm

* space turfs shouldn't have pollution

* Fix air now fixes smoke

* Update pollution.dm

* Update pollution.dm

* Update bonfire.dm
2021-08-15 23:41:20 +01:00
SkyratBot
b9ca4fb280 [MIRROR] Fixes a minor client disconnection runtime (#7567)
* Fixes a minor client disconnection runtime

* Update sql_ban_system.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-15 23:39:49 +01:00
SkyratBot
d4e11d2080 [MIRROR] Redoes how alarms are handled, moves their behavior to datums (#7547)
* Redoes how alarms are handled, moves their behavior to datums

* a

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-15 23:38:01 +01:00
SkyratBot
82503aaa29 [MIRROR] repaths wood/bar table to wood/shuttle_bar, and small shuttle fix (#7519)
* repaths wood/bar table to wood/shuttle_bar, and small shuttle fix (#60730)

we recently had an issue where the table/wood/bar table was used all over icebox service, because a mapper thought that was just a wood table meant for the bar, but in reality its a special indestructable, non-deconstructable table that you cant even climb on, its meant for centcom and shuttles so people cant harrass the barstaff. it was fixed already, however in order to remove future confusion it will now be pathed as shuttle_bar so you cannot mistake this as something to use outside of a shuttle (and if you do, then you should learn to read a little more critically)

also fixed an apparent error in the bar shuttle that existed somehow, namely that a chair put a ";" followed by a tab.... for no reason

* repaths wood/bar table to wood/shuttle_bar, and small shuttle fix

* Update CentCom_skyrat.dmm

* Update freezer.dm

Co-authored-by: 小月猫 <alina.r.starkova@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-15 23:35:13 +01:00
SkyratBot
0331c496c7 Fix merge skew from NTNet components (#7549)
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-15 23:12:35 +01:00
SkyratBot
430d8712ee [MIRROR] Adds 3 new NTNet components (#7546)
* Adds 3 new NTNet components (#60557)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Adds 3 new NTNet components

Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-08-15 23:11:26 +01:00
SkyratBot
a1c7bd4bae [MIRROR] knockback component to element. (#7542)
* knockback component to element.

* Update tgstation.dme

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update freezer.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-08-15 23:09:21 +01:00
SkyratBot
839a703c5e [MIRROR] Adds new config flag to mirror logging of suspicious failed logins to its own file. (#7538)
* Adds new config flag to mirror logging of suspicious failed logins to its own file.

* Update IsBanned.dm

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-15 22:59:50 +01:00
BluBerry016
b51a259aa3 [Semi-Modular] Stops Jacob's Ladder From Piercing Space Ruins (#7470)
* jacobs ladder change

* woo

* ok
2021-08-15 22:55:02 +01:00
jjpark-kb
43182194a6 scythes and vine (#7534)
* scythes and vine

* revert any change here

* fix right hand holding and swiping issue

* add the back icons for scythes as well
2021-08-15 22:54:18 +01:00
linnpap
527924a756 [NON-MODULAR] Feline Trait (#7523)
* nya

* 1984

* span notice shit

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2021-08-15 22:53:33 +01:00
Deek-Za
29397dbfdb Fixed CDO Access (#7575)
Honestly. This has been overdue for months. CDO can finally do their job without risking access to the equipment or detective lockers.
2021-08-15 22:51:09 +01:00
SkyratBot
71efbf24e9 [MIRROR] Removes a source of nonexistent parent pipenets during update (#7569)
* Removes a source of nonexistent parent pipenets during update (#60853)

Shouldn't have any visible effects. Atmos machines would occasionally complain about parent pipenets not existing during an update and this should resolve a category of those kinds of warning.

(This is a pain side effect of rebuilding being non instant, shoulda been dealt with a long time ago. Thank you -Lemon)

* Removes a source of nonexistent parent pipenets during update

Co-authored-by: Emmett Gaines <ninjanomnom@protonmail.com>
2021-08-15 22:50:24 +01:00
SkyratBot
6d9b030c05 [MIRROR] Healium crystal changes (#7566)
* Healium crystal changes (#60477)

Healium crystals now straight up fix the air in a room instead of giving an undetermined amount of gas
Area fixed is now a 7x7
Changed the recipe to no longer require freon but O2 instead

* Healium crystal changes

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-08-14 22:51:47 -04:00
SkyratBot
38c48e4e38 [MIRROR] Pipe color name fix (#7565)
* color fix (#60857)

Fixes constructed atmos devices' name being always grey

* Pipe color name fix

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-08-14 22:51:06 -04:00
SkyratBot
cea4eaa222 [MIRROR] Crystal foam - crystallizer new recipe (#7564)
* Crystal foam - crystallizer new recipe (#60535)

Adds crystal foam, a crystal grenade made in the crystallizer from CO2, N2O and H2O. When used it will release a big foamed area that will close any breaches, similar to the smart foam grenade.

* Crystal foam - crystallizer new recipe

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-08-14 22:50:49 -04:00
SkyratBot
26e312243d [MIRROR] HFR fuel issue fix (#7553)
* HFR fuel issue fix (#60813)

* HFR fuel issue fix

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-08-14 22:48:56 -04:00
SkyratBot
b3d9d870ab [MIRROR] Moved all the integrated circuit core files into a new subfolder called core (#7550)
* Moved all the integrated circuit core files into a new subfolder called core (#60787)

Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>

* Moved all the integrated circuit core files into a new subfolder called core

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>
2021-08-14 22:47:28 -04:00
SkyratBot
cce2a26c1c [MIRROR] Clipboard improvements and fixes (#7545)
* Clipboard improvements and fixes (#60792)

* Paper now updates automatically on the clipboard and stamps can finally be used properly!

Also, added support for pens that would be integrated to clipboards, so they couldn't be removed.

* Removing the testing clipboard

* Update Clipboard.js

Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>

* Clipboard improvements and fixes

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
2021-08-14 22:41:09 -04:00
SkyratBot
b0d64bd0f5 [MIRROR] Ethereal food buffs. (#7544)
* Ethereal food buffs. (#60298)

* charge buffs

* Removes REM

* Ethereal food buffs.

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
2021-08-14 22:40:23 -04:00
Funce
40c3ff48b7 Organized runtime viewer now has number of runtimes (#7557) 2021-08-14 16:00:08 +01:00
Lamella-0587
a702f9bd9f organic interface update (#6740)
* initial

* whoops

* more fixes

* forgot

* frick

* oop

* minor visual fixes

* cleared out-of-date stuff that was asimilated by erp update. ye, sry for that but useroth said i can if i need to

* interface fixes + cleaned trash.

* fixesss

* more fixes

* other interface fix and im dumb

* text and fonts fixes

* mapfixes

* small item fix

* floppa my beloved

* fixme

* yepp

* little addition to vibrator

* more user friendly toys

* hotfix because im dumb

* informing user about stuff happening in their genitals

* Fixed strip menu for new slots

* Vibrating toys now makes constant vibration sounds.

* fucking ton of fixes, i debugged so much stuff i want to die when did i slept last time

* signal vibrator fixes

* i guess its all bugs for now, need testing

* hotfix

* chemicals fixed. other dumb bug fixed too

* feex

* undo

* aight, some text stuff

* repsrited signal vibrator, fixed some dumb bugs. Almost ready for tommorrow pr.

* tried to fix things, need to test

* fixed?

* maybe now its fixed

* we finished here.

* yeah, credits. I forgot them.

* Oh well, resolved the conflict wrong.

* map fixed

* formatting test

* more linter stuff

* did changed that skyrat asked me to

* kinda fixed more stuff

* remove mapchanges

* no magic like kat magic

* please

* further mapchanges removal

* fix

* little fix, because one map supposed to be changed.

* quick structure fixes + balance stuff

* some fixes. remind - fix worn tomorrow.

* ah fuck it, i fixed it now. Who need sleep anyway?

* furnitures are no longer invuln

* fixes poles

* milking machine uses cuffs instead

* makes stuff uses cuffs

* frick

* fix lints

* stuffe

* line

* Forgot to add this little feature

* OKAY FINE I GUESS 10 MINUTES IS TOO MUCH.

* squashed bugs

* minor fix to prevent visual bugs with pillow piles.

* frick

* removed logging

* pref for toys

* tabs

* suggested idea added

* hot fix

* Revert "suggested idea added"

This reverts commit 33796f0abb896b83d02dbefee4e3b62df5f6a5db.

* Revert "hot fix"

This reverts commit bf0bc6330f5897ce2d67bb9571eb818d3a64325b.

* fuck the suggestions, i just want it to work fine

* fuck the suggestions, i just want it to work fine

* truly fixes lints

* balance tweaks + fleshlight fixed

* more balance tweaks

* gasmask fixes. Now it doesn't kill people but still makes them suffer

* fix ball mittens

* dead people tell no tales

* some minor fixes

* grammars

* add messages

* use a new pref

* simple check

* knock-knock. Who? A fix.

* fuck

* fixes vibrators

* hexacrocin now can be cured properly

* fix x_stand

* frick

* FUCK

* fixes everyonr being horny

* fixes pain

* fixes strapon

* stop process

* nymphomania fixed

* fix spam

* fixed heels and quirks

* Dead people shouldn't cum

* Knock-knock. A penis enlarger fix

* use the traits goddamn it

* Nymphomania fix

* Fucking moths can't now chomp vibrators

* Added yes/no check to climax button, also some improvements and multiple messages bugfix

* milking machine balance tweaks, bimbo trauma fix

* milking machine construction messages added

* some fixes

* Revert "Fucking moths can't now chomp vibrators"

This reverts commit 2bf37ca3b0b98c3bbd7bf35626faa7a0be54fcfb.

* little clean up of code, but it still doesn't works properly

* fuck the moths. You can't eat vibrators once more.

* catsuit bug fix

* balance tweaks

* Pillows now made of cloth, not metal.

* pillow fixes

* masochism quick fix

* dumb quickfix, it will break anything, don't panic

* yay now it works again

* nymphomania fix

* clean up

* half of ball mittens fix. For another half buy our DLC just for 2,99$!

* IM COOL I FIXED THE BALL MITTENS! FINALLY!

* prefs now works properly

* pain stuff fixed, i guess. no more arousal by decompression damage.

* lol how did i missed those

* can't buckle fucking cows to milker anymore

* oops

* me cool

* fixed small bug with pillows

* gasmask quick fix

* fix spam

* fixes strapon

* balance stuff.

* fix because im dumb

* fix

* the last fix for this codebomination. I hope this is it.

Co-authored-by: Katherine Kiefer <sterlite2902@gmail.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
2021-08-13 19:33:44 +02:00
SkyratBot
1381a827ae [MIRROR] Display round id in notes panel (#7524)
* Display round id in notes panel

* fix
2021-08-13 19:33:14 +02:00
SkyratBot
db78fbb47a [MIRROR] Adds Circuit variables (#7539)
* Adds Circuit variables (#60590)

Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>

* Adds Circuit variables

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>
2021-08-13 17:23:58 +01:00