Merge branch 'larentoun-official-update'

.github/workflows/ci_suite.yml

@@ -70,6 +70,11 @@ jobs:
       - name: Ticked File Enforcement
         if: steps.linter-setup.conclusion == 'success' && !cancelled()
         run: |
+          bash tools/ci/check_filedirs.sh tgstation.dme
+          bash tools/ci/check_changelogs.sh
+          bash tools/ci/check_grep.sh
+          bash tools/ci/check_misc.sh
+          bash tools/bandastation_check_grep.sh # BANDASTATION EDIT ADDITION - checking modular_bandastation code
           tools/bootstrap/python tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/tgstation_dme.json
           tools/bootstrap/python tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/unit_tests.json
       - name: Check Define Sanity

code/__HELPERS/text.dm

@@ -178,12 +178,12 @@
 		switch(text2ascii(char))
 
 			// A  .. Z
-			if(65 to 90) //Uppercase Letters
+			if(65 to 90, 1040 to 1071, 1025) //Uppercase Letters //SS220 EDIT CHANGE - Cyrillic Fixes
 				number_of_alphanumeric++
 				last_char_group = LETTERS_DETECTED
 
 			// a  .. z
-			if(97 to 122) //Lowercase Letters
+			if(97 to 122, 1072 to 1103, 1105) //Lowercase Letters //SS220 EDIT CHANGE - Cyrillic Fixes
 				if(last_char_group == NO_CHARS_DETECTED || last_char_group == SPACES_DETECTED || cap_after_symbols && last_char_group == SYMBOLS_DETECTED) //start of a word
 					char = uppertext(char)
 				number_of_alphanumeric++

code/_compile_options.dm

@@ -98,7 +98,7 @@
 #endif
 
 #ifndef PRELOAD_RSC //set to:
-#define PRELOAD_RSC 1 // 0 to allow using external resources or on-demand behaviour;
+#define PRELOAD_RSC 0 // 0 to allow using external resources or on-demand behaviour; BANDASTATION EDIT - Original: 1
 #endif // 1 to use the default behaviour;
 								// 2 for preloading absolutely everything;
 

code/modules/unit_tests/barsigns.dm

@@ -7,12 +7,14 @@
 	var/obj/machinery/barsign_type = /obj/machinery/barsign
 	var/icon/barsign_icon = initial(barsign_type.icon)
 	var/list/barsign_icon_states = icon_states(barsign_icon)
+	var/icon/barsign_icon_ss220 = 'modular_bandastation/barsigns/icons/barsigns.dmi' // BANDASTATION EDIT Barsigns
+	var/list/barsign_icon_states_ss220 = icon_states(barsign_icon_ss220)
 
 	// Check every datum real bar sign
 	for(var/sign_type in (subtypesof(/datum/barsign) - /datum/barsign/hiddensigns))
 		var/datum/barsign/sign = new sign_type()
 
