Simple-Station · VMSolidus · Aug 11, 2024 · Aug 3, 2024 · Aug 3, 2024 · Aug 3, 2024
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -21,8 +21,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: Flash
-#      - id: MagazinePistol # DeltaV - Security doesn't get an extra mag
+      - id: MagazinePistol # EinsteinEngines - Security does get an extra mag
 
 - type: entity
   noSpawn: true
@@ -31,7 +30,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: Flash
       - id: ForensicPad
       - id: ForensicScanner
 

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -19,8 +19,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: Flash
-#      - id: MagazinePistol # DeltaV - Security doesn't get an extra mag
+      - id: MagazinePistol # EinsteinEngines - Security does get an extra mag
 
 - type: entity
   noSpawn: true
@@ -29,19 +28,9 @@
   components:
   - type: StorageFill
     contents:
-      - id: Flash
       - id: ForensicPad
       - id: ForensicScanner
 
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelBrigmedic
-  id: ClothingBackpackDuffelBrigmedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: Flash
-
 - type: entity
   noSpawn: true
   parent: ClothingBackpackDuffelMedical

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -33,8 +33,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: Flash
-#      - id: MagazinePistol # DeltaV - Security doesn't get an extra mag
+      - id: MagazinePistol # EinsteinEngines - Security does get an extra mag
 
 - type: entity
   noSpawn: true
@@ -43,19 +42,9 @@
   components:
   - type: StorageFill
     contents:
-      - id: Flash
       - id: ForensicPad
       - id: ForensicScanner
 
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelBrigmedic
-  id: ClothingBackpackSatchelBrigmedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: Flash
-
 - type: entity
   noSpawn: true
   parent: ClothingBackpackSatchelMedical

diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml
@@ -1,15 +1,15 @@
 - type: entity
   noSpawn: true
   parent: ClothingBackpackBrigmedic
-  id: ClothingBackpackBrigmedicDeltaVFilled
+  id: ClothingBackpackBrigmedicFilled
   components:
   - type: StorageFill
     contents:
       - id: EmergencyRollerBedSpawnFolded
       - id: BodyBagFolded
       - id: Portafib
-    #  - id: Flash
       - id: BruteAutoInjector
         amount: 2
       - id: BurnAutoInjector
         amount: 2
+      - id: MagazinePistol # EinsteinEngines - Security does get an extra mag
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml
@@ -1,7 +1,7 @@
 - type: entity
   noSpawn: true
   parent: ClothingBackpackDuffelBrigmedic
-  id: ClothingBackpackDuffelBrigmedicDeltaVFilled
+  id: ClothingBackpackDuffelBrigmedicFilled
   components:
   - type: StorageFill
     contents:

diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml
@@ -1,7 +1,7 @@
 - type: entity
   noSpawn: true
   parent: ClothingBackpackSatchelBrigmedic
-  id: ClothingBackpackSatchelBrigmedicDeltaVFilled
+  id: ClothingBackpackSatchelBrigmedicFilled
   components:
   - type: StorageFill
     contents:

diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
@@ -32,7 +32,7 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitBrigmedic
     outerClothing: ClothingOuterArmorPlateCarrier
-    back: ClothingBackpackBrigmedicDeltaVFilled
+    back: ClothingBackpackBrigmedicFilled #This will need fixed later. I will do that when I change the starting equipment in favor of the loadout system.
     shoes: ClothingShoesBootsCombatFilled
     gloves: ClothingHandsGlovesNitrile
     eyes: ClothingEyesHudMedical
@@ -42,5 +42,5 @@
     belt: ClothingBeltCorpsmanWebbingFilled
     pocket1: WeaponPistolMk58Nonlethal
   innerClothingSkirt: ClothingUniformJumpskirtBrigmedic
-  satchel: ClothingBackpackSatchelBrigmedicDeltaVFilled
-  duffelbag: ClothingBackpackDuffelBrigmedicDeltaVFilled
+  satchel: ClothingBackpackSatchelBrigmedicFilled
+  duffelbag: ClothingBackpackDuffelBrigmedicFilled
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -1,40 +1,6 @@
 # Numbers for armor here largely taken from /tg/.
 # NOTE: Half of the kind of armor you're probably thinking of is in vests.yml. These should probably be merged some day.
 
-#Basic armor vest
-- type: entity
-  parent: ClothingOuterBaseMedium
-  id: ClothingOuterArmorBasic
-  name: armor vest
-  description: A standard Type I armored vest that provides decent protection against most types of damage.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Armor/security.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Armor/security.rsi
-  - type: Armor #Based on /tg/ but slightly compensated to fit the fact that armor stacks in SS14.
-    modifiers:
-      coefficients:
-        Blunt: 0.70
-        Slash: 0.70
-        Piercing: 0.70 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest.
-        Heat: 0.80
-  - type: ExplosionResistance
-    damageCoefficient: 0.90
-
-#Alternate / slim basic armor vest
-- type: entity
-  parent: ClothingOuterArmorBasic
-  id: ClothingOuterArmorBasicSlim
-  name: armor vest
-  suffix: slim
-  description: A slim Type I armored vest that provides decent protection against most types of damage.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Armor/security_slim.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Armor/security_slim.rsi
-
 - type: entity
   parent: ClothingOuterBaseLarge
   id: ClothingOuterArmorRiot

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
@@ -40,6 +40,49 @@
   - type: ExplosionResistance
     damageCoefficient: 0.9
 
