Мехи работают

.gitignore

@@ -35,3 +35,4 @@ stddef.dm
 
 # ignore midi2piano build cache
 /tools/midi2piano/midi2piano/obj/*
+paradise.dme

code/__DEFINES/misc.dm

@@ -269,6 +269,7 @@
 		"blue"		= "grey",		\
 		"green"		= "grey",		\
 		"orange"	= "light grey",	\
+		"yellow"	= "light grey",	\
 		"brown"		= "grey",		\
 		"gold"		= "light grey",	\
 		"cyan"		= "silver",		\
@@ -283,8 +284,9 @@
 		"red"		= "darkolivegreen",	\
 		"green"		= "darkslategrey",	\
 		"orange"	= "goldenrod",		\
-		"gold"		= "goldenrod", 		\
+		"yellow"	= "goldenrod", 		\
 		"brown"		= "darkolivegreen",	\
+		"gold"		= "goldenrod", 		\
 		"cyan"		= "steelblue",		\
 		"magenta"	= "blue",			\
 		"purple"	= "darkslategrey",	\
@@ -298,8 +300,9 @@
 		"blue"		= "darkslateblue",	\
 		"green"		= "darkolivegreen",	\
 		"orange"	= "darkkhaki",		\
-		"gold"		= "darkkhaki",		\
+		"yellow"	= "darkkhaki",		\
 		"brown"		= "rebeccapurple",	\
+		"gold"		= "darkkhaki",		\
 		"cyan"		= "darkseagreen",	\
 		"magenta"	= "darkslateblue",	\
 		"purple"	= "darkslateblue",	\

code/datums/helper_datums/construction_datum.dm

@@ -6,6 +6,7 @@
 	var/list/steps
 	var/atom/holder
 	var/result
+	var/index
 	var/list/steps_desc
 	var/taskpath = null // Path of job objective completed.
 
@@ -128,7 +129,6 @@
 			return TRUE
 
 /datum/construction/reversible
-	var/index
 
 /datum/construction/reversible/New(atom)
 	..()
@@ -168,7 +168,6 @@
 #define state_prev "prev"
 
 /datum/construction/reversible2
-	var/index
 	var/base_icon = "durand"
 
 /datum/construction/reversible2/New(atom)

code/game/machinery/machinery.dm

@@ -523,15 +523,21 @@ Class Procs:
 						break
 				for(var/obj/item/stock_parts/B in W.contents)
 					if(istype(B, P) && istype(A, P))
-						if(B.rating > A.rating)
-							W.remove_from_storage(B, src)
-							W.handle_item_insertion(A, 1)
-							component_parts -= A
-							component_parts += B
-							B.loc = null
-							to_chat(user, "<span class='notice'>[A.name] replaced with [B.name].</span>")
-							shouldplaysound = 1
-							break
+						if(ispath(B.type, /obj/item/stock_parts/cell))
+							var/obj/item/stock_parts/cell/tA = A
+							var/obj/item/stock_parts/cell/tB = B
+							if(!(tB.maxcharge > tA.maxcharge) && !((tB.maxcharge == tA.maxcharge) && (tB.charge > tA.charge)))
+								continue
+						else if(B.rating <= A.rating)
+							continue
+						W.remove_from_storage(B, src)
+						W.handle_item_insertion(A, 1)
+						component_parts -= A
+						component_parts += B
+						B.loc = null
+						to_chat(user, "<span class='notice'>[A.name] replaced with [B.name].</span>")
+						shouldplaysound = 1
+						break
 			RefreshParts()
 		else
 			to_chat(user, display_parts(user))

code/game/mecha/mecha_construction_paths.dm

@@ -767,13 +767,13 @@
 /datum/construction/mecha/honker_chassis/spawn_result()
 	..("Honker")
 	var/obj/item/mecha_parts/chassis/const_holder = holder
-	const_holder.construct = new /datum/construction/mecha/honker(const_holder)
+	const_holder.construct = new /datum/construction/reversible/mecha/honker(const_holder)
 	const_holder.density = 1
 	qdel(src)
 	return
 
 
-/datum/construction/mecha/honker
+/datum/construction/reversible/mecha/honker
 	result = "/obj/mecha/combat/honker"
 	steps = list(list("key"=/obj/item/bikehorn),//1
 					 list("key"=/obj/item/clothing/shoes/clown_shoes),//2
@@ -788,10 +788,10 @@
 					 list("key"=/obj/item/bikehorn),//11
 					 )
 
-/datum/construction/mecha/honker/action(atom/used_atom,mob/user as mob)
+/datum/construction/reversible/mecha/honker/action(atom/used_atom,mob/user as mob)
 	return check_step(used_atom,user)
 
-/datum/construction/mecha/honker/custom_action(step, atom/used_atom, mob/user)
+/datum/construction/reversible/mecha/honker/custom_action(index, diff, atom/used_atom, mob/user)
 	if(!..())
 		return 0
 
@@ -800,7 +800,7 @@
 		user.visible_message("HONK!")
 
 	//TODO: better messages.
-	switch(step)
+	switch(index)
 		if(10)
 			user.visible_message("[user] installs the central control module into the [holder].", "You install the central control module into the [holder].")
 			qdel(used_atom)
@@ -839,12 +839,12 @@
 /datum/construction/mecha/reticence_chassis/spawn_result()
 	..("Reticence")
 	var/obj/item/mecha_parts/chassis/const_holder = holder
-	const_holder.construct = new /datum/construction/mecha/reticence(const_holder)
+	const_holder.construct = new /datum/construction/reversible/mecha/reticence(const_holder)
 	const_holder.density = 1
 	qdel(src)
 	return
 
-/datum/construction/mecha/reticence
+/datum/construction/reversible/mecha/reticence
 	result = "/obj/mecha/combat/reticence"
 	steps = list(list("key"=/obj/effect/dummy/mecha_emote_step),//1
 					 list("key"=/obj/item/clothing/suit/suspenders),//2
@@ -857,10 +857,10 @@
 					 list("key"=/obj/item/circuitboard/mecha/reticence/main),//9
 					 )
 
-/datum/construction/mecha/reticence/action(atom/used_atom,mob/user)
+/datum/construction/reversible/mecha/reticence/action(atom/used_atom,mob/user)
 	return check_step(used_atom,user)
 
-/datum/construction/mecha/reticence/custom_action(step, atom/used_atom, mob/user)
+/datum/construction/reversible/mecha/reticence/custom_action(index, diff, atom/used_atom, mob/user)
 	if(!..())
 		return 0
 
@@ -870,7 +870,7 @@
 		qdel(used_atom)
 
 	//TODO: better messages.
-	switch(step)
+	switch(index)
 		if(9)
 			user.visible_message("[user] installs the central control module into the [holder].", "<span class='notice'>You install the central control module into the [holder].</span>")
 			qdel(used_atom)

code/game/mecha/mecha_parts.dm

@@ -263,11 +263,11 @@
 	emote = e
 
 /obj/item/mecha_parts/chassis/reticence/hear_message(mob/living/M, msg)
-	if(!istype(M) || !istype(construct, /datum/construction/mecha/reticence))
+	if(!istype(M) || !istype(construct, /datum/construction/reversible/mecha/reticence))
 		return
 	// is the current step the dummy emote object?
 	var/list/steps = construct.steps
-	if(steps[steps.len]["key"] == /obj/effect/dummy/mecha_emote_step)
+	if(steps[construct.index]["key"] == /obj/effect/dummy/mecha_emote_step)
 		construct.action(new /obj/effect/dummy/mecha_emote_step(msg), M)
 
 /obj/item/mecha_parts/part/reticence_torso

code/modules/research/rdconsole.dm

@@ -539,6 +539,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			// Somehow this href makes me very nervous
 			var/datum/tech/known = files.known_tech[params["id"]]
 			if(t_disk && known)
+				t_disk.name = "[t_disk.default_name] \[[known]\]"
+				t_disk.desc = known.desc + " Level: '[known.level]'"
 				t_disk.stored = known
 			menu = MENU_DISK
 			submenu = SUBMENU_MAIN