-		if(!(sign.icon in barsign_icon_states))
+		if(!(sign.icon in barsign_icon_states) && !(sign.icon in barsign_icon_states_ss220)) // BANDASTATION EDIT Barsigns
 			TEST_FAIL("Icon state for [sign_type] does not exist in [barsign_icon].")
 
 /**

config/bandastation/bandastation_config.txt

@@ -0,0 +1,4 @@
+## Text-to-speech
+#TTS_TOKEN_SILERO mytoken
+#TTS_ENABLED
+#TTS_CACHE

config/config.txt

@@ -5,6 +5,7 @@ $include dbconfig.txt
 $include comms.txt
 $include logging.txt
 $include resources.txt
+$include bandastation/bandastation_config.txt
 $include interviews.txt
 $include lua.txt
 $include auxtools.txt

config/dynamic.json

@@ -4,7 +4,6 @@
 		"Traitors": {
 			"cost": 8,
 			"scaling_cost": 9,
-			"weight": 0,
 			"required_candidates": 1,
 			"minimum_required_age": 0,
 			"requirements": [
@@ -40,119 +39,92 @@
 		},
 
 		"Changelings": {
-			"weight": 0
 		},
 
 		"Heretics": {
-			"weight": 0
 		},
 
 		"Wizard": {
-			"weight": 0
 		},
 
 		"Blood Cult": {
-			"weight": 0
 		},
 
 		"Nuclear Emergency": {
-			"weight": 0
 		},
 
 		"Revolution": {
-			"weight": 0
 		}
 	},
 
 	"Midround": {
 		"Syndicate Sleeper Agent": {
-			"weight": 0
 		},
 
 		"Malfunctioning AI": {
-			"weight": 0
 		},
 
 		"Wizard": {
-			"weight": 0
 		},
 
 		"Nuclear Assault": {
-			"weight": 0
 		},
 
 		"Blob": {
-			"weight": 0
 		},
 
 		"Blob Infection": {
-			"weight": 0
 		},
 
 		"Alien Infestation": {
-			"weight": 0
 		},
 
 		"Nightmare": {
-			"weight": 0
 		},
 
 		"Space Dragon": {
-			"weight": 0
 		},
 
 		"Abductors": {
-			"weight": 0
 		},
 
 		"Space Ninja": {
-			"weight": 0
 		},
 
 		"Spiders": {
-			"weight": 0
 		},
 
 		"Revenant": {
-			"weight": 0
 		},
 
 		"Sentient Disease": {
-			"weight": 0
 		},
 
 		"Space Pirates": {
-			"weight": 0
 		},
 
 		"Obsessed": {
 			"weight": 0
 		},
 
 		"Space Changeling": {
-			"weight": 0
 		},
 
 		"Paradox Clone": {
-			"weight": 0
 		}
 	},
 
 	"Latejoin": {
 		"Syndicate Infiltrator": {
-			"weight": 0
 		},
 
 		"Provocateur": {
-			"weight": 0
 		},
 
 		"Heretic Smuggler": {
-			"weight": 0
 		},
 
 		"Stowaway Changeling": {
-			"weight": 0
 		}
 	},
 

config/game_options.txt

@@ -33,8 +33,8 @@ COMMENDATION_PERCENT_POLL 0.05
 ## To speed things up make the number negative, to slow things down, make the number positive.
 
 ## These modify the run/walk speed of all mobs before the mob-specific modifiers are applied.
-RUN_DELAY 1.5
-WALK_DELAY 4
+RUN_DELAY 2.5
+WALK_DELAY 5
 
 ## The variables below affect the movement of specific mob types. THIS AFFECTS ALL SUBTYPES OF THE TYPE YOU CHOOSE!
 ## Entries completely override all subtypes. Later entries have precedence over earlier entries.
@@ -44,8 +44,8 @@ WALK_DELAY 4
 ##MULTIPLICATIVE_MOVESPEED /mob/living/silicon/robot 0
 ##MULTIPLICATIVE_MOVESPEED /mob/living/carbon/alien 0
 ##MULTIPLICATIVE_MOVESPEED /mob/living/simple_animal/slime 0
-MULTIPLICATIVE_MOVESPEED /mob/living/simple_animal 0
-MULTIPLICATIVE_MOVESPEED /mob/living/basic 0
+##MULTIPLICATIVE_MOVESPEED /mob/living/simple_animal 0
+##MULTIPLICATIVE_MOVESPEED /mob/living/basic 0
 
 
 ## NAMES ###
@@ -84,7 +84,7 @@ STATION_GOAL_BUDGET 1
 ## GAME MODES ###
 
 ## Uncomment to not send a roundstart intercept report. Gamemodes may override this.
-#NO_INTERCEPT_REPORT
+NO_INTERCEPT_REPORT
 
 ## Percent weight reductions for three of the most recent modes
 
@@ -158,7 +158,7 @@ ALLOW_AI_MULTICAM
 
 ## Secborg ###
 ## Uncomment to prevent the security cyborg model from being chosen
-#DISABLE_SECBORG
+DISABLE_SECBORG
 
 ## Peacekeeper Borg ###
 ## Uncomment to prevent the peacekeeper cyborg model from being chosen
@@ -167,7 +167,7 @@ ALLOW_AI_MULTICAM
 ## AWAY MISSIONS ###
 
 ## Uncomment to load one of the missions from awaymissionconfig.txt or away_missions/ at roundstart.
-#ROUNDSTART_AWAY
+ROUNDSTART_AWAY
 
 ## How long the delay is before the Away Mission gate opens. Default is half an hour.
 ## 600 is one minute.
@@ -193,28 +193,28 @@ MINIMAL_ACCESS_THRESHOLD 20
 #ASSISTANTS_HAVE_MAINT_ACCESS
 
 ## Uncoment to give security maint access. Note that if you dectivate JOBS_HAVE_MINIMAL_ACCESS security already gets maint from that.
-#SECURITY_HAS_MAINT_ACCESS
+SECURITY_HAS_MAINT_ACCESS
 
 ## Uncomment to give everyone maint access.
 #EVERYONE_HAS_MAINT_ACCESS
 
 ## Comment this out this to make security officers spawn in departmental security posts
-#SEC_START_BRIG
+SEC_START_BRIG
 
 ## This variable is how you may configure "Scaling Access" for Departmental Security Officers.
 ## Set to 0/commented out for "off", Departmental Security Officers will never get additional room-specific access (beyond general departmental doors).
 ## Set to 1 if you want to enable "Scaling Access", where Departmental Security Officers will get access to most rooms within a department depending on how many security officers there are relative to the number of people on a station.
 ## Set to 2 if you want Departmental Security Officers to always have access to all rooms in a department.
-DEPSEC_ACCESS_LEVEL 1
+DEPSEC_ACCESS_LEVEL 2
 
 
 ## GHOST INTERACTION ###
 ## Uncomment to let ghosts spin chairs. You may be wondering why this is a config option. Don't ask.
-#GHOST_INTERACTION
+GHOST_INTERACTION
 
 ## NEAR-DEATH EXPERIENCE ###
 ## Comment this out to disable mobs hearing ghosts when unconscious and very close to death
-NEAR_DEATH_EXPERIENCE
+#NEAR_DEATH_EXPERIENCE
 
 ## NON-VOCAL SILICONS ###
 ## Uncomment these to stop the AI, or cyborgs, from having vocal communication.
@@ -230,7 +230,7 @@ NEAR_DEATH_EXPERIENCE
 ## Set to 4 for "specified", silicons will start with an existing lawset. (If no specified lawset is identified, the AI will spawn with asimov.)
 
 
-DEFAULT_LAWS 0
+DEFAULT_LAWS 4
 
 ## SILICON ASIMOV SUPERIORITY OVERRIDE ###
 ## This makes "Asimov Superiority" show up as a perk for humans in the character creation menu even if asimov is not the default lawset, such as when used with asimov++
@@ -243,7 +243,7 @@ DEFAULT_LAWS 0
 ## See datums\ai_laws.dm for the full law lists
 ## IE, SPECIFIED_LAWS asimovpp, SPECIFIED_LAWS robocop, SPECIFIED_LAWS antimov
 
-SPECIFIED_LAWS asimovpp
+SPECIFIED_LAWS nt_default
 
 ## RANDOM LAWS ##
 ## ------------------------------------------------------------------------------------------
@@ -256,6 +256,7 @@ RANDOM_LAWS asimovpp
 RANDOM_LAWS paladin
 RANDOM_LAWS robocop
 RANDOM_LAWS corporate
+RANDOM_LAWS nt_default
 
 ## Quirky laws. Shouldn't cause too much harm
 #RANDOM_LAWS hippocratic
@@ -297,6 +298,7 @@ LAW_WEIGHT liveandletlive,5
 LAW_WEIGHT peacekeeper,5
 LAW_WEIGHT ten_commandments,5
 LAW_WEIGHT nutimov,5
+LAW_WEIGHT nt_default,5
 
 ## Quirky laws. Shouldn't cause too much harm
 LAW_WEIGHT reporter,3
@@ -485,7 +487,7 @@ MICE_ROUNDSTART 10
 ROUNDSTART_TRAITS
 
 ## Uncomment to disable human moods.
-#DISABLE_HUMAN_MOOD
+DISABLE_HUMAN_MOOD
 
 ## Enable night shifts
 #ENABLE_NIGHT_SHIFTS

interface/skin.dmf

@@ -111,12 +111,12 @@ window "mapwindow"
 		size = 640x480
 		anchor1 = 0,0
 		anchor2 = 100,100
-		font-family = "Grand9K Pixel"
-		font-size = 6pt
+		font-family = "Arial"
+		font-size = 7pt
 		is-default = true
 		right-click = true
 		saved-params = "zoom;letterbox;zoom-mode"
-		style = ".center { text-align: center; } .maptext { font-family: 'Grand9K Pixel'; font-size: 6pt; -dm-text-outline: 1px black; color: white; line-height: 1.0; } .command_headset { font-weight: bold; } .context { font-family: 'Pixellari'; font-size: 12pt; -dm-text-outline: 1px black; }  .subcontext { font-family: 'TinyUnicode'; font-size: 12pt; line-height: 0.75; } .small { font-family: 'Spess Font'; font-size: 6pt; line-height: 1.4; } .big { font-family: 'Pixellari'; font-size: 12pt; } .reallybig { font-size: 12pt; } .extremelybig { font-size: 12pt; } .greentext { color: #00FF00; font-size: 6pt; } .redtext { color: #FF0000; font-size: 6pt; } .clown { color: #FF69BF; font-weight: bold; } .his_grace { color: #15D512; } .hypnophrase { color: #0d0d0d; font-weight: bold; } .yell { font-weight: bold; } .italics { font-family: 'Spess Font'; font-size: 6pt; line-height: 1.4; }"
+		style = ".center { text-align: center; } .maptext { font-family: 'Small Fonts'; font-size: 7pt; -dm-text-outline: 1px black; color: white; line-height: 1.1; } .command_headset { font-weight: bold; } .context { font-family: 'Small Fonts'; font-size: 12pt; -dm-text-outline: 1px black; }  .subcontext { font-family: 'Small Fonts'; font-size: 12pt; line-height: 0.75; } .small { font-family: 'Small Fonts'; font-size: 6pt; line-height: 1.4; } .big { font-family: 'Small Fonts'; font-size: 12pt; } .reallybig { font-size: 12pt; } .extremelybig { font-size: 12pt; } .greentext { color: #00FF00; font-size: 6pt; } .redtext { color: #FF0000; font-size: 6pt; } .clown { color: #FF69BF; font-weight: bold; } .his_grace { color: #15D512; } .hypnophrase { color: #0d0d0d; font-weight: bold; } .yell { font-weight: bold; } .italics { font-family: 'Small Fonts'; font-size: 6pt; line-height: 1.4; }"
 	elem "status_bar"
 		type = LABEL
 		pos = 0,464

modular_bandastation/_defines220/_defines220.dm

@@ -0,0 +1,4 @@
+/datum/modpack/defines220
+	name = "Дефайны220"
+	desc = "Добавляет дефайны, которые нам нужны"
+	author = "larentoun"

modular_bandastation/_defines220/_defines220.dme

@@ -0,0 +1,10 @@
+#include "_defines220.dm"
+
+#include "code/defines/keybindings.dm"
+#include "code/defines/spans.dm"
+#include "code/signals_mob/signals_mob_ai.dm"
+#include "code/signals_mob/signals_mob_carbon.dm"
+#include "code/signals_mob/signals_mob_living.dm"
+#include "code/signals_mob/signals_mob_main.dm"
+#include "code/signals_mob/signals_mob_silicon.dm"
+#include "code/signals_mob/signals_mob_simple.dm"

modular_bandastation/_defines220/code/defines/keybindings.dm

@@ -0,0 +1,4 @@
+#define COMSIG_KB_MOB_PIXEL_SHIFT_DOWN "keybinding_mob_pixel_shift_down"
+#define COMSIG_KB_MOB_PIXEL_SHIFT_UP "keybinding_mob_pixel_shift_up"
+#define COMSIG_KB_CLIENT_LOOC_DOWN "keybinding_client_looc_down"
+#define COMSIG_KB_CLIENT_WHISPER_DOWN "keybinding_client_whisper_down"

modular_bandastation/_defines220/code/defines/spans.dm

@@ -0,0 +1 @@
+#define span_maptext(str) ("<span class='maptext'>" + str + "</span>")

modular_bandastation/_defines220/code/signals_mob/signals_mob_ai.dm

@@ -0,0 +1 @@
+// Signals for /mob/living/silicon/ai

modular_bandastation/_defines220/code/signals_mob/signals_mob_carbon.dm

@@ -0,0 +1 @@
+// Signals for /mob/living/carbon

modular_bandastation/_defines220/code/signals_mob/signals_mob_living.dm

@@ -0,0 +1,9 @@
+// Signals for /mob/living
+
+//from base of living/set_pull_offset(): (mob/living/pull_target, grab_state)
+#define COMSIG_LIVING_SET_PULL_OFFSET "living_set_pull_offset"
+//from base of living/reset_pull_offsets(): (mob/living/pull_target, override)
+#define COMSIG_LIVING_RESET_PULL_OFFSETS "living_reset_pull_offsets"
+//from base of living/CanAllowThrough(): (atom/movable/mover, border_dir)
+#define COMSIG_LIVING_CAN_ALLOW_THROUGH "living_can_allow_through"
+	#define COMPONENT_LIVING_PASSABLE (1<<0)

modular_bandastation/_defines220/code/signals_mob/signals_mob_main.dm

@@ -0,0 +1 @@
+// Signals for /mob

modular_bandastation/_defines220/code/signals_mob/signals_mob_silicon.dm

@@ -0,0 +1 @@
+// Signals for /mob/living/silicon

modular_bandastation/_defines220/code/signals_mob/signals_mob_simple.dm

@@ -0,0 +1 @@
+// Signals for /mob/living/simple_animal

modular_bandastation/_helpers220/_helpers220.dm

@@ -0,0 +1,4 @@
+/datum/modpack/defines220
+	name = "Хелперы220"
+	desc = "Добавляет хелперы, которые нам нужны"
+	author = "larentoun"

modular_bandastation/_helpers220/_helpers220.dme

@@ -0,0 +1 @@
+#include "_helpers220.dm"