+#Security Basic armor vest
+- type: entity
+  parent: ClothingOuterBaseMedium
+  id: ClothingOuterArmorBasic
+  name: armor vest
+  description: A standard Type I armored vest that provides decent protection against most types of damage.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Vests/security.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Vests/security.rsi
+  - type: Armor #Based on /tg/ but slightly compensated to fit the fact that armor stacks in SS14.
+    modifiers:
+      coefficients:
+        Blunt: 0.70
+        Slash: 0.70
+        Piercing: 0.70 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest.
+        Heat: 0.80
+  - type: ExplosionResistance
+    damageCoefficient: 0.90
+
+#Security Alternate / slim basic armor vest
+- type: entity
+  parent: ClothingOuterArmorBasic
+  id: ClothingOuterArmorBasicSlim
+  name: armor vest
+  suffix: slim
+  description: A slim Type I armored vest that provides decent protection against most types of damage.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Vests/security_slim.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Vests/security_slim.rsi
+  - type: Armor #Based on /tg/ but slightly compensated to fit the fact that armor stacks in SS14.
+    modifiers:
+      coefficients:
+        Blunt: 0.70
+        Slash: 0.70
+        Piercing: 0.70 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest.
+        Heat: 0.80
+  - type: ExplosionResistance
+    damageCoefficient: 0.90
+
 #Detective's vest
 - type: entity
   parent: ClothingOuterArmorBasic
@@ -51,6 +94,15 @@
     sprite: Clothing/OuterClothing/Vests/detvest.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Vests/detvest.rsi
+  - type: Armor #Based on /tg/ but slightly compensated to fit the fact that armor stacks in SS14.
+    modifiers:
+      coefficients:
+        Blunt: 0.70
+        Slash: 0.70
+        Piercing: 0.70 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest.
+        Heat: 0.80
+  - type: ExplosionResistance
+    damageCoefficient: 0.90
 
 #Hazard vest
 - type: entity

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -87,10 +87,10 @@
   - type: Armor # DeltaV - adds resists to coat, same as HoS coat. Still better than nothing, but nowhere as good as a carapace
     modifiers:
       coefficients:
-        Blunt: 0.75
-        Slash: 0.75
-        Piercing: 0.75
-        Heat: 0.75
+        Blunt: 0.70
+        Slash: 0.70
+        Piercing: 0.70
+        Heat: 0.70
 
 - type: entity
   parent: ClothingOuterWinterCoatToggleable
@@ -244,10 +244,11 @@
   - type: Armor # DeltaV - adds resists to coat. As good as Cap's, but I don't know why you'd wear this over a trench coat
     modifiers:
       coefficients:
-        Blunt: 0.75
-        Slash: 0.75
-        Piercing: 0.75
-        Heat: 0.75
+        Blunt: 0.70
+        Slash: 0.70
+        Piercing: 0.70
+        Heat: 0.70
+        Caustic: 0.75 #not the full 90% from ss13 because of the head
 
 - type: entity
   parent: ClothingOuterWinterCoatToggleable
@@ -417,13 +418,15 @@
     sprite: Clothing/OuterClothing/WinterCoats/coatsec.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterSec
-  - type: Armor # DeltaV - adds resists to coat
+  - type: Armor # EinsteinEngines - makes equivalent to vests
     modifiers:
       coefficients:
-        Blunt: 0.85
-        Slash: 0.85
-        Piercing: 0.85 # DeltaV - not as resistant as pre-rebase, but still better than nothing
-        Heat: 0.75
+        Blunt: 0.70
+        Slash: 0.70
+        Piercing: 0.70 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest.
+        Heat: 0.80
+  - type: ExplosionResistance
+    damageCoefficient: 0.90
 
 - type: entity
   parent: ClothingOuterWinterCoatToggleable
@@ -459,7 +462,7 @@
       coefficients:
         Blunt: 0.70
         Slash: 0.70
-        Piercing: 0.8 #slightly less bulletproof then warden's normal coat
+        Piercing: 0.7
         Heat: 0.70
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterWarden

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/human.yml b/Resources/Prototypes/Entities/Markers/Spawners/human.yml
@@ -13,7 +13,7 @@
       state: equipped-FEET
     - sprite: Clothing/Uniforms/Jumpsuit/operative.rsi
       state: equipped-INNERCLOTHING
-    - sprite: Clothing/OuterClothing/Armor/security.rsi
+    - sprite: Clothing/OuterClothing/Vests/security.rsi
       state: equipped-OUTERCLOTHING
     - sprite: Clothing/Hands/Gloves/Color/black.rsi
       state: equipped-HAND