From eba28af38ed6853b5f5e6f358562bef3ff536b9a Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Tue, 1 Jun 2021 19:27:34 +0000 Subject: [PATCH 1/2] Fix typo, indentation --- code/modules/clothing/suits/armor_vr.dm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm index 3bf51fb97f..be547d317f 100644 --- a/code/modules/clothing/suits/armor_vr.dm +++ b/code/modules/clothing/suits/armor_vr.dm @@ -118,4 +118,20 @@ name = "bedevere's costume armor" desc = "ye olde knight, risen again." icon_state = "bedevere" - body_parts_covered = UPPER_TORSO|LOWER_TORSO \ No newline at end of file +<<<<<<< HEAD + body_parts_covered = UPPER_TORSO|LOWER_TORSO +||||||| parent of 4a1d9b7d47... Merge pull request #10522 from VOREStation/Arokha/typo + body_parts_covered = UPPER_TORSO|LOWER_TORSO + +//deluixe explorer suit + /obj/item/clothing/suit/armor/pcarrier/explorer/deluxe + name = "modular explorer suit" + desc = "A modification of the explorer suit with a modular armor system. Requires you to insert armor plates." +======= + body_parts_covered = UPPER_TORSO|LOWER_TORSO + +//Deluxe explorer suit +/obj/item/clothing/suit/armor/pcarrier/explorer/deluxe + name = "modular explorer suit" + desc = "A modification of the explorer suit with a modular armor system. Requires you to insert armor plates." +>>>>>>> 4a1d9b7d47... Merge pull request #10522 from VOREStation/Arokha/typo From 274f62fbe6b1c04764bcbd1d0232c9752e1f50dd Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Tue, 1 Jun 2021 23:12:05 -0400 Subject: [PATCH 2/2] powder that makes you say yes --- code/modules/clothing/suits/armor_vr.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm index 99a1538d2d..7ab20fbbdd 100644 --- a/code/modules/clothing/suits/armor_vr.dm +++ b/code/modules/clothing/suits/armor_vr.dm @@ -124,4 +124,3 @@ /obj/item/clothing/suit/armor/pcarrier/explorer/deluxe name = "modular explorer suit" desc = "A modification of the explorer suit with a modular armor system. Requires you to insert armor plates." - body_parts_covered = UPPER_TORSO|LOWER_TORSO \ No newline at end of file