removes grey's facid immunity

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,37 +1,38 @@
-<!-- By ticking or leaving ticked the option "Allow edits and access to secrets by maintainers" you give permission for repository maintainers to push changes to your branch without explicilty asking. -->
+<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то может пойти не так. -->
+<!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. -->
 
-<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. -->
-<!-- You can view Contributing.MD for a detailed description of the pull request process. -->
+## Что этот PR делает
 
-## What Does This PR Do
-<!-- Include a small to medium description of what your PR changes. -->
-<!-- Document all changes, as not doing this may delay reviews or even discourage maintainers from merging your PR! -->
-<!-- If your PR fixes an issue, add "Fixes #1234" somewhere in the PR description. This will automatically close the bug upon PR submission. -->
+<!-- Вкратце опишите изменения, которые вносите. -->
+<!-- Опишите **все** изменения, так как противное может сказаться на рассмотрении этого PR'а! -->
+<!-- Если вы исправляете Issue, добавьте "Fixes #1234" (где 1234 - номер Issue) где-нибудь в описании PR'а. Это автоматически закроет Issue после принятия PR'а. -->
 
-## Why It's Good For The Game
-<!-- Add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. -->
+## Почему это хорошо для игры
 
-## Images of changes
-<!-- If you did not make a map or sprite edit, you may delete this section. You may include a gif or mp4 of your feature if you want. -->
+<!-- Опишите, почему, по вашему, следует добавить эти изменения в игру. -->
 
-## Testing
-<!-- How did you test the PR, if at all? -->
+## Изображения изменений
+<!-- Если вы не меняли карту или спрайты, можете опустить эту секцию. Если хотите, можете вставить видео. -->
+
+## Тестирование
+<!-- Как вы тестировали свой PR, если делали это вовсе? -->
 
 ## Changelog
+
 :cl:
-add: Added new things
-del: Removed old things
-tweak: Tweaked a few things
-fix: Fixed a few things
-wip: Added a few works in progress
-soundadd: Added a new sound thingy
-sounddel: Removed an old sound thingy
-imageadd: Added some icons and images
-imagedel: Deleted some icons and images
-spellcheck: Fixed a few typos
-experiment: Added an experimental thingy
+add: Что-то добавил
+del: Что-то удалил
+tweak: Поменял что-то по мелочи
+fix: Что-то починил
+wip: Какие-либо наработки в процессе
+soundadd: Добавил новый звук
+sounddel: Удалил старый звук
+imageadd: Добавил новую картинку
+imagedel: Удалил старую картинку
+spellcheck: Исправил опечатку
+experiment: Добавил эксперементальную функцию
 /:cl:
 
-<!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. -->
-<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
-<!-- If a PR has no impact on players (i.e. a code refactor that does not change functionality) then the entire Changelog heading and contents can be removed. -->
+<!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы можете написать свой ник справа от первого :cl:, если хотите. Иначе будет использован ваш ник на ГитХабе. -->
+<!-- Вы можете использовать несколько записей с одинаковым префиксом (Они используются только для иконки в игре) и удалить ненужные. Помните, что чейнджлог должен быть понятен обычным игроком. -->
+<!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы можете исключить всю секцию. -->

.github/labeler.yml

@@ -0,0 +1,36 @@
+"TGUI":
+- 'tgui/**'
+
+"Звук":
+- '**/*.ogg'
+
+"Изменение Карты":
+- '**/*.dmm'
+
+"Инструменты":
+- '.gihub/workflows/**'
+- 'tools/**'
+
+"Керберос":
+- '_maps/map_files220/delta/delta.dmm'
+
+"Кибериада":
+- '_maps/map_files220/cyberiad/cyberiad.dmm'
+
+"НЕ МОДУЛЬНО":
+- all: ['code/**']
+
+"Спрайты":
+- '**/*.dmi'
+
+"Требуется изменение конфига":
+- 'config/**'
+
+"Документация":
+- '**/*.md'
+
+"Частичная модульность":
+- all: ['code/**', modular_ss220/**]
+
+"SQL":
+- 'SQL/**'

.github/workflows/check_changelog.yml

@@ -0,0 +1,32 @@
+name: Changelog validation
+
+permissions:
+  contents: read
+  pull-requests: write
+  issues: write
+
+on:
+  pull_request_target:
+    types: [opened, reopened, edited, labeled, unlabeled]
+
+jobs:
+  CheckCL:
+    runs-on: ubuntu-latest
+    if: github.repository == 'ss220club/Paradise-SS220' && github.base_ref == 'master' && github.event.pull_request.draft == false
+    steps:
+      - name: Downloading scripts
+        run: |
+          wget https://raw.githubusercontent.com/ss220club/Paradise-SS220/master/tools/changelog/check_changelog.py
+          wget https://raw.githubusercontent.com/ss220club/Paradise-SS220/master/tools/changelog/tags.yml
+      - name: Installing Python
+        uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1
+        with:
+          python-version: '3.x'
+      - name: Installing deps
+        run: |
+          python -m pip install --upgrade pip
+          pip install ruamel.yaml PyGithub
+      - name: Changelog validation
+        env:
+          BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
+        run: python check_changelog.py

.github/workflows/deploy.yml

@@ -0,0 +1,24 @@
+name: Deploy
+
+concurrency:
+  group: deploy
+
+on:
+  workflow_dispatch:
+  push:
+    branches: ['master', 'devtest']
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Trigger update
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.GAME1_HOST }}
+          username: ${{ secrets.GAME1_USERNAME }}
+          key: ${{ secrets.GAME1_SSH_KEY }}
+          script: |
+            cd /opt/ss13/paradise/
+            ./upgrade.sh

.github/workflows/label.yml

@@ -0,0 +1,13 @@
+name: "Label"
+
+on:
+- pull_request_target
+
+jobs:
+  labeler:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v4
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+        sync-labels: true

.github/workflows/label_merge_conflicts.yml

@@ -1,13 +1,19 @@
 name: 'Merge Conflict Detection'
+
 on:
   push:
     branches:
       - master
+  pull_request_target:
+    types: [ready_for_review, opened, synchronize, reopened]
 jobs:
   triage:
-    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-22.04
     steps:
-      - uses: mschilde/auto-label-merge-conflicts@master
+      - uses: eps1lon/actions-label-merge-[email protected]
         with:
-          CONFLICT_LABEL_NAME: 'Merge Conflict'
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          dirtyLabel: 'Merge Conflict'
+          repoToken: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -25,6 +25,7 @@ stddef.dm
 .atom-build.json
 *.vscode/*
 !/.vscode/extensions.json
+!/.vscode/tasks.json
 
 # ignore DMI tool build cache
 /tools/dmitool/bin/
@@ -57,3 +58,4 @@ __pycache__/
 dmm-tools.exe
 OpenDream
 paradise.json
+sound/tts_cache/*

.tgs.yml

@@ -0,0 +1,19 @@
+# This file is stolen from tg
+version: 1
+byond: "515.1614"
+# Folders to create in "<instance_path>/Configuration/GameStaticFiles/"
+static_files:
+  # Config directory should be static
+  - name: config
+    # This implies the folder should be pre-populated with contents from the repo
+    populate: true
+  # Data directory must be static
+  - name: data
+# String dictionary. The value is the location of the file in the repo to upload to TGS. The key is the name of the file to upload to "<instance_path>/Configuration/EventScripts/"
+# This one is for Linux hosted servers
+linux_scripts:
+  PreCompile.sh: tools/tgs_scripts/PreCompile.sh
+  WatchdogLaunch.sh: tools/tgs_scripts/WatchdogLaunch.sh
+  InstallDeps.sh: tools/tgs_scripts/InstallDeps.sh
+# The security level the game should be run at
+security: Trusted

.vscode/extensions.json

@@ -6,6 +6,7 @@
 		"dbaeumer.vscode-eslint",
 		"eamodio.gitlens",
 		"usernamehw.errorlens",
-		"anturk.dmi-editor"
+		"anturk.dmi-editor",
+		"esbenp.prettier-vscode"
     ]
 }

.vscode/tasks.json

@@ -0,0 +1,54 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "dreammaker",
+			"dme": "paradise.dme",
+			"problemMatcher": [
+				"$dreammaker"
+			],
+			"group": "build",
+			"label": "dm: build - paradise.dme"
+		},
+		{
+			"type": "shell",
+			"command": "tgui/bin/tgui-build",
+			"windows": {
+				"command": ".\\tgui\\bin\\tgui-build.bat"
+			},
+			"problemMatcher": [
+				"$tsc",
+				"$eslint-stylish"
+			],
+			"group": "build",
+			"label": "tgui: build"
+		},
+		{
+			"type": "shell",
+			"command": "tgui/bin/tgui-dev-server",
+			"windows": {
+				"command": ".\\tgui\\bin\\tgui-dev-server.bat"
+			},
+			"problemMatcher": [
+				"$tsc",
+				"$eslint-stylish"
+			],
+			"group": "build",
+			"label": "tgui: run dev server"
+		}
+		,
+		{
+			"type": "shell",
+			"command": "tgui/bin/tgui-formatting",
+			"windows": {
+				"command": ".\\tgui\\bin\\tgui-formatting.bat"
+			},
+			"problemMatcher": [
+				"$tsc",
+				"$eslint-stylish"
+			],
+			"group": "build",
+			"label": "tgui: run prettier formatting"
+		}
+	]
+}

SQL/paradise_schema.sql

@@ -77,6 +77,7 @@ CREATE TABLE `characters` (
   `hair_gradient_colour` varchar(7) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '#000000',
   `hair_gradient_alpha` tinyint(3) UNSIGNED NOT NULL DEFAULT '255',
   `custom_emotes` LONGTEXT COLLATE 'utf8mb4_unicode_ci' DEFAULT NULL,
+  `tts_seed` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `ckey` (`ckey`)
 ) ENGINE=InnoDB AUTO_INCREMENT=125467 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -474,7 +475,17 @@ CREATE TABLE `playtime_history` (
   `ckey` varchar(32) NOT NULL,
   `date` DATE NOT NULL,
   `time_living` SMALLINT NOT NULL,
+  `time_crew` SMALLINT NOT NULL,
+  `time_special` SMALLINT NOT NULL,
   `time_ghost` SMALLINT NOT NULL,
+  `time_command` SMALLINT NOT NULL,
+  `time_engineering` SMALLINT NOT NULL,
+  `time_medical` SMALLINT NOT NULL,
+  `time_science` SMALLINT NOT NULL,
+  `time_supply` SMALLINT NOT NULL,
+  `time_security` SMALLINT NOT NULL,
+  `time_silicon` SMALLINT NOT NULL,
+  `time_service` SMALLINT NOT NULL,
   PRIMARY KEY (`ckey`, `date`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
@@ -623,3 +634,39 @@ CREATE TABLE `json_datum_saves` (
 	UNIQUE INDEX `ckey_unique` (`ckey`, `slotname`) USING BTREE,
 	INDEX `ckey` (`ckey`) USING BTREE
 ) COLLATE = 'utf8mb4_general_ci' ENGINE = InnoDB;
+
+
+
+--
+-- SS220 ADDITION AND EDITS
+--
+
+--
+-- Table structure for table `ckey_whitelist`
+--
+DROP TABLE IF EXISTS `ckey_whitelist`;
+CREATE TABLE `ckey_whitelist` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`date` DATETIME DEFAULT now() NOT NULL,
+	`ckey` VARCHAR(32) NOT NULL,
+	`adminwho` VARCHAR(32) NOT NULL,
+	`port` INT(5) UNSIGNED NOT NULL,
+	`date_start` DATETIME DEFAULT now() NOT NULL,
+	`date_end` DATETIME NULL,
+	`is_valid` BOOLEAN DEFAULT true NOT NULL,
+	PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+--
+-- Table structure for table `admin_wl`
+--
+CREATE TABLE `admin_wl` (
+	`id` int(11) NOT NULL AUTO_INCREMENT,
+	`ckey` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL,
+	`admin_rank` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Administrator',
+	`level` int(2) NOT NULL DEFAULT '0',
+	`flags` int(16) NOT NULL DEFAULT '0',
+	PRIMARY KEY (`id`),
+	KEY `ckey` (`ckey`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+

SQL/updates/51-52.sql

@@ -0,0 +1,13 @@
+# Updating SQL from 51 to 52 -AffectedArc07
+# Adding all department columns to playtime_history
+ALTER TABLE `playtime_history`
+	ADD COLUMN `time_crew` SMALLINT NOT NULL AFTER `time_living`,
+	ADD COLUMN `time_special` SMALLINT NOT NULL AFTER `time_crew`,
+	ADD COLUMN `time_command` SMALLINT NOT NULL AFTER `time_ghost`,
+	ADD COLUMN `time_engineering` SMALLINT NOT NULL AFTER `time_command`,
+	ADD COLUMN `time_medical` SMALLINT NOT NULL AFTER `time_engineering`,
+	ADD COLUMN `time_science` SMALLINT NOT NULL AFTER `time_medical`,
+	ADD COLUMN `time_supply` SMALLINT NOT NULL AFTER `time_science`,
+	ADD COLUMN `time_security` SMALLINT NOT NULL AFTER `time_supply`,
+	ADD COLUMN `time_silicon` SMALLINT NOT NULL AFTER `time_security`,
+	ADD COLUMN `time_service` SMALLINT NOT NULL AFTER `time_silicon`;

SQL/updates220/49-49.220.1.sql

@@ -0,0 +1,4 @@
+# Updating DB from 49 to 49.220.1
+# Adds characters.tts_seed ~furior
+
+ALTER TABLE `characters` ADD `tts_seed` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL AFTER `custom_emotes`;

SQL/updates220/49.220.1-49.220.2.sql

@@ -0,0 +1,12 @@
+CREATE TABLE `ckey_whitelist`
+(
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`date` DATETIME DEFAULT now() NOT NULL,
+	`ckey` VARCHAR(32) NOT NULL,
+	`adminwho` VARCHAR(32) NOT NULL,
+	`port` INT(5) UNSIGNED NOT NULL,
+	`date_start` DATETIME DEFAULT now() NOT NULL,
+	`date_end` DATETIME NULL,
+	`is_valid` BOOLEAN DEFAULT true NOT NULL,
+	PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;