start

Artemchik542 · Artemchik542 · commit 41942cf0215e · 2026-01-29T20:57:07.000+07:00
diff --git a/_maps/minigame/deathmatch/protobox_permabrig.dmm b/_maps/minigame/deathmatch/protobox_permabrig.dmm
@@ -539,7 +539,7 @@
 /area/deathmatch)
 "tJ" = (
 /obj/effect/decal/cleanable/blood,
-/obj/item/knife/kitchen/makeshift/makeshift,
+/obj/item/knife/kitchen/makeshift,
 /turf/open/floor/iron/dark/smooth_half{
 	dir = 1
 	},
diff --git a/code/game/objects/structures/syndicate_uplink_beacon.dm b/code/game/objects/structures/syndicate_uplink_beacon.dm
@@ -7,6 +7,7 @@
 	desc = "This ramshackle device seems capable of receiving and sending signals for some nefarious purpose."
 	density = TRUE
 	anchored = TRUE
+	custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5.05, /datum/material/bluespace = SHEET_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.5)
 	/// Traitor's code that they speak into the radio
 	var/uplink_code = ""
 	/// weakref to person who is going to use the beacon to get a replacement uplink
diff --git a/code/modules/research/techweb/nodes/medbay_nodes.dm b/code/modules/research/techweb/nodes/medbay_nodes.dm
@@ -78,11 +78,9 @@
 		"chem_mass_spec",
 		"crewpinpointer",
 		"defibmount",
-		"medicalbed_emergency",
-		"piercesyringe",
 		// MASSMETA EDIT BEGIN (not_enough_medical)
-		"autodoc",
-		"organdoc",
+		//"autodoc",
+		//"organdoc",
 		// MASSMETA EDIT END
 		"diode_disk_healing",
 		"diode_disk_sanity",
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 = "modular_meta/features/heads_on_belts/icons/" //MASSMETA CHANGE (heads_on_belts) этого требуют тесты
+	var/additional_icon_location = "modular_meta/tweaks/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)
diff --git a/modular_meta/features/antagonists/bloodsuckers/code/bloodsucker/bloodsucker_integration.dm b/modular_meta/features/antagonists/bloodsuckers/code/bloodsucker/bloodsucker_integration.dm
@@ -16,7 +16,7 @@
 		return ..()
 	bloodsuckerdatum.AddBloodVolume(round(reac_volume, 0.1))
 
-/mob/living/carbon/transfer_blood_to(atom/movable/AM, amount, forced, ignore_incompatibility)
+/mob/living/carbon/transfer_blood_to(atom/movable/AM, amount, forced, ignore_low_blood = FALSE, ignore_incompatibility = FALSE, transfer_viruses = TRUE)
 	. = ..()
 
 	if(!mind)
diff --git a/modular_meta/features/antagonists/bloodsuckers/code/objects/bloodsucker_stakes.dm b/modular_meta/features/antagonists/bloodsuckers/code/objects/bloodsucker_stakes.dm
@@ -65,6 +65,7 @@
 	force = 6
 	throwforce = 10
 	max_integrity = 30
+	custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 3)
 
 	///Time it takes to embed the stake into someone's chest.
 	var/staketime = 12 SECONDS
@@ -130,6 +131,7 @@
 	armour_penetration = 10
 	embed_data = /datum/embedding/hardened_stake
 	staketime = 80
+	custom_materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT)
 
 /datum/embedding/hardened_stake
 	embed_chance = 35
@@ -144,6 +146,7 @@
 	armour_penetration = 25
 	embed_data = /datum/embedding/silver_stake
 	staketime = 60
+	custom_materials = list(/datum/material/silver = SHEET_MATERIAL_AMOUNT, /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT)
 
 /datum/embedding/silver_stake
 	embed_chance = 65
diff --git a/modular_meta/features/antagonists/bloodsuckers/code/structures/bloodsucker_coffin.dm b/modular_meta/features/antagonists/bloodsuckers/code/structures/bloodsucker_coffin.dm
@@ -54,6 +54,7 @@
 	material_drop = /obj/item/stack/sheet/iron
 	material_drop_amount = 2
 	armor_type = /datum/armor/blackcoffin
+	custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 5, /datum/material/iron = SHEET_MATERIAL_AMOUNT)
 
 /datum/armor/blackcoffin
 	melee = 50
@@ -77,6 +78,7 @@
 	material_drop = /obj/item/stack/sheet/iron
 	material_drop_amount = 2
 	armor_type = /datum/armor/securecoffin
+	custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5.5, /datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 5)
 
 /datum/armor/securecoffin
 	melee = 35
@@ -100,6 +102,7 @@
 	material_drop = /obj/item/food/meat/slab/human
 	material_drop_amount = 3
 	armor_type = /datum/armor/meatcoffin
