Merge branch 'master220' into service-borg-is-real

.github/CODEOWNERS

@@ -1,28 +1,26 @@
-# This list auto requests reviews from the specified maintainer when a PR that modifies the file in question is opened
-# This list is alphabetized by User -> Filename KEEP IT THAT WAY
-# In the event that multiple org members are to be informed of changes to the same file or dir, add them to the end under Multiple Owners
-# This is ONLY for taking ownership of server-critical code which must be written in a very specific way for the server to operate at all.
+# This list auto requests reviews from the specified org members
+# when a PR that modifies the file in question is opened
+# This list is alphabetized by User -> Filename and separated into sections for Maintainers/Contributors KEEP IT THAT WAY
+# In the event that people are to be informed of changes
+# to the same file or dir, add them to the end of under Multiple Owners
 
-### AffectedArc07
-# Actual Code
-/code/controllers/subsystem/mapping.dm @AffectedArc07
-/code/controllers/subsystem/ticker.dm @AffectedArc07
-/tgui/ @AffectedArc07
 
-# CI + Tooling
-/.github/workflows/ @AffectedArc07
-/code/modules/unit_tests/ @AffectedArc07
-/tools/ci/ @AffectedArc07
+# MAINTAINERS
 
-# Executables that need to be security-cleared
-dreamchecker.exe @AffectedArc07
-rust_g.dll @AffectedArc07
+### azizonkg
+# CI + Tooling
+/.github/workflows/ @Bizzonium
+/code/modules/unit_tests/ @Bizzonium
+/tools/ci/ @Bizzonium
+_build_dependencies.sh @Bizzonium
 
+# Server Stuff
+/SQL/ @Bizzonium
+/config/ @Bizzonium
 
+# Executables that need to be security-cleared
+dreamchecker.exe @Bizzonium
+rust_g.dll @Bizzonium
 
-### Fox-McCloud
-/code/ATMOSPHERICS/ @Fox-McCloud
-/code/controllers/subsystem/air.dm @Fox-McCloud
-/code/controllers/subsystem/garbage.dm @Fox-McCloud
-/code/modules/reagents/chemistry/holder.dm @Fox-McCloud
-/code/modules/reagents/chemistry/reagents.dm @Fox-McCloud
+# MULTIPLE OWNERS
+/_maps/ @ss220-space/map-reviewers

.github/CONTRIBUTING.md

@@ -56,22 +56,28 @@ actual development.
 
  * While we have no issue helping contributors (and especially new contributors) bring reasonably sized contributions up to standards via the pull request review process, larger contributions are expected to pass a higher bar of completeness and code quality *before* you open a pull request. Maintainers may close such pull requests that are deemed to be substantially flawed. You should take some time to discuss with maintainers or other contributors on how to improve the changes.
 
-#### Using Changelog
- * Tags used in changelog include add/rscadd, del/rscdel, fix/fixes, typo/spellcheck.
- * Without specifying a name it will default to using your GitHub name.
- Some examples
-```
-:cl:
-add: The ability to change the color of wires
-del: Deleted depreciated wire merging now handled in parent
-fix: Moving wires now follows the user input instead of moving the stack
-/:cl:
-```
+#### Использование Changelog
+Перед вашим заголовком PR, требуется поставить корректный тэг, чтобы в игре Changelog его правильно отображал.
+
+Пример:
 ```
-:cl: N3X15
-typo: Fixes some misspelled words under Using Changelog
-/:cl:
+bugfix: clothing removes itself trying to adjust it.
+add: new lavaland elite mob
 ```
+Список тегов для PRa:
+* **add:** если Вы добавили новую фичу
+* **admin:** если меняете что-то важно связанное с администрацией.(Кнопки, управления, панели, щитспавн)
+* **balance:** если производите балансировку в игре.(Изменение цифры урона, баффы или нерфы предмета/моба)
+* **bugfix:** если Вы исправили некий баг
+* **code_imp:** если имплементируете новое для билда, не меняя при этом ничего в самой игре.
+* **config:** если меняете перестановку конфигов или меняете работу SQL. (По этому поводу обращаться стоит с хосту)
+* **imageadd:** если просто поменяли спрайты, без затрагивания кода
+* **soundadd:** если просто добавили новые звуки, без затрагивания кода
+* **spellcheck:** если исправляете грамматику в коде.
+* **tweak:** если Вы сделали незначительную правку (например изменили одно число на другое)
+* **refactor:** если Вы полностью переписали старый код, улучшив его, НО не изменив функционал
+* **qol:** если Ваше изменение не влияет на баланс, а только улучшает взаимодействие между игрой и игроком
+* **wip:** если Ваш PR в драфте и планируется длительная разработка (можно не ставить)
 
 
 ## Specifications
