Alliance-codeBase · Bruh-24 · Sep 16, 2025 · Sep 14, 2025 · Sep 15, 2025 · Jun 22, 2025
diff --git a/_maps/catwalkstation.json b/_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",

diff --git a/_maps/deltastation.json b/_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",

diff --git a/_maps/icebox.json b/_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,

diff --git a/_maps/metastation.json b/_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",

diff --git a/_maps/nebulastation.json b/_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",

diff --git a/_maps/tramstation.json b/_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",

diff --git a/_maps/wawastation.json b/_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",

diff --git a/code/__DEFINES/DNA.dm b/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"

diff --git a/code/__DEFINES/robots.dm b/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

diff --git a/code/__DEFINES/sound.dm b/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)
 

diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm
@@ -981,6 +981,12 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_SETTLER "settler"
 #define TRAIT_STRONG_STOMACH "strong_stomach"
 #define TRAIT_VEGETARIAN "trait_vegetarian"
+//MASSMETA ADD BEGIN (butt_farts)
+//Butt traits for quirks
+#define TRAIT_LOUD_ASS "loud_ass"
+#define TRAIT_UNSTABLE_ASS "unstable_ass"
+#define TRAIT_STABLE_ASS "stable_ass"
+//MASSMETA ADD END
 
 /// This mob always lands on their feet when they fall, for better or for worse.
 #define TRAIT_CATLIKE_GRACE "catlike_grace"

diff --git a/code/__DEFINES/~DELETE_AFTER_MODULARIZATION.dm b/code/__DEFINES/~DELETE_AFTER_MODULARIZATION.dm
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
@@ -392,7 +392,7 @@ GLOBAL_LIST_INIT(oddity_loot, list(//oddity: strange or crazy items
 			/obj/item/instrument/trumpet/spectral = 1,
 			) = 1,
 		/obj/item/toy/cards/deck/tarot/haunted = 1,
-		/obj/item/organ/internal/butt/atomic = 1, //MASSMETA EDIT (butts)
+		/obj/item/organ/internal/butt/atomic = 1, //MASSMETA ADD (butt_farts) big-bada-booom!
 	))
 
 //Maintenance loot spawner pools

diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm
@@ -151,14 +151,14 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_WALLMOUNTED" = TRAIT_WALLMOUNTED,
 	),
 	/mob = list(
-		//MASSMETA EDIT BEGIN (butts)
+		//MASSMETA ADD BEGIN (butt_farts)
 		"TRAIT_LOUD_ASS" = TRAIT_LOUD_ASS,
 		"TRAIT_UNSTABLE_ASS" = TRAIT_UNSTABLE_ASS,
 		"TRAIT_STABLE_ASS" = TRAIT_STABLE_ASS,
-		//MASSMETA EDIT END
-		//MASSMETA EDIT BEGIN (hooch_heals_assistants)
+		//MASSMETA ADD END
+		//MASSMETA ADD BEGIN (hooch_heals_assistants)
 		"TRAIT_GREYTIDE_METABOLISM" = TRAIT_GREYTIDE_METABOLISM,
-		//MASSMETA EDIT END
+		//MASSMETA ADD END
 		"TRAIT_ABDUCTOR_SCIENTIST_TRAINING" = TRAIT_ABDUCTOR_SCIENTIST_TRAINING,
 		"TRAIT_ABDUCTOR_TRAINING" = TRAIT_ABDUCTOR_TRAINING,
 		"TRAIT_ACT_AS_CULTIST" = TRAIT_ACT_AS_CULTIST,

diff --git a/code/_globalvars/traits/admin_tooling.dm b/code/_globalvars/traits/admin_tooling.dm
@@ -32,6 +32,14 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_SPEED_POTIONED" = TRAIT_SPEED_POTIONED,
 	),
 	/mob = list(
+		//MASSMETA ADD BEGIN (butt_farts)
+		"TRAIT_LOUD_ASS" = TRAIT_LOUD_ASS,
+		"TRAIT_UNSTABLE_ASS" = TRAIT_UNSTABLE_ASS,
+		"TRAIT_STABLE_ASS" = TRAIT_STABLE_ASS,
+		//MASSMETA ADD END
+		//MASSMETA ADD BEGIN (hooch_heals_assistants)
+		"TRAIT_GREYTIDE_METABOLISM" = TRAIT_GREYTIDE_METABOLISM,
+		//MASSMETA ADD END
 		"TRAIT_ABDUCTOR_SCIENTIST_TRAINING" = TRAIT_ABDUCTOR_SCIENTIST_TRAINING,
 		"TRAIT_ABDUCTOR_TRAINING" = TRAIT_ABDUCTOR_TRAINING,
 		"TRAIT_ACT_AS_CULTIST" = TRAIT_ACT_AS_CULTIST,

diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm
@@ -91,10 +91,10 @@ GLOBAL_LIST_EMPTY(features_by_species)
 	var/obj/item/organ/stomach/mutantstomach = /obj/item/organ/stomach
 	///Replaces default appendix with a different organ.
 	var/obj/item/organ/appendix/mutantappendix = /obj/item/organ/appendix
-	//MASSMETA EDIT BEGIN (butts)
+	//MASSMETA ADD BEGIN (butt_farts)
 	///Replaces default butt with a different organ
 	var/obj/item/organ/internal/butt/mutantbutt = /obj/item/organ/internal/butt
-	//MASSMETA EDIT END
+	//MASSMETA ADD END
 
 	/// Store body marking defines. See mobs.dm for bitflags
 	var/list/body_markings = list()
@@ -272,10 +272,10 @@ GLOBAL_LIST_EMPTY(features_by_species)
 			return mutantliver
 		if(ORGAN_SLOT_STOMACH)
 			return mutantstomach
-		//MASSMETA EDIT BEGIN (butts)
+		//MASSMETA ADD BEGIN (butt_farts)
 		if(ORGAN_SLOT_BUTT)
 			return mutantbutt
-		//MASSMETA EDIT END
+		//MASSMETA ADD END
 		else
 			// Non-standard organs we might have
 			for(var/obj/item/organ/extra_organ as anything in mutant_organs)
@@ -1543,6 +1543,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
 	mut_organs += mutantliver
 	mut_organs += mutantstomach
 	mut_organs += mutantappendix
+	mut_organs += mutantbutt
 	list_clear_nulls(mut_organs)
 	return mut_organs
 

diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm
@@ -424,6 +424,12 @@ There are several things that need to be remembered:
 
 		var/icon_file = 'icons/mob/clothing/belt.dmi'
 
+		//MASSMETA ADD BEGIN (heads_on_belts)
+		// для голов на поясе у нас отдельный файлик со спрайтами
+		if(istype(worn_item, /obj/item/bodypart/head))
+			icon_file = 'modular_meta/tweaks/heads_on_belts/icons/belt.dmi'
+		//MASSMETA ADD END
+
 		var/mutable_appearance/belt_overlay = belt.build_worn_icon(default_layer = BELT_LAYER, default_icon_file = icon_file)
 		var/obj/item/bodypart/chest/my_chest = get_bodypart(BODY_ZONE_CHEST)
 		my_chest?.worn_belt_offset?.apply_offset(belt_overlay)

diff --git a/code/modules/mob/living/carbon/human/species_types/android.dm b/code/modules/mob/living/carbon/human/species_types/android.dm
@@ -36,7 +36,7 @@
 	mutantlungs = null
 	mutanteyes = /obj/item/organ/eyes/robotic
 	mutantears = /obj/item/organ/ears/cybernetic
-	mutantbutt = /obj/item/organ/internal/butt/cyber //MASSMETA EDIT (butts)
+	mutantbutt = /obj/item/organ/internal/butt/cyber //MASSMETA EDIT (butt_farts)
 	species_language_holder = /datum/language_holder/synthetic
 	changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
 

diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
@@ -31,6 +31,7 @@
 	changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | ERT_SPAWN
 	species_cookie = /obj/item/reagent_containers/condiment/milk
 	outfit_important_for_life = /datum/outfit/plasmaman
+	mutantbutt = /obj/item/organ/internal/butt/plasma //MASSMETA EDIT (butt_farts)
 	species_language_holder = /datum/language_holder/skeleton
 
 	bodypart_overrides = list(

diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm
@@ -33,6 +33,7 @@
 	//They can technically be in an ERT
 	changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | ERT_SPAWN
 	species_cookie = /obj/item/reagent_containers/condiment/milk
+	mutantbutt = /obj/item/organ/internal/butt/skeletal //MASSMETA EDIT (butt_farts)
 	species_language_holder = /datum/language_holder/skeleton
 
 	bodypart_overrides = list(

diff --git a/code/modules/research/techweb/nodes/mining_nodes.dm b/code/modules/research/techweb/nodes/mining_nodes.dm
@@ -46,7 +46,6 @@
 		"mod_gps",
 		"mod_visor_meson",
 		"mesons",
-		"cryptominer", // MASSMETA EDIT: Cryptoshit
 	)
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
 	announce_channels = list(RADIO_CHANNEL_SUPPLY)

diff --git a/code/modules/research/techweb/nodes/syndicate_nodes.dm b/code/modules/research/techweb/nodes/syndicate_nodes.dm
@@ -16,7 +16,6 @@
 		"rapidsyringe",
 		"suppressor",
 		"super_pointy_tape",
-		"cryptominersyndie", // MASSMETA EDIT: Cryptoshit
 	)
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS)
 	hidden = TRUE

diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm
@@ -8,7 +8,6 @@
 	body_part = HEAD
 	plaintext_zone = "head"
 	w_class = WEIGHT_CLASS_BULKY //Quite a hefty load
-	slot_flags = ITEM_SLOT_BELT // MASSMETA EDIT: Nas'hrah moment
 	slowdown = 1 //Balancing measure
 	throw_range = 2 //No head bowling
 	px_x = 0
@@ -140,6 +139,10 @@
 
 		if(!(locate(/obj/item/organ/tongue) in src))
 			. += span_info("[real_name]'s tongue has been removed.")
+		//MASSMETA ADD BEGIN (heads_on_belts)
+		if(istype(src, /obj/item/bodypart/head))
+			. += span_info("You can wear it on you belt.")
+		//MASSMETA ADD END
 
 /obj/item/bodypart/head/can_dismember(obj/item/item)
 	if (!can_dismember)

diff --git a/code/modules/unit_tests/worn_icons.dm b/code/modules/unit_tests/worn_icons.dm
@@ -4,7 +4,7 @@
 	/// additional_icon_location is for downstream modularity support for finding missing sprites in additonal DMI file locations.
 	/// Make sure this location is also present in tools/deploy.sh
 	/// If you need additional paths ontop of this second one, you can add another generate_possible_icon_states_list("your/folder/path/") below the if(additional_icon_location) block in Run(), and make sure to add that path to tools/deploy.sh as well.
-	var/additional_icon_location = null
+	var/additional_icon_location = "modular_meta/features/heads_on_belts/icons/" //MASSMETA CHANGE (heads_on_belts) этого требуют тесты
 
 /datum/unit_test/worn_icons/proc/generate_possible_icon_states_list(directory_path)
 	if(!directory_path)
@@ -102,4 +102,4 @@
 			icon_file = 'icons/mob/clothing/belt.dmi'
 			if(!(icon_state in icon_states(icon_file, 1)))
 				already_warned_icons += icon_state
 				TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]")
diff --git a/icons/map_icons/items/_item.dmi b/icons/map_icons/items/_item.dmi
diff --git a/interface/skin.dmf b/interface/skin.dmf
@@ -99,7 +99,7 @@ window "mainwindow"
 		//MASSMETA EDIT BEGIN (better_ui)
 		//icon = 'icons\\ui\\common\\tg_32.png'
 
-		icon = 'modular_meta\\features\\better_ui\\icons\\massmeta_64.png'
+		icon = 'modular_meta\\tweaks\\better_ui\\icons\\massmeta_64.png'
 		//MASSMETA EDIT END
 		macro = "default"
 		menu = "menu"

diff --git a/massmeta/icons/obj/butts.dmi b/massmeta/icons/obj/butts.dmi
diff --git a/massmeta/modular_meta_defines.dm b/massmeta/modular_meta_defines.dm
diff --git a/massmeta/modular_meta_features.dm b/massmeta/modular_meta_features.dm
@@ -13,23 +13,8 @@
 
 //master files (unsorted, TODO: need modularization)
 