+	custom_materials = list(/datum/material/meat = SHEET_MATERIAL_AMOUNT * 20, /datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1.5)
 
 /datum/armor/meatcoffin
 	melee = 70
@@ -123,6 +126,7 @@
 	material_drop = /obj/item/stack/sheet/iron
 	material_drop_amount = 5
 	armor_type = /datum/armor/metalcoffin
+	custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 7)
 
 /datum/armor/metalcoffin
 	melee = 40
diff --git a/modular_meta/features/antagonists/bloodsuckers/code/structures/bloodsucker_lighting.dm b/modular_meta/features/antagonists/bloodsuckers/code/structures/bloodsucker_lighting.dm
@@ -100,6 +100,7 @@
 	vamp_desc = "This magical candle drains the sanity of unvassalized mortals while active.\n\
 		You alone can toggle it from afar by <b>ctrl-clicking</b> it."
 	vassal_desc = "This magical candle drains the sanity of those fools who havent yet accepted your master while active."
+	custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3.5)
 
 /obj/structure/bloodsucker/lighting/cendelabrum/process()
 	. = ..()
@@ -120,6 +121,7 @@
 	active_light_range = 6
 	vamp_desc = "You alone can toggle this from afar by <b>ctrl-clicking</b> it."
 	vassal_desc = "You can toggle this by <b>clicking</b> it."
+	custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3.5, /datum/material/wood = SHEET_MATERIAL_AMOUNT * 2)
 
 	/// Our slightly quieter looping burn sound effect; copied over from 'bonfire.dm'
 	var/datum/looping_sound/burning/brazier/burning_loop
diff --git a/modular_meta/features/antagonists/bloodsuckers/code/structures/bloodsucker_mirror.dm b/modular_meta/features/antagonists/bloodsuckers/code/structures/bloodsucker_mirror.dm
@@ -4,10 +4,7 @@
 	desc = "A pool of stilled blood kept secure between unanchored glass and silver. Attach it to a wall to use."
 	icon = 'modular_meta/features/antagonists/icons/bloodsuckers/vamp_obj.dmi'
 	icon_state = "blood_mirror"
-	custom_materials = list(
-		/datum/material/glass = SHEET_MATERIAL_AMOUNT,
-		/datum/material/silver = SHEET_MATERIAL_AMOUNT,
-	)
+	custom_materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT * 5, /datum/material/silver = SHEET_MATERIAL_AMOUNT * 2)
 	result_path = /obj/structure/bloodsucker/mirror
 	pixel_shift = 28
 
diff --git a/modular_meta/features/antagonists/bloodsuckers/code/structures/bloodsucker_rack.dm b/modular_meta/features/antagonists/bloodsuckers/code/structures/bloodsucker_rack.dm
@@ -16,6 +16,7 @@
 	vassal_desc = "This is a persuassion rack, which allows your master to thrall crewmembers into their service.\n\
 		Aid your master in bringing their victims here and keeping them secure.\n\
 		You can secure victims to the rack by dragging their sprite onto the rack while it is secured."
+	custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 3, /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.3, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3)
 
 #ifdef BLOODSUCKER_TESTING
 	var/convert_progress = 1
diff --git a/modular_meta/features/antagonists/bloodsuckers/code/structures/bloodsucker_throne.dm b/modular_meta/features/antagonists/bloodsuckers/code/structures/bloodsucker_throne.dm
@@ -13,6 +13,7 @@
 	vamp_desc = "This is a blood throne, sitting on it will allow you to telepathically broadcast messages to all of your vassals by simply speaking. \n\
 		Unlike other blood structures this throne may be unsecured by a <b>right-click</b> (just make sure it's unoccupied first)."
 	vassal_desc = "This is a blood throne, it allows your master to telepathically speak to you and others who work under them."
+	custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/wood = SHEET_MATERIAL_AMOUNT)
 	///The static armrest that the throne has while someone is buckled onto it.
 	var/static/mutable_appearance/armrest
 
diff --git a/modular_meta/features/antagonists/bloodsuckers/rulesets.dm b/modular_meta/features/antagonists/bloodsuckers/rulesets.dm
@@ -29,6 +29,7 @@
 /datum/dynamic_ruleset/midround/bloodsucker
 	name = "Vampiric Accident"
 	config_tag = "Midround Bloodsucker"
+	midround_type = LIGHT_MIDROUND
 	preview_antag_datum = /datum/antagonist/bloodsucker
 	pref_flag = ROLE_VAMPIRICACCIDENT
 	min_pop = 5
diff --git a/modular_meta/features/cargo_extended/code/bluespaceminers.dm b/modular_meta/features/cargo_extended/code/bluespaceminers.dm
@@ -63,13 +63,13 @@
 		/datum/material/diamond = COIN_MATERIAL_AMOUNT,
 		/datum/material/bluespace = COIN_MATERIAL_AMOUNT
 	)