@@ -377,12 +383,14 @@ This prevents nesting levels from getting deeper then they need to be.
     #define MACRO_ONE (1<<0)
     #define MACRO_TWO (1<<1)
     #define MACRO_THREE (1<<2)
+	#define MACRO_ALL (~0)
     ```
     Is preferable to
     ```
     #define MACRO_ONE 1
     #define MACRO_TWO 2
     #define MACRO_THREE 4
+	#defin MACRO_ALL 7 // or 16777215 as more accurate
     ```
     This make the code more readable and less prone to error
 

.github/workflows/deploy.yml

@@ -43,13 +43,23 @@ on:
         default: true
 
 jobs:
+  check:
+    name: Check User Permission
+    runs-on: ubuntu-latest
+    steps:
+      - uses: skjnldsv/check-actor-permission@v3
+        with:
+          require: 'admin'
+
   CI:
+    needs: [check]
     uses: ./.github/workflows/ci.yml # use the callable tests job to run tests
     if: ${{ inputs.ci_required }}
 
   update-isp-lists:
     name: Update ISP Lists
     runs-on: ubuntu-latest
+    needs: [check]
 
     steps:
       - name: Update ISP Lists
@@ -64,6 +74,7 @@ jobs:
   set-matrix:
     name: Set Deployment Matrix
     runs-on: ubuntu-latest
+    needs: [check]
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -101,7 +112,7 @@ jobs:
       fail-fast: false
       matrix: ${{fromJson(needs.set-matrix.outputs.matrix)}}
     environment: ${{ matrix.environment }}
-    needs: [update-isp-lists, CI, set-matrix]
+    needs: [check, update-isp-lists, CI, set-matrix]
     if: always() && !cancelled() && !failure()
 
     steps:

SQL/paradise_schema.sql

@@ -67,6 +67,7 @@ CREATE TABLE `characters` (
   `med_record` longtext COLLATE utf8mb4_unicode_ci NOT NULL,
   `sec_record` longtext COLLATE utf8mb4_unicode_ci NOT NULL,
   `gen_record` longtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  `exploit_record` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `disabilities` mediumint(8) NOT NULL,
   `player_alt_titles` longtext COLLATE utf8mb4_unicode_ci NOT NULL,
   `organ_data` longtext COLLATE utf8mb4_unicode_ci NOT NULL,
@@ -288,6 +289,7 @@ CREATE TABLE `player` (
   `discord_name` varchar(32) NULL DEFAULT NULL,
   `keybindings` longtext COLLATE 'utf8mb4_unicode_ci' DEFAULT NULL,
   `viewrange` VARCHAR(5) NOT NULL DEFAULT '17x15' COLLATE 'utf8mb4_general_ci',
+  `ghost_darkness_level` tinyint(1) UNSIGNED NOT NULL DEFAULT '255',
   PRIMARY KEY (`id`),
   UNIQUE KEY `ckey` (`ckey`),
   KEY `lastseen` (`lastseen`),

SQL/updates/31-32.sql

@@ -0,0 +1,5 @@
+# Add exploit records
+ALTER TABLE `characters`
+	ADD COLUMN `exploit_record` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL AFTER `gen_record`;
+# Adds support for persistent ghost darkness
+ALTER TABLE `player` ADD COLUMN `ghost_darkness_level` tinyint(1) UNSIGNED NOT NULL DEFAULT '255'

SQL/updates/32-33.sql

@@ -0,0 +1,2 @@
+# Adds tracking of who flagged which book.
+ALTER TABLE `library` ADD COLUMN `flaggedby` VARCHAR(100) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT ' ' AFTER `flagged`;