-#include "code\modules\mob\living\carbon\human\emote.dm"
-#include "code\datums\components\crafting\makeshift.dm"
-#include "code\game\objects\items\devices\radio\radio.dm"
-#include "code\game\objects\items\storage\belt.dm"
-#include "code\game\objects\items\tools\crowbar.dm"
-#include "code\game\objects\items\tools\kitchen.dm"
-#include "code\game\objects\items\tools\multitool.dm"
-#include "code\game\objects\items\tools\screwdriver.dm"
-#include "code\game\objects\items\tools\weldingtool.dm"
-#include "code\game\objects\items\tools\wirecutters.dm"
-#include "code\game\objects\items\tools\wrench.dm"
 #include "code\obj\items\clothing\belt.dm"
 #include "code\datums\components\crafting\weapon_ammo.dm"
 #include "code\modules\ammunition\ballistic\shotgun.dm"
 #include "code\modules\projectiles\projectile\bullets\shotgun.dm"
 #include "code\modules\map_vote.dm"
-
-//buts
-#include "code\modules\surgery\organs\internal\butts\butts.dm"
-#include "code\modules\surgery\organs\internal\butts\butts_init.dm"
diff --git a/massmeta/~meta_defines/butt_furrt.dm b/massmeta/~meta_defines/butt_furrt.dm
diff --git a/massmeta/~meta_defines/readme.md b/massmeta/~meta_defines/readme.md
diff --git a/modular_meta/__modpack/assets_modpacks.dm b/modular_meta/__modpack/assets_modpacks.dm
@@ -4,18 +4,18 @@
 	name = "modpacks"
 
 /datum/asset/spritesheet_batched/modpacks/create_spritesheets()
-	insert_all_icons("modpack", MODPACKS_SET)
 	// catch all modpack's previews which are pulling icons from preview.dmi files
-	var/icon_placeholder = "default"
+	// not from .png due of special work insert_icon() with uni_icon()
 	for(var/datum/modpack/this_modpack as anything in subtypesof(/datum/modpack))
 		if(!this_modpack.visible)
 			continue
 
 		var/icon = initial(this_modpack.icon)
-		var/icon_state = initial(this_modpack.id)
+		var/modpack_id = initial(this_modpack.id)
+
 		if(icon == MODPACKS_SET)
-			insert_icon("modpack-[icon_state]", uni_icon(icon, icon_placeholder))
+			insert_icon("modpack-[modpack_id]", uni_icon(icon, "no-preview"))
 		else
-			insert_icon("modpack-[icon_state]", uni_icon(icon, icon_state))
+			insert_icon("modpack-[modpack_id]", uni_icon(icon, "preview"))
 
 #undef MODPACKS_SET
diff --git a/modular_meta/__modpack/mods_icon_placeholder.dmi b/modular_meta/__modpack/mods_icon_placeholder.dmi
diff --git a/modular_meta/features/additional_circuit/preview.dmi b/modular_meta/features/additional_circuit/preview.dmi
diff --git a/modular_meta/features/antagonists/bloodsuckers/code/objects/bloodsucker_blood_containers.dm b/modular_meta/features/antagonists/bloodsuckers/code/objects/bloodsucker_blood_containers.dm
@@ -41,7 +41,7 @@
 ///Bloodbag of Bloodsucker blood (used by Vassals only)
 /obj/item/reagent_containers/blood/o_minus/bloodsucker
 	name = "blood pack"
-	blood_type = /datum/reagent/blood/bloodsucker
+	blood_type = BLOOD_TYPE_VAMPIRE
 
 /obj/item/reagent_containers/blood/o_minus/bloodsucker/examine(mob/user)
 	. = ..()

diff --git a/modular_meta/features/antagonists/preview.dmi b/modular_meta/features/antagonists/preview.dmi
diff --git a/modular_meta/features/antagonists/sinful_demon/code/sins/sloth.dm b/modular_meta/features/antagonists/sinful_demon/code/sins/sloth.dm
@@ -54,6 +54,6 @@
 	return TRUE
 
 /datum/action/cooldown/spell/jaunt/ethereal_jaunt/sin/sloth
+	name = "Sloth Demonic Jaunt"
 	cooldown_time = 30 SECONDS
-
 	jaunt_duration = 1 SECONDS