From 99d3a411531e471dffb3a5fdf9ac0d08eac2781a Mon Sep 17 00:00:00 2001
From: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com>
Date: Thu, 13 Aug 2020 20:21:21 +0100
Subject: [PATCH] Civilian rig deconstruct returns steel (#9678)

Fixes issue where deconstructing a civilian rig would return plasteel, when steel is used to build it
---
 code/modules/clothing/spacesuits/rig/rig_construction.dm | 8 ++++----
 html/changelogs/civilian_rig_steel.yml                   | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 html/changelogs/civilian_rig_steel.yml

diff --git a/code/modules/clothing/spacesuits/rig/rig_construction.dm b/code/modules/clothing/spacesuits/rig/rig_construction.dm
index 65797cd2f70..222e622c9dc 100644
--- a/code/modules/clothing/spacesuits/rig/rig_construction.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_construction.dm
@@ -249,8 +249,8 @@
 			if(diff==FORWARD)
 				user.visible_message("[user] secures external armor layer.", "You secure external reinforced armor layer.")
 			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))
+				user.visible_message("[user] pries the external armor layer from [holder].", "You pry the external armor layer from [holder].")
+				var/obj/item/stack/material/steel/MS = new /obj/item/stack/material/steel(get_turf(holder))
 				MS.amount = 5
 				r.icon_state = r.icon_base + "3"
 		if(1)
@@ -398,7 +398,7 @@
 			if(diff==FORWARD)
 				user.visible_message("[user] secures internal armor layer.", "You secure internal armor layer.")
 			else
-				user.visible_message("[user] pries internal armor layer from [holder].", "You prie internal armor layer from [holder].")
+				user.visible_message("[user] pries the internal armor layer from [holder].", "You pry the internal armor layer from [holder].")
 				var/obj/item/stack/material/steel/MS = new /obj/item/stack/material/steel(get_turf(holder))
 				MS.amount = 5
 				r.icon_state = r.icon_base + "4"
@@ -417,7 +417,7 @@
 			if(diff==FORWARD)
 				user.visible_message("[user] secures external armor layer.", "You secure external reinforced armor layer.")
 			else
-				user.visible_message("[user] pries external armor layer from [holder].", "You prie external armor layer from [holder].")
+				user.visible_message("[user] pries the external armor layer from [holder].", "You pry the external armor layer from [holder].")
 				var/obj/item/stack/material/plasteel/MS = new /obj/item/stack/material/plasteel(get_turf(holder))
 				MS.amount = 5
 				r.icon_state = r.icon_base + "4"
diff --git a/html/changelogs/civilian_rig_steel.yml b/html/changelogs/civilian_rig_steel.yml
new file mode 100644
index 00000000000..e6c547353ab
--- /dev/null
+++ b/html/changelogs/civilian_rig_steel.yml
@@ -0,0 +1,6 @@
+author: mikomyazaki
+
+delete-after: True
+
+changes: 
+  - bugfix: "The civilian rig build process now properly returns steel instead of plasteel when deconstructing."
\ No newline at end of file