From 1a85120096833e86555150efeddb07d3e0fb09af Mon Sep 17 00:00:00 2001
From: Creatorbot01 <creatorbot02@gmail.com>
Date: Mon, 20 Jan 2025 08:27:26 +0800
Subject: [PATCH 1/3] fixed conflict

yeah change the arcadis version of medsecglasses
---
 Resources/Prototypes/_Arc/Entities/Clothing/Eyes/glasses.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/_Arc/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_Arc/Entities/Clothing/Eyes/glasses.yml
index 12a90987c4fd..3da858890ca2 100644
--- a/Resources/Prototypes/_Arc/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/_Arc/Entities/Clothing/Eyes/glasses.yml
@@ -30,7 +30,8 @@
 
 - type: entity
   parent: ClothingEyesBase
-  id: ClothingEyesGlassesMedSec
+  id: ClothingEyesGlassesMedSecArc
+  suffix: Arcadis
   name: medsec glasses
   description: Upgraded sunglasses that provide flash immunity and a medsec HUD.
   components:

From a32dfede69dbd965b667220988205aaf8a3659f1 Mon Sep 17 00:00:00 2001
From: Creatorbot01 <creatorbot02@gmail.com>
Date: Mon, 20 Jan 2025 08:30:05 +0800
Subject: [PATCH 2/3] change corpsman to use arc version

---
 Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml b/Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml
index 706f2cbaec8e..8491254907a0 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/corpsman.yml
@@ -70,7 +70,7 @@
       jobs:
         - Brigmedic
   items:
-    - ClothingEyesGlassesMedSec
+    - ClothingEyesGlassesMedSecArc
 
 - type: loadout
   id: LoadoutClothingEyesHUDMedSec

From ec6d7f0d8a0791fa1c4682bfe010ad7047ed0fa0 Mon Sep 17 00:00:00 2001
From: Creatorbot01 <creatorbot02@gmail.com>
Date: Mon, 20 Jan 2025 09:32:43 +0800
Subject: [PATCH 3/3] Update helmets.yml

added eris request
---
 .../Prototypes/_Arc/Entities/Clothing/Head/helmets.yml     | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml
index e67fd881a1a0..bd236e0b8d2d 100644
--- a/Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/_Arc/Entities/Clothing/Head/helmets.yml
@@ -25,13 +25,6 @@
         Heat: 0.95
   - type: Clickable
   - type: InteractionOutline
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.95
-        Slash: 0.95
-        Piercing: 0.95
-        Heat: 0.95
   - type: GroupExamine
   - type: Tag
     tags: