Доп правки для патчка 1.1 (#2386)

SierraBay · Jun 23, 2024 · d4eb61b · d4eb61b
1 parent a751fa2
commit d4eb61b
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 4 deletions.
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
@@ -187,6 +187,9 @@ var/global/list/admin_verbs_debug = list(
 	/client/proc/delete_random_map,
 	/datum/admins/proc/map_template_load,
 	/datum/admins/proc/map_template_load_new_z,
+	//[SIERRA-ADD] - Colony types,
+	/datum/admins/proc/map_template_choose_colony_type,
+	//[SIERRA-ADD],
 	/datum/admins/proc/map_template_upload,
 	/client/proc/enable_debug_verbs,
 	/client/proc/callproc,

diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm
@@ -98,9 +98,9 @@
 	remove_client_color(/datum/client_color/monochrome)
 	remove_client_color(/datum/client_color/nvg)
 	//SIERRA-EDIT (Убивает рантайм, когда с НЕ шлемов пытаются стянуть очки)
-	// if(hat)
+	//if(hat)
 
-	if (hat && istype(hat, /obj/item/clothing/accessory ))
+	if (hat && istype(hat, /obj/item/clothing/head ))
 	//SIERRA-EDIT
 		for(var/obj/item/clothing/accessory/glassesmod/mod in hat.accessories)
 			if (mod?.active)

diff --git a/mods/colony_fractions/README.md b/mods/colony_fractions/README.md
@@ -70,7 +70,8 @@ ID мода: EXAMPLE
 
 ### Авторы:
 
-Shegar
+Shegar - основной код
+UEDHighCommand - текстовка, помощь с тестами
 <!--
   Здесь находится твой никнейм
   Если работал совместно - никнеймы тех, кто помогал.

diff --git a/mods/colony_fractions/code/admin_button.dm b/mods/colony_fractions/code/admin_button.dm
@@ -1,4 +1,4 @@
-/client/proc/map_template_choose_colony_type()
+/datum/admins/proc/map_template_choose_colony_type()
 	set category = "Fun"
 	set desc = "Choose, which type will be next spawned colony."
 	set name = "Map Template - Choose colony type"

diff --git a/mods/mechs_by_shegar/code/components/arms.dm b/mods/mechs_by_shegar/code/components/arms.dm
@@ -16,13 +16,15 @@
 	max_repair = 20
 	melee_damage = 30
 	repair_damage = 15
+	req_material = MATERIAL_ALUMINIUM
 
 /obj/item/mech_component/manipulators/heavy
 	melee_damage = 40
 	max_repair = 150
 	max_damage = 500
 	min_damage = 300
 	repair_damage = 30
+	req_material = MATERIAL_PLASTEEL
 
 /obj/item/mech_component/manipulators/combat
 	max_damage = 180

diff --git a/mods/mechs_by_shegar/code/components/body.dm b/mods/mechs_by_shegar/code/components/body.dm
@@ -41,6 +41,7 @@
 	max_repair = 40
 	repair_damage = 20
 	hide_pilot = TRUE
+	req_material = MATERIAL_ALUMINIUM
 
 /obj/item/mech_component/chassis/light/Initialize()
 	back_passengers_positions = list(
@@ -96,6 +97,7 @@
 	min_damage = 350
 	repair_damage = 30
 	hide_pilot = TRUE
+	req_material = MATERIAL_PLASTEEL
 
 /obj/item/mech_component/chassis/heavy/Initialize()
 	back_passengers_positions = list(

diff --git a/mods/mechs_by_shegar/code/components/head.dm b/mods/mechs_by_shegar/code/components/head.dm
@@ -9,13 +9,15 @@
 	min_damage = 50
 	max_repair = 20
 	repair_damage = 15
+	req_material = MATERIAL_ALUMINIUM
 
 /obj/item/mech_component/sensors/heavy
 	max_damage = 500
 	min_damage = 300
 	max_repair = 150
 	repair_damage = 30
 	repair_damage = 30
+	req_material = MATERIAL_PLASTEEL
 
 /obj/item/mech_component/sensors/combat
 	max_damage = 180

diff --git a/mods/mechs_by_shegar/code/components/legs.dm b/mods/mechs_by_shegar/code/components/legs.dm
@@ -20,6 +20,7 @@
 	min_damage = 50
 	max_repair = 20
 	repair_damage = 15
+	req_material = MATERIAL_ALUMINIUM
 
 /obj/item/mech_component/propulsion/spider
 	max_damage = 210
@@ -45,6 +46,7 @@
 	repair_damage = 20
 	bump_type = HARD_BUMP
 	bump_safety = FALSE
+	req_material = MATERIAL_PLASTEEL
 
 /obj/item/mech_component/propulsion/combat
 	max_damage = 180

diff --git a/mods/mechs_by_shegar/code/mech.dm b/mods/mechs_by_shegar/code/mech.dm
@@ -22,6 +22,7 @@
 	var/list/parts_list_images
 	///Содержит в себе данные привязанной id карты. По умолчанию - пусто
 	var/list/id_holder
+	mob_never_swap = TRUE
 
 
 /mob/living/exosuit/Initialize(mapload, obj/structure/heavy_vehicle_frame/source_frame)
@@ -62,3 +63,6 @@
 	LAZYCLEARLIST(parts_list_images)
 	parts_list = list(head, body, arms, legs)
 	parts_list_images = make_item_radial_menu_choices(parts_list)
+
+/mob/living/exosuit/can_swap_with(mob/living/tmob)
+	return 0
diff --git a/mods/utility_items/_utility_items.dme b/mods/utility_items/_utility_items.dme
@@ -6,6 +6,7 @@
 
 #include "code/colony_random.dm"
 #include "code/multimeter.dm"
+#include "code/living_adv.dm"
 #include "code/noose.dm"
 #include "code/wires.dm"
 #include "code/reagents.dm"

diff --git a/mods/utility_items/code/living_adv.dm b/mods/utility_items/code/living_adv.dm
@@ -0,0 +1,9 @@
+//Здесь я добавил переменную и проверку для того чтоб с некоторыми мобами
+//НИКОГДА не свапались, в случае нужды.
+/mob/living
+	var/mob_never_swap = FALSE
+
+/mob/living/can_swap_with(mob/living/tmob)
+	if(tmob.mob_never_swap)
+		return 0
+	.=..()