Merge branch 'Aurorastation:master' into master

.editorconfig

@@ -1,10 +1,22 @@
+# http://editorconfig.org
+root = true
+
 [*]
-indent_style = space
-indent_size = 2
+indent_style = tab
+end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.dm]
-indent_style = tab
-indent_size = 4
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.py]
+indent_style = space
+
+[*.md]
+trim_trailing_whitespace = false
+
+[Dockerfile]
+indent_style = space

.gitattributes

@@ -1,54 +1,46 @@
-# merger hooks, run tools/hooks/install.bat or install.sh to set up
-*.dmm text merge=dmm eol=crlf
-*.dmi binary merge=dmi
-
-# force changelog merging to use union
-html/changelog.html merge=union
-
-# Enforce Line Endings
 * text=auto
 
-*.ai binary
+## Enforce text mode and LF line breaks
+*.bat text eol=lf
+*.cjs text eol=lf
+*.css text eol=lf
+*.dm text eol=lf
+*.dme text eol=lf
+*.dmf text eol=lf
+*.htm text eol=lf
+*.html text eol=lf
+*.js text eol=lf
+*.json text eol=lf
+*.jsx text eol=lf
+*.md text eol=lf
+*.ps1 text eol=lf
+*.py text eol=lf
+*.scss text eol=lf
+*.sh text eol=lf
+*.sql text eol=lf
+*.svg text eol=lf
+*.ts text eol=lf
+*.tsx text eol=lf
+*.txt text eol=lf
+*.yaml text eol=lf
+*.yml text eol=lf
+
+## Enforce binary mode
+*.bmp binary
+*.dll binary
+*.dmb binary
 *.exe binary
-*.fla binary
 *.gif binary
-*.jar binary
 *.jpg binary
-*.mid binary
-*.ogg binary
-*.pdb binary
 *.png binary
-*.psd binary
-*.s3m binary
-*.sav binary
 *.so binary
-*.svg binary
-*.wav binary
-*.xcf binary
-*.xlsx binary
 
-*.awk text
-*.bat text
-*.conf text
-*.cpp text
-*.cs text
-*.css text
-*.dm text
-*.dmf text
-*.gitkeep text
-*.hook text
-*.html text
-*.java text
-*.js text
-*.json text
-*.log text
-*.map text
-*.md text
-*.php text
-*.py text
-*.scss text
-*.sh text
-*.sql text
-*.tmpl text
-*.txt text
-*.vue text
+## Merger hooks, run tools/hooks/install.bat or install.sh to set up
+*.dmm text eol=lf merge=dmm
+*.dmi binary merge=dmi
+
+## Force tab indents on dm files
+*.dm whitespace=indent-with-non-tab
+
+# force changelog merging to use union
+html/changelog.html merge=union

.github/CODEOWNERS

@@ -34,10 +34,10 @@
 /code/__defines/organs.dm @NonQueueingMatt
 /code/modules/organs/ @NonQueueingMatt
 
-# VueUI, it would be @Karolis2011 but no repo write access
-/code/modules/vueui/ @NonQueueingMatt
-/vueui/ @NonQueueingMatt
-/code/__defines/vueui.dm @NonQueueingMatt
+# UIs. Wildkins or Matt.
+/tgui/ @JohnWildkins
+code/__defines/tgui.dm @JohnWildkins
+code/modules/tgui @JohnWildkins
 
 # Tools, often binary in nature, let arrow and alb know
 /tools/ @Arrow768 @Alberyk

.github/CONTRIBUTING.md

@@ -225,20 +225,12 @@ All tables for the database should be prefixed according to the following list:
 # HTML UI Standards
 
 ### UI conversion policy
-Due to our current situation with 5 different HTML UI systems we are now enforcing a policy that all new UIs should be made using the VueUi UI system. This policy also applies to editing existing UIs, with the following exceptions:
+Due to our current situation with 5 different HTML UI systems we are now enforcing a policy that all new UIs should be made using the TGUI system. This policy also applies to editing existing UIs, with the following exceptions:
 
  1. Modification is security / severe bug fix.
  0. It is typo fix.
  0. Touched UI file is too large.
- 0. VueUi can't accommodate that type of UI.
+ 0. TGUI can't accommodate that type of UI.
 
 ### Responsiveness
 All new UIs must be responsive, that means that when parameters change in game world, UI data must update as quickly as possible to reflect that change. If change is time dependant, then client side time approximation should be used.
-
-### Conditional usage policy
-If you need to use conditional rendering inside UI, then try to put conditional statements on elements you want to hide, then try using `<template>` to apply condition to multiple components.
-
-For conditional rendering try to prefer to use `v-show` attribute when change is expected to be often occurring. Use `v-if` when you need `v-else` and switch is expected expected not often.
-
-### Reusability
-If there is segment of UI that is used multiple times with different content, then we strongly encourage making of new component. If that component is general or may be reused globally, then it should be made in to global component (placed in `vui` folder), else it should be made in to UI specific component that must be placed in folder inside `view` folder.

.github/ISSUE_TEMPLATE/BUG-REPORT.yaml

@@ -16,8 +16,6 @@ body:
     options:
       - label: I have searched the bug with a few keywords, and I confirm this bug was not yet reported.
         required: true
-      - label: The round I am reporting the bug from, or I am going to talk about, has already ended.
-        required: true
 
 - type: dropdown
   id: location

.github/labeler.yml

@@ -0,0 +1,50 @@
+# Folder Rules
+'Changelog Required':
+- '!html/changelogs/*.yml'
+
+Database:
+- SQL/*
+
+'🗺️ Mapping - Aurora':
+- maps/aurora/*
+
+'🗺️ Mapping - Away Ship/Away Site':
+- maps/away/*
+
+'🗺️ Mapping - Dungeon':
+- maps/dungeon_spawns/*
+
+'🗺️ Mapping - Event':
+- maps/event/*
+
+'🗺️ Mapping - Random Ruins':
+- maps/random_ruins/*
+
+'🗺️ Mapping - Runtime':
+- maps/runtime/*
+
+'🗺️ Mapping - Horizon':
+- maps/sccv_horizon/*
+
+'🗺️ Mapping - Templates':
+- maps/templates/*
+
+Sounds:
+- sound/*
+
+TGUI:
+- tgui/*
+
+Tools:
+- tools/*
+- .github/*
+
+# File Type Rules
+Javascript:
+- '*.js'
+
+Python:
+- '*.py'
+
+Sprites:
+- '*.dmi'