April Fool's jokes

.github/workflows/conflicts.yml

@@ -8,6 +8,9 @@ on:
 jobs:
   triage:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
     steps:
       - uses: eps1lon/[email protected]
         with:

.github/workflows/generate_documentation.yml

@@ -7,6 +7,9 @@ jobs:
   generate_documentation:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pages: write
     concurrency: gen-docs
     steps:
       - uses: actions/checkout@v3

.github/workflows/labeler.yml

@@ -5,6 +5,9 @@ on:
 jobs:
   label:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
     steps:
       - name: "Check for ACTION_ENABLER secret and pass true to output if it exists to be checked by later steps"
         id: value_holder

.github/workflows/remove_guide_comments.yml

@@ -7,6 +7,9 @@ on:
 jobs:
   remove_guide_comments:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
     steps:
     - name: Checkout
       uses: actions/checkout@v3

.github/workflows/update_changelog.yml

@@ -8,6 +8,9 @@ jobs:
   update-changelog:
     concurrency: changelog
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
     steps:
     - name: "Check for ACTION_ENABLER secret and pass true to output if it exists to be checked by later steps"
       id: value_holder

.gitignore

@@ -32,5 +32,7 @@ test_environment.txt
 prof.dll
 libprof.so
 
+code\__DEFINES\__rust_g.dm
+
 # OpenDream compatibility stuff
 colonialmarines.json

.tgs.yml

@@ -3,6 +3,7 @@ byond: "514.1588"
 static_files:
   - name: config
   - name: data
+  - name: local.db
 linux_scripts:
   PreCompile.sh: tools/tgs_scripts/PreCompile.sh
   WatchdogLaunch.sh: tools/tgs_scripts/WatchdogLaunch.sh

README.md

