Merge branch 'Alliance-codeBase:master' into master

Author: Bruh-24

_maps/catwalkstation.json

@@ -3,6 +3,7 @@
 	"map_name": "Catwalk Station",
 	"map_path": "map_files/CatwalkStation",
 	"map_file": "CatwalkStation_2023.dmm",
+	"exclude_from_ci": true,
 	"shuttles": {
 		"emergency": "emergency_catwalk",
 		"ferry": "ferry_fancy",

_maps/deltastation.json

@@ -3,6 +3,7 @@
 	"map_name": "Delta Station",
 	"map_path": "map_files/Deltastation",
 	"map_file": "DeltaStation2.dmm",
+	"exclude_from_ci": true,
 	"shuttles": {
 		"emergency": "emergency_delta",
 		"ferry": "ferry_fancy",

_maps/icebox.json

@@ -3,6 +3,7 @@
 	"map_name": "Ice Box Station",
 	"map_path": "map_files/IceBoxStation",
 	"map_file": "IceBoxStation.dmm",
+	"exclude_from_ci": true,
 	"space_ruin_levels": 0,
 	"space_empty_levels": 0,
 	"wilderness_levels": 2,

_maps/metastation.json

@@ -3,6 +3,7 @@
 	"map_name": "MetaStation",
 	"map_path": "map_files/MetaStation",
 	"map_file": "MetaStation.dmm",
+	"exclude_from_ci": true,
 	"shuttles": {
 		"cargo": "cargo_box",
 		"ferry": "ferry_fancy",

_maps/nebulastation.json

@@ -3,6 +3,7 @@
 	"map_name": "NebulaStation",
 	"map_path": "map_files/NebulaStation",
 	"map_file": "NebulaStation.dmm",
+	"exclude_from_ci": true,
 	"give_players_hooks": 1,
 	"shuttles": {
 		"cargo": "cargo_nebula",

_maps/tramstation.json

@@ -3,6 +3,7 @@
 	"map_name": "Tramstation",
 	"map_path": "map_files/tramstation",
 	"map_file": "tramstation.dmm",
+	"exclude_from_ci": true,
 	"give_players_hooks": 1,
 	"shuttles": {
 		"cargo": "cargo_box",

_maps/wawastation.json

@@ -3,6 +3,7 @@
 	"map_name": "Wawastation",
 	"map_path": "map_files/wawastation",
 	"map_file": "wawastation.dmm",
+	"exclude_from_ci": true,
 	"give_players_hooks": 1,
 	"shuttles": {
 		"cargo": "cargo_box",

code/__DEFINES/DNA.dm

@@ -93,6 +93,7 @@
 #define ORGAN_SLOT_BRAIN_CEREBELLUM "brain_antidrop"
 #define ORGAN_SLOT_BRAIN_CNS "brain_antistun"
 #define ORGAN_SLOT_BREATHING_TUBE "breathing_tube"
+#define ORGAN_SLOT_BUTT "butt" //MASSMETA ADD (butt_farts)
 #define ORGAN_SLOT_EARS "ears"
 #define ORGAN_SLOT_EYES "eye_sight"
 #define ORGAN_SLOT_HEART "heart"

code/__DEFINES/robots.dm

@@ -142,6 +142,10 @@ DEFINE_BITFIELD(bot_cover_flags, list(
 #define VIBE_BOT "Vibebot"
 /// Repairbots
 #define REPAIR_BOT "Repairbot"
+//MASSMETA ADD (butt_farts)
+/// Buttbots
+#define BUTT_BOT "Buttbot"
+//MASSMETA ADD END
 
 // General Bot modes //
 /// Idle

code/__DEFINES/sound.dm

@@ -12,9 +12,12 @@
 #define CHANNEL_ELEVATOR 1014
 #define CHANNEL_ESCAPEMENU 1013
 #define CHANNEL_WEATHER 1012
+//MASSMETA ADD BEGIN (butt_farts)
+#define CHANNEL_FART_SOUNDS 1011 // выделяем в отдельную группу, чтобы можно было в префах регулировать звуки "пу"
+//MASSMETA ADD END
 //THIS SHOULD ALWAYS BE THE LOWEST ONE!
 //KEEP IT UPDATED
-#define CHANNEL_HIGHEST_AVAILABLE 1011
+#define CHANNEL_HIGHEST_AVAILABLE 1010 //MASSMETA CHANGE (butt_farts)
 
 #define MAX_INSTRUMENT_CHANNELS (128 * 6)