-	var/datum/component/remote_materials/materials
+	var/datum/remote_materials/materials
 	var/mine_rate = 1
 
 /obj/machinery/mineral/bluespace_miner/Initialize(mapload)
 	. = ..()
 	START_PROCESSING(SSmachines, src)
-	materials = AddComponent(/datum/component/remote_materials, "bsm", mapload)
+	materials = new (src, "bsm", mapload)
 
 /obj/machinery/mineral/bluespace_miner/Destroy()
 	materials = null
@@ -127,7 +127,7 @@
 	if(!materials?.silo || materials?.on_hold() || panel_open || !powered() || !anchored)
 		update_icon_state()
 		return
-	var/datum/component/material_container/mat_container = materials.mat_container
+	var/datum/material_container/mat_container = materials.mat_container
 	if(!mat_container)
 		update_icon_state()
 		return
diff --git a/modular_meta/features/cargo_extended/includes.dm b/modular_meta/features/cargo_extended/includes.dm
@@ -1,4 +1,4 @@
-//#include "code\bluespaceminers.dm" СЛОМАНО.
+#include "code\bluespaceminers.dm"
 #include "code\cargo_teleporter.dm"
 #include "code\cryptominers.dm"
 
diff --git a/modular_meta/features/makeshift_grenade_trap/code/trap.dm b/modular_meta/features/makeshift_grenade_trap/code/trap.dm
@@ -9,6 +9,7 @@
 	resistance_flags = FLAMMABLE
 	max_integrity = 25
 	integrity_failure = 0.5
+	custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3)
 	var/obj/item/grenade/stretching
 	var/mob/owner
 
diff --git a/modular_meta/features/makeshift_tools/code/belt.dm b/modular_meta/features/makeshift_tools/code/belt.dm
@@ -9,6 +9,7 @@
 	worn_icon_state = "makeshiftbelt"
 	icon_state = "makeshiftbelt"
 	w_class = WEIGHT_CLASS_BULKY
+	custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 4.65, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1.5)
 
 /obj/item/storage/belt/utility/makeshift/Initialize(mapload)
 	. = ..()
diff --git a/modular_meta/features/makeshift_tools/code/crowbar.dm b/modular_meta/features/makeshift_tools/code/crowbar.dm
@@ -7,6 +7,14 @@
 	force = 12 //same as large crowbar, but bulkier and slower
 	w_class = WEIGHT_CLASS_BULKY
 	toolspeed = 2
+	custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.5)
+
+	greyscale_colors = null
+	greyscale_config = null
+	greyscale_config_inhand_left = null
+	greyscale_config_inhand_right = null
+	greyscale_config_worn = null
+	post_init_icon_state = null
 
 /obj/item/crowbar/makeshift/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
 	..()
diff --git a/modular_meta/features/makeshift_tools/code/kitchen.dm b/modular_meta/features/makeshift_tools/code/kitchen.dm
@@ -1,12 +1,13 @@
-/obj/item/knife/kitchen/makeshift/makeshift
+/obj/item/knife/kitchen/makeshift
 	name = "makeshift knife"
 	icon_state = "knife_makeshift"
 	icon = 'modular_meta/features/makeshift_tools/icons/improvised.dmi'
 	desc = "A flimsy, poorly made replica of a classic cooking utensil."
 	force = 8
 	throwforce = 8
+	custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.6, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1)
 
-/obj/item/knife/kitchen/makeshift/makeshift/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+/obj/item/knife/kitchen/makeshift/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
 	..()
 	if(prob(5))
 		to_chat(user, span_danger("[src] crumbles apart in your hands!"))
diff --git a/modular_meta/features/makeshift_tools/code/multitool.dm b/modular_meta/features/makeshift_tools/code/multitool.dm
@@ -4,6 +4,14 @@
 	icon = 'modular_meta/features/makeshift_tools/icons/improvised.dmi'
 	icon_state = "multitool_makeshift"
 	toolspeed = 2
+	custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2.7)
+
+	greyscale_colors = null
+	greyscale_config = null
+	greyscale_config_inhand_left = null
+	greyscale_config_inhand_right = null
+	greyscale_config_worn = null
+	post_init_icon_state = null
 
 /obj/item/multitool/makeshift/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
 	..()
diff --git a/modular_meta/features/makeshift_tools/code/radio.dm b/modular_meta/features/makeshift_tools/code/radio.dm
@@ -3,3 +3,4 @@
 	icon_state = "radio_makeshift"
 	subspace_switchable = TRUE  // Made with a headset, so it can transmit over subspace I guess
 	freqlock = TRUE
