Commit Graph

2552 Commits

Author SHA1 Message Date
TheGamerdk
65e3fe7465 CDN Assets + TGChat + Statbrowser Restyle (#10211)
* asset cache cdn

* Fix cdn rsc (#52886)

I was converting this to use length so it didn't have to care if the list existed or not, and forgot to remove the .len. this broke cdn .rsc files because length(num) returns 0.

* Add warning about https to the external rsc config (#53367)

today in hostchat we discovered that most of the servers who tried to 
do cdn the .rsc, had unknown issues because they had used https:// 
urls. Byond can't into https.

like 5 servers had failed to get this to work because of that pitfall, 
so im gonna add a warning to the config.

* tchat

* tgchat compile

* fixes

* Merge pull request #53011 from stylemistake/tgui-chat-fix-asay

tgchat: Fix asay

* chat color

* logging

* webstorage

* compile TGUI

* actually like compiles on the DM side

* Update chat-dark.scss

* Update chat-light.scss

* Update resources.txt

* Update tgui-panel.bundle.css

* Colors

* compile

* s

* s

* Ports Gamers TGChat so we can edit it. - NOT LIVE TGCHAT BRANCH (#10226)

* asset cache cdn

* Fix cdn rsc (#52886)

I was converting this to use length so it didn't have to care if the list existed or not, and forgot to remove the .len. this broke cdn .rsc files because length(num) returns 0.

* Add warning about https to the external rsc config (#53367)

today in hostchat we discovered that most of the servers who tried to 
do cdn the .rsc, had unknown issues because they had used https:// 
urls. Byond can't into https.

like 5 servers had failed to get this to work because of that pitfall, 
so im gonna add a warning to the config.

* tchat

* tgchat compile

* fixes

* Merge pull request #53011 from stylemistake/tgui-chat-fix-asay

tgchat: Fix asay

* chat color

* logging

* webstorage

* compile TGUI

* actually like compiles on the DM side

* Update chat-dark.scss

* Update chat-light.scss

* Update resources.txt

* Update tgui-panel.bundle.css

* Colors

* compile

* s

* s

Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
Co-authored-by: TheSmallBlue <ilanmori@hotmail.com>

* Fixes Replay Chat

* Update to_chat.dm

* Update chat.dm

* Update demo.dm

* yarn berry

* yarn berry compile

* Update resources.txt

* Update config/resources.txt

* Update resources.txt

* Attempt at fixing reconnect.

* Lets try fix it again

* oops

* THROW THE SINK AT IT

* ree

* Makes Travis work again thank you jamie

* Fixes snowflake images

* Update security.dm

* Updates TGChat Test Merge (#10307)

* asset cache cdn

* Fix cdn rsc (#52886)

I was converting this to use length so it didn't have to care if the list existed or not, and forgot to remove the .len. this broke cdn .rsc files because length(num) returns 0.

* Add warning about https to the external rsc config (#53367)

today in hostchat we discovered that most of the servers who tried to 
do cdn the .rsc, had unknown issues because they had used https:// 
urls. Byond can't into https.

like 5 servers had failed to get this to work because of that pitfall, 
so im gonna add a warning to the config.

* tchat

* tgchat compile

* fixes

* Merge pull request #53011 from stylemistake/tgui-chat-fix-asay

tgchat: Fix asay

* chat color

* logging

* webstorage

* compile TGUI

* actually like compiles on the DM side

* Update chat-dark.scss

* Update chat-light.scss

* Update resources.txt

* Update tgui-panel.bundle.css

* Colors

* compile

* s

* s

* Ports Gamers TGChat so we can edit it. - NOT LIVE TGCHAT BRANCH (#10226)

* asset cache cdn

* Fix cdn rsc (#52886)

I was converting this to use length so it didn't have to care if the list existed or not, and forgot to remove the .len. this broke cdn .rsc files because length(num) returns 0.

* Add warning about https to the external rsc config (#53367)

today in hostchat we discovered that most of the servers who tried to 
do cdn the .rsc, had unknown issues because they had used https:// 
urls. Byond can't into https.

like 5 servers had failed to get this to work because of that pitfall, 
so im gonna add a warning to the config.

* tchat

* tgchat compile

* fixes

* Merge pull request #53011 from stylemistake/tgui-chat-fix-asay

tgchat: Fix asay

* chat color

* logging

* webstorage

* compile TGUI

* actually like compiles on the DM side

* Update chat-dark.scss

* Update chat-light.scss

* Update resources.txt

* Update tgui-panel.bundle.css

* Colors

* compile

* s

* s

Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
Co-authored-by: TheSmallBlue <ilanmori@hotmail.com>

* Fixes Replay Chat

* Update to_chat.dm

* Update chat.dm

* Update demo.dm

* yarn berry

* yarn berry compile

* Update resources.txt

* Update config/resources.txt

* Update resources.txt

* Attempt at fixing reconnect.

* Lets try fix it again

* oops

* THROW THE SINK AT IT

* ree

* Makes Travis work again thank you jamie

* Fixes snowflake images

* Update security.dm

Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
Co-authored-by: TheSmallBlue <ilanmori@hotmail.com>
Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Fixes

* Undo Kitchen Sink

* Fucking 7 Hours.

* status panel

* stat panel fixes

* fixes

* stat panel stuff

* Stat panel finish

* Compile, oops

* Update server_maint.dm

* Update world.dm

* Update interface.dm

* tgui compile

* Update subsystems.dm

* fix statpanel deleting whole admin tab (#54211)

fix: adminhelping no longer removes entire admin tab
fix: end of round no longer removes entire admin tab

* Update skin.dmf

* verbs?

Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
Co-authored-by: TheSmallBlue <ilanmori@hotmail.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
Co-authored-by: Couls <coul422@gmail.com>
Co-authored-by: Tad Hardesty <tad@platymuus.com>
Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>
2020-11-10 19:10:27 +00:00
Jamie D
7daccf1f96 Fixes 6th November - Free Miners, Fireaxecabinets, Xray eye exploit, autolathe, runtimes (#10349)
* Fixes

* e

* Update job.dm

* What was I smoking

* Not cigarettes clearly.

* Jesus I must of been drunk
2020-11-07 10:16:15 +00:00
Redmoogle
dbd09a6587 [PORT] Fixes Wrong Garbage Controller Timeouts (#10275)
* Fix

* Fix?
2020-11-04 18:55:44 +00:00
Jamie D
98508e8302 Runechat 1.1 - TG Edition (#10318)
* RUNECHAT UPDATES

* Fixes hologram speech hopefully.

* Update ai.dm
2020-11-04 18:28:54 +00:00
Jamie D
3d3146f8da [Admin] Adds replays to all past notes and future ones, Adds view replay button for clients (#10273)
* ReplaysAndShit

* Update interface/interface.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Hows this

* oopsie

* oops oops

* FAT FINGER

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2020-11-01 18:56:48 +00:00
Mqiib
cb77de4adb Makes polysmorphs mentor only (#10242)
* Hot singles now available

* Recursive is_mentor
2020-11-01 18:50:46 +00:00
Jamie D
e9c958fb11 Revert "Revert "TG performance tweaks - oh-god-please-kill-me-edition ASYNC / SLEEP BAD / Profiler"" (#10254)
* Revert "Revert "TG performance tweaks - oh-god-please-kill-me-edition ASYNC / SLEEP BAD / Profiler (#10207)" (#10252)"

This reverts commit c936816e14.

* FIXES NO BUTTON PRESS BS
2020-10-29 22:15:01 +00:00
Jamie D
c936816e14 Revert "TG performance tweaks - oh-god-please-kill-me-edition ASYNC / SLEEP BAD / Profiler (#10207)" (#10252)
This reverts commit 38f3174826.
2020-10-29 19:54:16 +00:00
Jamie D
38f3174826 TG performance tweaks - oh-god-please-kill-me-edition ASYNC / SLEEP BAD / Profiler (#10207)
* Im sleepy

* Reee

* oopsie Linter go brrrr

* Update code/datums/components/storage/concrete/bag_of_holding.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

* Update code/controllers/subsystem/air.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>
2020-10-29 19:28:57 +00:00
Jamie D
0dd6fae119 [Port] Explosions Subsystem Test 1 (#10202)
* Explosions Subsystem Test 1

* Fucking linter

* Fucking TG Are Dents

* SCREW OFF LINTER
2020-10-28 17:54:13 +00:00
Jamie D
10c9af0d77 Material datums - Moogle Helped - Check #10169 for more info (#10176)
* Hmm

* work please

* Fixes

* Ack

* REEE

* EEEE

* e

* e

* e

* STAND FIX

* Update code/game/machinery/autolathe.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

* Update code/game/machinery/autolathe.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>
2020-10-28 17:53:59 +00:00
Jamie D
b75326696e Revert "Runtimes go BRRR (#10184)" (#10217)
* Revert "Runtimes go BRRR (#10184)"

This reverts commit a701a112d7.

* Revert "speed (#10195)"

This reverts commit 5545556c0a.

* Revert "Lighting Optimizations (#10183)"

This reverts commit 22d231fa16.

* Revert "Update parrot.dm (#10174)"

This reverts commit 94f8365a52.

* Revert "Boodcode ™️ (#10194)"

This reverts commit b8bbc7fda3.

* Revert "add nonlethal to boxing (#10187)"

This reverts commit ff05965daf.

* Revert "Optimize (#10185)"

This reverts commit 5b44f36a07.

* Revert "artist id (#10171)"

This reverts commit aae9995a84.

* Revert "New polysmorph and lizard options (#10165)"

This reverts commit e0ffa081d3.

* Update config.txt

* Revert "Revert "Optimize (#10185)""

This reverts commit afda4150e6.

* Revert "Revert "artist id (#10171)""

This reverts commit 8b9959c995.

* Revert "Revert "New polysmorph and lizard options (#10165)""

This reverts commit 7d0b12fa1a.

* Revert "Revert "add nonlethal to boxing (#10187)""

This reverts commit b37df0036a.

* Revert "Revert "Boodcode ™️ (#10194)""

This reverts commit cea04725e5.

* Revert "Revert "Update parrot.dm (#10174)""

This reverts commit 9061bbecc8.

* Revert "Revert "Lighting Optimizations (#10183)""

This reverts commit 220d307494.

* Revert "Revert "speed (#10195)""

This reverts commit 35c69e5bb1.
2020-10-28 17:46:36 +00:00
Jamie D
a701a112d7 Runtimes go BRRR (#10184)
* Runtimes go BRRR

* Update liver.dm

Co-authored-by: Theos <theubernyan@gmail.com>
2020-10-27 09:39:45 +00:00
swissloaf
0a5d8a2696 Adds the Shuttle Catastrophe Event (#10182)
* w

* Update shuttle_catastrophe.dm

* Update shuttle_catastrophe.dm

* Update shuttle_catastrophe.dm
2020-10-27 09:39:02 +00:00
Jamie D
fb8eeb5a1f Tgui 4.0 - IN PROGRESS (#10116)
* Night 1

* Bit more

* MORE

* JS AND SHIT

* MORE

* IT COMPILES MOSTLY

* More and prepare for tgchat

* Woah there captain, TGUI 4.1 first.

* Shoo

* Copyshites

* Hmm

* Hmm

* Fixxxxx

* Fucking Apcs

* Fuck off autoupdate

* Rename DropDown.js to Dropdown.js

* Vending

* Few Fixes

* More Fixes

* Stand HO

* fixes sleepers without breaking anything else I think

* Oops

* Fixerinos

* Oopsie

* BUNDLE

Co-authored-by: Theos <theubernyan@gmail.com>
2020-10-25 18:34:06 +00:00
alexkar598
745a6f19c8 Better discord linking (#10156)
* Better discord linking

* Might be useful to actually link the account idk
2020-10-25 18:27:01 +00:00
Jamie D
a375ef321e Map and Flare Toggles (#10033) 2020-10-24 12:07:31 +01:00
Redmoogle
b4ddb72c3f [PORT] Baystation Instruments! (but only kinda baystation because I rewrote it nearly from the ground up) (#9894)
* uhhhh

* Fixes missing piano

* Fixes

* fixes the boogaloo

* Spacepods dont exist, shoo

* Fixes legacy instruments

* Revert "Fixes legacy instruments"

This reverts commit 753b0874d6.

* fix accordions

* Removes tone for sanity

* Eat Shit piano conflicts

Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2020-10-17 13:32:05 +01:00
Nichlas Pihl
74b7c5221a Corporations I: Traitors, revheads, IAA, now get paid by their alternative employer as well (#9954)
* adds corporations

* IAA

* spans

* buff donk co abit

* is_employee
2020-10-17 13:26:45 +01:00
Nichlas Pihl
d39970ef44 adds Ash's thing (#9907)
* adds Ash's thing

* ashfix

* lmao
2020-10-17 12:51:20 +01:00
Takahiru
2038e0f7a1 SKILLCAPES (#9818)
* Skillcapes

* imagine accidentally removing a proc

* what

* centcom

* What gamer wants, makes admin/mentor/ghost skillcapes autodrobe only.

* Antag cape added to uplink

* What gamer actually wants

* Update global_lists.dm

* Update preferences.dm

* Update code/modules/client/preferences.dm

count++

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

* nichchange 2

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>
2020-10-14 11:55:02 +01:00
PrinceKirze
7916c13978 more ways for cargo to make money (#9895) 2020-10-06 12:13:14 +01:00
Jamie D
9e12b0fac7 Space Man Thing (#9865) 2020-10-02 15:54:45 -04:00
FLME
8d85df791a fixed? (#9843) 2020-10-02 20:10:59 +01:00
alexkar598
07db45967e Makes playtime more accurate by tracking how much time has passed since the last time the subsystem was fired as SUBSYSTEM FIRES ARE NOT A UNIT OF TIME!!! (#9859) 2020-10-02 15:15:30 +01:00
Jamie D
8b4f895cf4 Revert "Adds a new round end sound (#9698)" (#9714)
This reverts commit 15113bd4be.
2020-09-24 19:43:57 +01:00
missatessatessy
b287772b6d Polysmorph Race (#9600)
* Polysmorphs

Attempts to try add em

* some desc changes

* added actual icons

* changesource flags

* Blood?

* Update polysmorphs.dm

* Small fixes, sprites

* Update polysmorphs.dm

* beep

* TAILS

WHY WONT THE TAILS FUCKING WORK

* I cry

* Update polysmorphs.dm

* Update eyes.dm

* crying noises

* I think it works

* names + languages

* overlay

* Touch up
2020-09-24 19:03:44 +01:00
alexkar598
f4f86ee9b4 Actually fixes admins not loading properly (#9747)
* Reverts the Jamie

* Actual fix
2020-09-18 09:50:46 -04:00
Jamie D
dd8b832dcd Temp Admin Fix (#9745) 2020-09-18 12:55:34 +01:00
Maxim Nikitin
15113bd4be Adds a new round end sound (#9698)
* Adds a new round end sound

* Add files via upload

* maybe not remove the backslash
2020-09-14 19:55:00 +01:00
Theos
19ce2c32e3 Port heretics from TG (#9479)
* heretics port

* fix conflict

* Update eldritch_book.dm

* forgot UI

* make summons not permanently fuck up a rune probably doesnt ruin anything else

* think I can do this

* cleave invocation is now cool

* armsy fixes also changes study back to research since it fucks with the order of stuff

* COOL descriptions for monsters

* make rust final based by giving stun immunity

* make ash final based by giving stun immunity

* somehow missed these

* fix world icon for cult robes

* flesh grasp effect actually works and ghouling is countered by mindshields

* don't need . = ..() just ..()

* probably fixes amulet

* fix amulet

* probably fix stalk

* fuck tgui

* Update eldritch_antag.dm

* make antag hud work

* ~10 seconds of silence on mansus grasp

* move antag hud stuff to the right icon file
2020-09-08 22:54:59 +01:00
alexkar598
c7a510b049 Turns replays into a background system, hopefully making lag less noticable (#9561) 2020-08-29 16:08:38 -04:00
alexkar598
6ee45dc2ff Fixes nullentries in admin statistics whoops (#9572)
* e

* Update blackbox.dm
2020-08-25 09:32:35 -04:00
alexkar598
0642716f16 Changes the way admin stats are counted to ignore afkmins and maintainers or whatnot (#9569) 2020-08-24 20:38:22 -04:00
alexkar598
22206df78b Removes Gamer's unfunny memes (#9528) 2020-08-21 16:44:24 -04:00
Nichlas Pihl
c3f8cc6d42 Adds alert status to the stats tab (#9500) 2020-08-20 21:20:25 -04:00
boodaliboo
def79dbb0b ports researching boosting nanites (#9451)
* Update utility.dm

* Update nanite_designs.dm

* Update all_nodes.dm

* Update nanites.dm
2020-08-15 14:30:34 +01:00
AutisticFroggy
8059fd67b2 Rebalances Energy Harvester - now ready for balance testing! (#9248)
* Da Basics

Adds the power scaling.

TODO:
- Make UI
- Get Balance feedback and implement

* part 2 stilll doesn't compile boogaloo

* Going to sleep: I do not trust the Stash Feature edition.

* reworked money payments

tgui fixes to come tomorrow

* powernet connects and disconnects properly

* saving....

* tgui finally works as intended

* ALEXKAR CODERSOCKS DEMANDS AUTODOC COMPLIANCE

* Now synced to SSEconomy

* Whoops forgot to divide by 10!

* Additional autodoc

* Base of the ntos program for it.

* base tgui for ntos

Co-authored-by: mix <mgadevera@gmail.com>
2020-08-12 09:53:51 -04:00
ynot01
26c9380647 New roundend sound - jonathan frakes telling you you're wrong (#9408)
* this one was invented by a writer

* we made it up

* We gotcha
2020-08-12 09:52:02 -04:00
Nichlas Pihl
a1beb61283 Fixes achievements (#9360)
* Fixes altoids' mess

* comments achievements.dm

* woops

* autodoc for achievement browser

* autodoc for the achievement datum itself
2020-08-08 16:46:28 -04:00
alexkar598
8f28f4112d Fixes demos MC entry not working, fucking monster (#9388) 2020-08-04 20:30:10 -04:00
ike709
59a7cff852 CentCom Galactic Ban DB (#9342)
* CentCom Galactic Ban DB

* appeases yogs
2020-08-01 18:54:21 +01:00
alexkar598
8b963c9626 Documents 61 files (#9306)
* Document the world (#46495)

* Document drone verbs.dm

* Document the outfit datum with autodoc (#45415)

* Uncurse take_damage and document obj_defense.dm (#45146)

The original take_damage proc defined vars for no good reason had some 
duplicate code and wasn't very readable.

If you are wondering why it calls obj_break every time it takes damage 
while below integrity_failure, that's the way it used to be. Most (if 
not all) stuff that takes advantage of this functionality already 
accounts for this.

* Convert some code docs into the auto doc format (#45101)

* Commit Message

* Fixes

* e

* Documents browserOutput.dm (#51439)

* Add autodoc to the callback datum (#45463)

* Autodoc the vending machine (#45468)

* Autodoc the vending machine

* Update code/modules/vending/_vending.dm

Co-Authored-By: Tad Hardesty <tad@platymuus.com>

* autodoc organ helpers (#45464)

* timer proc autodocs (#46530)

* bunch of define autodocs

* ballistic guns autodoc (#45578)

* ballistic guns autodoc

* fixes

* client vars autodoc (#46446)

About The Pull Request

Autodocs client vars

* Autodoc for XB and Research

* shuttle docking autodoc (#48677)

* Add autodocs for reagents (#49478)

* Fix

Co-authored-by: oranges <email@oranges.net.nz>
Co-authored-by: Jonathan (JJRcop) Rubenstein <jrubcop@gmail.com>
Co-authored-by: nemvar <47324920+nemvar@users.noreply.github.com>
Co-authored-by: alexkar598 <>
Co-authored-by: Tad Hardesty <tad@platymuus.com>
Co-authored-by: spookydonut <github@spooksoftware.com>
Co-authored-by: actioninja <actioninja@gmail.com>
2020-07-24 21:38:47 -04:00
swissloaf
38d4d9e13e Major Swarmer Rework (#9079)
* Swarmer Rework

* Fix

* Update swarmer.dm

* FINAL FIX

* test

* Revert "test"

This reverts commit a38d7a0f6e.
2020-07-24 19:06:24 -04:00
swissloaf
1b82814f9f Nice (#9249) 2020-07-21 22:33:48 +01:00
TheGamerdk
7e59818eb3 changes (#9243) 2020-07-21 22:32:46 +01:00
swissloaf
7b6897a49f Adds Gamma and Epsilon Alert Level (#9244)
* NOICE

* Sounds

* Noice

* Update security_levels.dm

* Update security_levels.dm

* Update security_levels.dm

* Update security_levels.dm

* Update security_levels.dm

* Update security_levels.dm

* Update security_levels.dm

* noice

* Update special_shadowling_abilities.dm
2020-07-18 18:36:55 -04:00
TheGamerdk
63ecc2a6dd Removes Budget Cards (#9133)
* Remove Budget Cards

* Percentage Based Salary

* Update code/controllers/subsystem/economy.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

Co-authored-by: genessee596 <46986487+genessee596@users.noreply.github.com>
Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
2020-07-16 15:31:19 -04:00
Jamie D
ff83c432cd Fixes Admin/Mentor Activity Tracking - Fucking Database Upgrades (#9152)
* Might actually fix Activity

* Fixes Activity
2020-07-07 22:10:26 +01:00
Jamie D
9cb0f08caf Cryopods (#8727)
* First commit

* Next

* oh god why

* Oopsie - thats for debug

* Fixes and Admincryo

* Area and icon for map - oopsie

* puts them on box

* Directional Sprites

* Revert "Merge branch 'Cryopods-Oh-God-Why-Help-me-This-wont-work' of https://github.com/JamieD1/Yogstation into Cryopods-Oh-God-Why-Help-me-This-wont-work"

This reverts commit a546410348, reversing
changes made to 74c51ad5d2.

* Revert "Revert "Merge branch 'Cryopods-Oh-God-Why-Help-me-This-wont-work' of https://github.com/JamieD1/Yogstation into Cryopods-Oh-God-Why-Help-me-This-wont-work""

This reverts commit 0902448c1f.

* rotates the sprites on the map properly

* conflict resolved

* map

* omega

* Fixes logging and adds an area check

* Fixes and offer!

* Fixes offer to randoms

* Alexkar Review Part 1

* CONFLICTS

* Conflict2

* Conflict3

* brick

* notsobrick

* omega and eclipse

* probably fixes it

* :pensivecowboy:

* TURDIS

* Fucking conflicts

* Merge

* yeets vr and the leftover easel on meta

* Alexkar Part 1

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Alexkar Part 2

* Compile Edition

* Add files via upload

* Conflicts

* Cornflakes

* Fucking Cornflakes

* Alexkar

* Cornflakes

* Cornflakes 2

* Fix

* Fucking Cornflakes

* Add files via upload

* REEEEE

* Test

* Revert "Test"

This reverts commit d0655fe98e.

* REEEEE

* fuck

* this

* shit

* Im

* out

* Merge now

* MERGE TIME

Co-authored-by: partykp <patpol4@protonmail.com>
Co-authored-by: Theos <theubernyan@gmail.com>
Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
2020-07-04 15:33:01 +01:00