From d0f391c6501ab24b5ff04ee9520aee2e1770d79a Mon Sep 17 00:00:00 2001 From: Rykka Date: Mon, 20 Jan 2020 18:22:05 -0700 Subject: [PATCH] Earlyport mech fixes, Fix Polecat armor issues --- code/game/mecha/mecha_construction_paths.dm | 4 ++-- code/game/mecha/micro/mecha_construction_paths_vr.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 3cbe670a41..e345013e3d 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -818,7 +818,6 @@ if(3) if(diff==FORWARD) user.visible_message("[user] installs the external armor layer to [holder].", "You install the external armor layer to [holder].") - qdel(I) holder.icon_state = "gygax18" else user.visible_message("[user] cuts internal armor layer from [holder].", "You cut the internal armor layer from [holder].") @@ -829,7 +828,8 @@ holder.icon_state = "gygax19-s" else user.visible_message("[user] pries the external armor layer from [holder].", "You pry the external armor layer from [holder].") - new /obj/item/mecha_parts/part/gygax_armour(get_turf(holder)) + var/obj/item/stack/material/plasteel/MS = new /obj/item/stack/material/plasteel(get_turf(holder)) // Fixes serenity giving Gygax Armor Plates for the reverse action... + MS.amount = 5 holder.icon_state = "gygax17" if(1) if(diff==FORWARD) diff --git a/code/game/mecha/micro/mecha_construction_paths_vr.dm b/code/game/mecha/micro/mecha_construction_paths_vr.dm index 6857d7b1c4..66272f9be7 100644 --- a/code/game/mecha/micro/mecha_construction_paths_vr.dm +++ b/code/game/mecha/micro/mecha_construction_paths_vr.dm @@ -253,6 +253,7 @@ if(3) if(diff==FORWARD) user.visible_message("[user] installs external reinforced armor layer to [holder].", "You install external reinforced armor layer to [holder].") + qdel(used_atom)//CHOMPedit upstream port. Fixes polecat not useing it's armor plates up. holder.icon_state = "polecat18" else user.visible_message("[user] cuts internal armor layer from [holder].", "You cut the internal armor layer from [holder].") @@ -263,8 +264,7 @@ holder.icon_state = "polecat19" else user.visible_message("[user] pries external armor layer from [holder].", "You prie external armor layer from [holder].") - var/obj/item/stack/material/plasteel/MS = new /obj/item/stack/material/plasteel(get_turf(holder)) - MS.amount = 5 + new /obj/item/mecha_parts/micro/part/polecat_armour(get_turf(holder))// Actually gives you the polecat's armored plates back instead of plasteel. holder.icon_state = "polecat17" if(1) if(diff==FORWARD)