+	custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 0.52, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1.7)
diff --git a/modular_meta/features/makeshift_tools/code/screwdriver.dm b/modular_meta/features/makeshift_tools/code/screwdriver.dm
@@ -5,6 +5,14 @@
 	icon_state = "screwdriver_makeshift"
 	toolspeed = 2
 	random_color = FALSE
+	custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.5)
+
+	greyscale_colors = null
+	greyscale_config = null
+	greyscale_config_inhand_left = null
+	greyscale_config_inhand_right = null
+	greyscale_config_worn = null
+	post_init_icon_state = null
 
 /obj/item/screwdriver/makeshift/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
 	..()
diff --git a/modular_meta/features/makeshift_tools/code/weldingtool.dm b/modular_meta/features/makeshift_tools/code/weldingtool.dm
@@ -7,7 +7,14 @@
 	max_fuel = 10
 	starting_fuel = FALSE
 	change_icons = FALSE
-	custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.7)
+	custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.5)
+
+	greyscale_colors = null
+	greyscale_config = null
+	greyscale_config_inhand_left = null
+	greyscale_config_inhand_right = null
+	greyscale_config_worn = null
+	post_init_icon_state = null
 
 /obj/item/weldingtool/makeshift/switched_on(mob/user)
 	..()
diff --git a/modular_meta/features/makeshift_tools/code/wirecutters.dm b/modular_meta/features/makeshift_tools/code/wirecutters.dm
@@ -5,6 +5,14 @@
 	icon_state = "cutters_makeshift"
 	toolspeed = 2
 	random_color = FALSE
+	custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3.05, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.5)
+
+	greyscale_colors = null
+	greyscale_config = null
+	greyscale_config_inhand_left = null
+	greyscale_config_inhand_right = null
+	greyscale_config_worn = null
+	post_init_icon_state = null
 
 /obj/item/wirecutters/makeshift/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
 	..()
diff --git a/modular_meta/features/makeshift_tools/code/wrench.dm b/modular_meta/features/makeshift_tools/code/wrench.dm
@@ -4,6 +4,14 @@
 	icon = 'modular_meta/features/makeshift_tools/icons/improvised.dmi'
 	icon_state = "wrench_makeshift"
 	toolspeed = 2
+	custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
+
+	greyscale_colors = null
+	greyscale_config = null
+	greyscale_config_inhand_left = null
+	greyscale_config_inhand_right = null
+	greyscale_config_worn = null
+	post_init_icon_state = null
 
 /obj/item/wrench/makeshift/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
 	..()
diff --git a/modular_meta/features/more_cell_interactions/code/manual_cell_recharger.dm b/modular_meta/features/more_cell_interactions/code/manual_cell_recharger.dm
@@ -7,6 +7,7 @@
 	item_flags = NOBLUDGEON
 	slot_flags = ITEM_SLOT_BELT
 	w_class = WEIGHT_CLASS_SMALL
+	custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.05, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1.05)
 	var/obj/item/stock_parts/power_store/cell/incell
 	var/obj/item/stock_parts/servo/motor
 
diff --git a/modular_meta/features/not_enough_decor/code/obj/chairs.dm b/modular_meta/features/not_enough_decor/code/obj/chairs.dm
@@ -12,6 +12,7 @@
 	item_chair = null
 	has_armrest = FALSE
 	anchored = TRUE
+	custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
 
 // В разных цветах
 /obj/structure/chair/padded/red
diff --git a/modular_meta/tweaks/heads_on_belts/code/head_belted.dm b/modular_meta/tweaks/heads_on_belts/code/head_belted.dm
@@ -1,6 +1,7 @@
 /obj/item/bodypart/head
 	slot_flags = ITEM_SLOT_BELT
 	worn_icon_state = "default_human_head"
+	worn_icon  = 'modular_meta/tweaks/heads_on_belts/icons/belt.dmi'
 
 /obj/item/bodypart/head/monkey
 	worn_icon_state = "default_monkey_head"
@@ -45,16 +46,19 @@
 	worn_icon_state = ""
 
 /obj/item/bodypart/head/golem
-	worn_icon_state = ""
+	worn_icon_state = "golem_head"
 
 /obj/item/bodypart/head/moth
-	worn_icon_state = ""
+	worn_icon_state = "moth_head"
 
 /obj/item/bodypart/head/lizard
 	worn_icon_state = ""
 
 /obj/item/bodypart/head/ethereal
 	worn_icon_state = ""
 
+/obj/item/bodypart/head/ethereal/lustrous
+	worn_icon_state = "lustrous_head"
+
 /obj/item/bodypart/head/plasmaman
-	worn_icon_state = ""
+	worn_icon_state = "plasmaman_head"
diff --git a/modular_meta/tweaks/heads_on_belts/icons/belt.dmi b/modular_meta/tweaks/heads_on_belts/icons/belt.dmi