@@ -1,37 +1,37 @@
-## CM-SS13 codebase
+## RUCM-SS13 codebase (fork from CM-SS13)
 
 <a href="https://www.monkeyuser.com/assets/images/2019/131-bug-free.png"><img src="https://img.shields.io/badge/Built_with-Resentment-orange?style=for-the-badge&labelColor=%23D47439&color=%23C36436" width=260px></a> <a href="https://user-images.githubusercontent.com/8171642/50290880-ffef5500-043a-11e9-8270-a2e5b697c86c.png"><img src="https://img.shields.io/badge/Contains-Technical_Debt-blue?style=for-the-badge&color=5598D0&labelColor=62C1EE" width=280px></a> [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)
 
 [![Build Status](https://github.com/cmss13-devs/cmss13/workflows/CI%20Suite/badge.svg)](https://github.com/cmss13-devs/cmss13/actions?query=workflow%3A%22CI+Suite%22)
-* **Website:** https://forum.cm-ss13.com/
-* **Code:** https://github.com/cmss13-devs/cmss13
-* **Wiki:** https://cm-ss13.com/wiki/Main_Page
+* **Вебсайт разработчиков оригинального кода:** https://forum.cm-ss13.com/
+* **Оригинальный код:** https://github.com/cmss13-devs/cmss13
+* **Оригинальная вики:** https://cm-ss13.com/wiki/Main_Page
 
-This is the codebase for the CM-SS13 flavoured fork of SpaceStation 13
+Это репозиторий RUCM-SS13, форк кодбазы CM-SS13, которая в свою очередь форк игры SpaceStation 13...
 
-Space Station 13 is a paranoia-laden round-based roleplaying game set against the backdrop of a nonsensical, metal death trap masquerading as a space station, with charming spritework designed to represent the sci-fi setting and its dangerous undertones. Have fun, and survive! CM-SS13 has wildly adapted this idea into a strategic roleplay-based team deathmatch game.
+Space Station 13 - это параноидальная круговая ролевая игра, действие которой разворачивается на металлической коробке смерти, маскирующейся под космическую станцию, с очаровательной графикой, призванной отобразить научно-фантастическую обстановку и ее опасный подтекст. Данный билд - полная конверсия классической станции 13 под сеттинг мира серии научно фантастических фильмов ужасов "Чужой" в стиле "ролевой командный бой насмерть" 
 
-## :exclamation: How to compile :exclamation:
+## :exclamation: Как скомпилировать билд :exclamation:
 
-On **2022-04-06** we have changed the way to compile the codebase.
+**2022-04-06** оригинальные ЦМы изменили способ компиляции билда с классического (через byond) на продвинутый.
 
-**The quick way**. Find `bin/server.cmd` in this folder and double click it to automatically build and host the server on port 1337.
+**Быстрый способ**. Найдите файл `bin/server.cmd` и дважды щелкните на нем для автоматической сборки и размещения сервера на порту 1337.
 
-**The long way**. Find `bin/build.cmd` in this folder, and double click it to initiate the build. It consists of multiple steps and might take around 1-5 minutes to compile. If it closes, it means it has finished its job. You can then set up the server normally by opening `colonialmarines.dmb` in DreamDaemon.
+**Долгий способ**. Найдите файл `bin/build.cmd` и дважды щелкните на нем, чтобы запустить сборку. Сборка состоит из нескольких этапов и может занять около 1-5 минут. Если программа закрывается, это означает, что она завершила свою работу. После этого можно нормально настроить сервер, открыв `colonialmarines.dmb` в DreamDaemon.
 
-**Building colonialmarines in DreamMaker directly is now deprecated and might produce errors**, such as `'tgui.bundle.js': cannot find file`.
+**Компилирование кода в DreamMaker напрямую устарело и может приводить к ошибкам**, такие как `'tgui.bundle.js': cannot find file`.
 
-**[How to compile in VSCode and other build options](tools/build/README.md).**
+**[Как компилировать в VSCode и другие варианты сборки](tools/build/README.md).**
 
-## Contributors
-[Guides for Contributors](.github/CONTRIBUTING.md)
+## Помощь в разработке
+[Руководство по помощи в разработке](.github/CONTRIBUTING.md)
 
-[Setting up a Development Environment](https://cm-ss13.com/wiki/Guide_to_Git)
+[Настройка среды разработки](https://cm-ss13.com/wiki/Guide_to_Git)
 
-## LICENSE
+## Лицензия
 
-The code for CM-SS13 is licensed under the [GNU Affero General Public License v3](http://www.gnu.org/licenses/agpl.html), which can be found in full in [/LICENSE-AGPL3](/LICENSE-AGPL3).
+Код для CM-SS13 лицензирован под [GNU Affero General Public License v3](http://www.gnu.org/licenses/agpl.html), с которым можно ознакомиться в полном объеме в [/LICENSE-AGPL3](/LICENSE-AGPL3).
 
-Assets including icons and sound are under the [Creative Commons 3.0 BY-SA license](https://creativecommons.org/licenses/by-sa/3.0/) unless otherwise indicated. Authorship for assets including art and sound under the CC BY-SA license is defined as the active development team of CM-SS13 unless stated otherwise (by author of the commit).
+Активы, включая иконки и звук, находятся под лицензией [Creative Commons 3.0 BY-SA license](https://creativecommons.org/licenses/by-sa/3.0/) если не указано иное. Авторство на активы, включая искусство и звук, под лицензией CC BY-SA определяется как активная команда разработчиков CM-SS13, если не указано иное (автор коммита).
 
-All code is assumed to be licensed under AGPL v3 unless stated otherwise by file header. Commits before 9a001bf520f889b434acd295253a1052420860af are assumed to be licensed under GPLv3 and can be used in closed source repo.
+Предполагается, что код лицензируется по AGPL v3, если в заголовке файла не указано иное. Коммиты до 9a001bf520f889b434acd295253a1052420860af считаются лицензированными по GPLv3 и могут быть использованы в закрытом репозитории.

code/__DEFINES/__game.dm

@@ -26,9 +26,11 @@
 #define MAP_PRISON_STATION_V3 "Fiorina Science Annex"
 #define MAP_WHISKEY_OUTPOST "Whiskey Outpost" // Unused
 #define MAP_DESERT_DAM "Trijent Dam"  // Highpop only
+#define MAP_DOCK_RED "Dock Red"
 #define MAP_SOROKYNE_STRATA "Sorokyne Strata"
 #define MAP_CORSAT "CORSAT" // Highpop only
 #define MAP_KUTJEVO "Kutjevo Refinery"
+#define MAP_KHAMI_BARRENS "Khami Barrens"
 #define MAP_ICE_COLONY_V3 "Shivas Snowball" //Ice Rework, low pop enabled.
 #define MAP_RUNTIME "USS Runtime"
 #define MAP_LV522_CHANCES_CLAIM "LV-522 Chance's Claim" // Highpop Only

code/__DEFINES/access.dm

@@ -37,6 +37,7 @@ most of them are tied into map-placed objects. This should be reworked in the fu
 #define ACCESS_MARINE_KITCHEN    30
 #define ACCESS_MARINE_CO 31
 #define ACCESS_MARINE_TL_PREP 32
+#define ACCESS_MARINE_WALKER 33
 
 #define ACCESS_MARINE_MAINT 34
 #define ACCESS_MARINE_OT 35

code/__DEFINES/chemistry.dm

@@ -32,6 +32,9 @@
 #define HIGH_REAGENTS_OVERDOSE_CRITICAL 100
 
 
+// Chance of bicaridine OD to patch IB per every process_mob()
+#define BICARIDINE_OD_IB_TREAT_CHANCE 4
+
 // How many units of reagent are consumed per tick, by default.
 #define REAGENTS_METABOLISM AMOUNT_PER_TIME(1, 10 SECONDS)
 // By defining the effect multiplier this way, it'll exactly adjust

code/__DEFINES/fray-marines/conflict.dm

@@ -0,0 +1,2 @@
+// flags_ammo_behaviour
+#define AMMO_IGNORE_XENO_IFF (1<<23)

code/__DEFINES/fray-marines/mobs.dm

@@ -0,0 +1,9 @@
+#define DEFAULT_WALK_SPEED      7
+#define DEFAULT_RUN_SPEED       2
+
+// Spitter strain flags
+#define SPITTER_SUPPRESSOR	"Suppressor"
+#define XENO_SHIELD_SOURCE_SPITTER_SUPPRESSOR 11
+
+// Lurker strain flags
+#define LURKER_STALKER	"Stalker"

code/__DEFINES/job.dm

@@ -78,11 +78,12 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_PILOT "Pilot Officer"
 #define JOB_DROPSHIP_CREW_CHIEF "Dropship Crew Chief"
 #define JOB_CREWMAN "Vehicle Crewman"
+#define JOB_WALKER "Mech Operator"
 #define JOB_INTEL "Intelligence Officer"
 #define JOB_DROPSHIP_ROLES   /datum/timelock/dropship
 #define JOB_DROPSHIP_ROLES_LIST   list(JOB_DROPSHIP_CREW_CHIEF, JOB_PILOT)
 #define JOB_AUXILIARY_ROLES    /datum/timelock/auxiliary
-#define JOB_AUXILIARY_ROLES_LIST   list(JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_INTEL)
+#define JOB_AUXILIARY_ROLES_LIST   list(JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_WALKER, JOB_INTEL)
 
 #define JOB_POLICE "Military Police"
 #define JOB_WARDEN "Military Warden"

code/__DEFINES/mode.dm

@@ -109,12 +109,12 @@
 //=================================================
 
 //Role defines, specifically lists of roles for job bans, crew manifests and the like.
-GLOBAL_LIST_INIT(ROLES_COMMAND, list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_POLICE, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_CHIEF_REQUISITION, JOB_CHIEF_ENGINEER, JOB_CMO, JOB_CHIEF_POLICE, JOB_SEA, JOB_SYNTH, JOB_WARDEN))
+GLOBAL_LIST_INIT(ROLES_COMMAND, list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_WALKER, JOB_POLICE, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_CHIEF_REQUISITION, JOB_CHIEF_ENGINEER, JOB_CMO, JOB_CHIEF_POLICE, JOB_SEA, JOB_SYNTH, JOB_WARDEN))
 
 //Marine roles
-#define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)
+#define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_WALKER, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)
 GLOBAL_LIST_INIT(ROLES_CIC, list(JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO))
-GLOBAL_LIST_INIT(ROLES_AUXIL_SUPPORT, list(JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT))
+GLOBAL_LIST_INIT(ROLES_AUXIL_SUPPORT, list(JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_WALKER, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT))
 GLOBAL_LIST_INIT(ROLES_MISC, list(JOB_SYNTH, JOB_WORKING_JOE, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_MESS_SERGEANT, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH))
 GLOBAL_LIST_INIT(ROLES_POLICE, list(JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE))
 GLOBAL_LIST_INIT(ROLES_ENGINEERING, list(JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH, JOB_MAINT_TECH, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH))
@@ -138,7 +138,7 @@ GLOBAL_LIST_INIT(ROLES_FACTION_CLASH, ROLES_USCM + JOB_PREDATOR)
 
 GLOBAL_LIST_INIT(ROLES_UNASSIGNED, list(JOB_SQUAD_MARINE))
 //Role lists used for switch() checks in show_blurb_uscm(). Cosmetic, determines ex. "Engineering, USS Almayer", "2nd Bat. 'Falling Falcons'" etc.
-#define BLURB_USCM_COMBAT JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_SEA,\
+#define BLURB_USCM_COMBAT JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO, JOB_CREWMAN, JOB_WALKER, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_SEA,\
 						JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE
 #define BLURB_USCM_FLIGHT JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF
 #define BLURB_USCM_MP JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE
@@ -220,11 +220,11 @@ DEFINE_BITFIELD(whitelist_status, list(
 
 // Objective priorities
 #define OBJECTIVE_NO_VALUE 0
-#define OBJECTIVE_LOW_VALUE 0.1
-#define OBJECTIVE_MEDIUM_VALUE 0.2
-#define OBJECTIVE_HIGH_VALUE 0.35
-#define OBJECTIVE_EXTREME_VALUE 0.7
-#define OBJECTIVE_ABSOLUTE_VALUE 1.4
+#define OBJECTIVE_LOW_VALUE 0.2
+#define OBJECTIVE_MEDIUM_VALUE 0.3
+#define OBJECTIVE_HIGH_VALUE 0.5
+#define OBJECTIVE_EXTREME_VALUE 1
+#define OBJECTIVE_ABSOLUTE_VALUE 2
 #define OBJECTIVE_POWER_VALUE 5
 
 // Objective states

code/__DEFINES/objects.dm

@@ -115,7 +115,7 @@ GLOBAL_LIST_INIT(RESTRICTED_CAMERA_NETWORKS, list( //Those networks can only be
 #define SELF_DESTRUCT_MACHINE_ARMED 2
 
 
-#define SELF_DESTRUCT_ROD_STARTUP_TIME 12000
+#define SELF_DESTRUCT_ROD_STARTUP_TIME 2400
 
 // Flamer fire shapes
 #define FLAMESHAPE_NONE "none"

code/__DEFINES/skills.dm

@@ -54,12 +54,14 @@
 #define SKILL_SPEC_GRENADIER 5
 /// Can use heavy flamers
 #define SKILL_SPEC_PYRO 6
+/// Can use Heavy-Shield and N45
+#define SKILL_SPEC_ST 7
 /// Can use smartguns
-#define SKILL_SPEC_SMARTGUN 7
+#define SKILL_SPEC_SMARTGUN 8
 /// UPP special training
-#define SKILL_SPEC_UPP 8
+#define SKILL_SPEC_UPP 9
 /// Can use ALL specialist weapons
-#define SKILL_SPEC_ALL 9
+#define SKILL_SPEC_ALL 10
 
 //construction skill
 #define SKILL_CONSTRUCTION_DEFAULT 0

code/__DEFINES/techtree.dm

@@ -43,10 +43,13 @@
 #define TECH_TIER_GAMEPLAY list(\
 	/datum/tier/free,\
 	/datum/tier/one,\
+	/datum/tier/one/additional,\
 	/datum/tier/one_transition_two,\
 	/datum/tier/two,\
+	/datum/tier/two/additional,\
 	/datum/tier/two_transition_three,\
 	/datum/tier/three,\
+	/datum/tier/three/additional,\
 	/datum/tier/three_transition_four,\
 	/datum/tier/four\
 )

code/__DEFINES/vehicle.dm

@@ -11,7 +11,9 @@
 #define HDPT_LAYER_SUPPORT  2
 #define HDPT_LAYER_ARMOR 3
 #define HDPT_LAYER_TURRET   4
-#define HDPT_LAYER_MAX   4
+#define HDPT_LAYER_SECONDARY_GUN 5
+#define HDPT_LAYER_PRIMARY_GUN 6
+#define HDPT_LAYER_MAX   6
 
 #define VEHICLE_DRIVER   "driver"
 #define VEHICLE_GUNNER "primary gunner"

code/__DEFINES/vendors.dm

@@ -36,6 +36,10 @@
 
 #define VEHICLE_ALL_AVAILABLE (VEHICLE_INTEGRAL_AVAILABLE|VEHICLE_PRIMARY_AVAILABLE|VEHICLE_SECONDARY_AVAILABLE|VEHICLE_SUPPORT_AVAILABLE|VEHICLE_ARMOR_AVAILABLE|VEHICLE_TREADS_AVAILABLE)
 
+#define MECH_GUN "mech_gun"
+#define MECH_ALL_AVAIBALE list(MECH_GUN = 2)
+
+
 #define VENDOR_THEME_COMPANY 0
 #define VENDOR_THEME_USCM 1
 #define VENDOR_THEME_CLF 2

code/__DEFINES/xeno.dm

@@ -77,7 +77,7 @@
 
 /// Multiplier for time taken for a xeno to place down a resin structure
 #define BUILD_TIME_MULT_LESSER_DRONE 2
-#define BUILD_TIME_MULT_XENO 1
+#define BUILD_TIME_MULT_XENO 2
 #define BUILD_TIME_MULT_BUILDER 1
 #define BUILD_TIME_MULT_HIVELORD 0.5
 
@@ -172,7 +172,7 @@
 #define XENO_BURIED_LARVA_TIME_LIMIT (30 MINUTES)
 
 /// The time when xenos can start taking over comm towers
-#define XENO_COMM_ACQUISITION_TIME (55 MINUTES)
+#define XENO_COMM_ACQUISITION_TIME (25 MINUTES)
 
 /// The time it takes for a pylon to give one larva while activated
 #define XENO_PYLON_ACTIVATION_COOLDOWN (5 MINUTES)
@@ -190,10 +190,10 @@
 #define HIJACK_RATIO_FOR_TACMAP 0.8
 
 /// Xenos need to have their number to marines ratio lower than this to get larvae from pylons
-#define ENDGAME_LARVA_CAP_MULTIPLIER 0.5
+#define ENDGAME_LARVA_CAP_MULTIPLIER 0.3
 
 /// What percent of their numbers xeno get from pylons
-#define LARVA_ADDITION_MULTIPLIER 0.10
+#define LARVA_ADDITION_MULTIPLIER 0.05
 
 /// The time against away_timer when an AFK xeno larva can be replaced
 #define XENO_LEAVE_TIMER_LARVA 80 //80 seconds
@@ -635,6 +635,7 @@
 #define XENO_STRUCTURE_CLUSTER   "hive cluster"
 #define XENO_STRUCTURE_PYLON "hive pylon"
 #define XENO_STRUCTURE_EGGMORPH  "egg morpher"
+#define XENO_STRUCTURE_SUNKEN  "sunken colony"
 #define XENO_STRUCTURE_RECOVERY  "recovery node"
 #define XENO_STRUCTURE_NEST  "thick resin nest"
 
@@ -764,5 +765,5 @@
 
 #define FRENZY_DAMAGE_MULTIPLIER 2
 
-#define JOIN_AS_FACEHUGGER_DELAY (3 MINUTES)
+#define JOIN_AS_FACEHUGGER_DELAY (1 MINUTES)
 #define JOIN_AS_LESSER_DRONE_DELAY (30 SECONDS)

code/__HELPERS/job.dm

@@ -33,6 +33,8 @@
 			JOB_INTEL,
 			JOB_PILOT,
 			JOB_DROPSHIP_CREW_CHIEF,
+			JOB_CREWMAN,
+			JOB_WALKER,
 			JOB_CORPORATE_LIAISON,
 			JOB_COMBAT_REPORTER,
 			JOB_CHIEF_ENGINEER,