Merge branch 'master' into Vulpkanin-Update

Simple-Station · Aug 12, 2024 · 2aa411f · 2aa411f
2 parents 5a823ba + 8b0c754
commit 2aa411f
Show file tree

Hide file tree

Showing 13 changed files with 428 additions and 153 deletions.
diff --git a/Resources/Migrations/eeMigrations.yml b/Resources/Migrations/eeMigrations.yml
@@ -0,0 +1,4 @@
+# 2024-03-08
+ClothingBackpackSatchelBrigmedicDeltaVFilled: ClothingBackpackSatchelBrigmedicFilled
+ClothingBackpackDuffelBrigmedicDeltaVFilled: ClothingBackpackDuffelBrigmedicFilled
+ClothingBackpackBrigmedicDeltaVFilled: ClothingBackpackBrigmedicFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -21,8 +21,23 @@
   components:
   - type: StorageFill
     contents:
-      - id: Flash
-#      - id: MagazinePistol # DeltaV - Security doesn't get an extra mag
+      - id: MagazinePistol
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackBrigmedic
+  id: ClothingBackpackBrigmedicFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: EmergencyRollerBedSpawnFolded
+      - id: BodyBagFolded
+      - id: Portafib
+      - id: BruteAutoInjector
+        amount: 2
+      - id: BurnAutoInjector
+        amount: 2
+      - id: MagazinePistol
 
 - type: entity
   noSpawn: true
@@ -31,10 +46,11 @@
   components:
   - type: StorageFill
     contents:
-      - id: Flash
       - id: ForensicPad
       - id: ForensicScanner
 
+
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpackMedical

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -14,33 +14,38 @@
 
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackDuffelSecurity
-  id: ClothingBackpackDuffelSecurityFilled
+  parent: ClothingBackpackDuffelBrigmedic
+  id: ClothingBackpackDuffelBrigmedicFilled
   components:
   - type: StorageFill
     contents:
-      - id: Flash
-#      - id: MagazinePistol # DeltaV - Security doesn't get an extra mag
+      - id: EmergencyRollerBedSpawnFolded
+      - id: BodyBagFolded
+      - id: Portafib
+    #  - id: Flash
+      - id: BruteAutoInjector
+        amount: 2
+      - id: BurnAutoInjector
+        amount: 2
 
 - type: entity
   noSpawn: true
   parent: ClothingBackpackDuffelSecurity
-  id: ClothingBackpackDuffelSecurityFilledDetective
+  id: ClothingBackpackDuffelSecurityFilled
   components:
   - type: StorageFill
     contents:
-      - id: Flash
-      - id: ForensicPad
-      - id: ForensicScanner
+      - id: MagazinePistol
 
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackDuffelBrigmedic
-  id: ClothingBackpackDuffelBrigmedicFilled
+  parent: ClothingBackpackDuffelSecurity
+  id: ClothingBackpackDuffelSecurityFilledDetective
   components:
   - type: StorageFill
     contents:
-      - id: Flash
+      - id: ForensicPad
+      - id: ForensicScanner
 
 - type: entity
   noSpawn: true

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -28,33 +28,37 @@
 
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackSatchelSecurity
-  id: ClothingBackpackSatchelSecurityFilled
+  parent: ClothingBackpackSatchelBrigmedic
+  id: ClothingBackpackSatchelBrigmedicFilled
   components:
   - type: StorageFill
     contents:
-      - id: Flash
-#      - id: MagazinePistol # DeltaV - Security doesn't get an extra mag
+      - id: EmergencyRollerBedSpawnFolded
+      - id: BodyBagFolded
+      - id: Portafib
+      - id: BruteAutoInjector
+        amount: 2
+      - id: BurnAutoInjector
+        amount: 2
 
 - type: entity
   noSpawn: true
   parent: ClothingBackpackSatchelSecurity
-  id: ClothingBackpackSatchelSecurityFilledDetective
+  id: ClothingBackpackSatchelSecurityFilled
   components:
   - type: StorageFill
     contents:
-      - id: Flash
-      - id: ForensicPad
-      - id: ForensicScanner
+      - id: MagazinePistol
 
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackSatchelBrigmedic
-  id: ClothingBackpackSatchelBrigmedicFilled
+  parent: ClothingBackpackSatchelSecurity
+  id: ClothingBackpackSatchelSecurityFilledDetective
   components:
   - type: StorageFill
     contents:
-      - id: Flash
+      - id: ForensicPad
+      - id: ForensicScanner
 
 - type: entity
   noSpawn: true

diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
@@ -35,7 +35,7 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitBrigmedic
     outerClothing: ClothingOuterArmorPlateCarrier
-    back: ClothingBackpackBrigmedicDeltaVFilled
+    back: ClothingBackpackBrigmedicFilled 
     shoes: ClothingShoesBootsCombatFilled
     gloves: ClothingHandsGlovesNitrile
     eyes: ClothingEyesHudMedical
@@ -45,5 +45,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,7 +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

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
@@ -51,6 +51,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
@@ -248,6 +248,7 @@
         Slash: 0.75
         Piercing: 0.75
         Heat: 0.75
+        Caustic: 0.75 #not the full 90% from ss13 because of the head
 
 - type: entity
   parent: ClothingOuterWinterCoatToggleable
@@ -417,12 +418,12 @@
     sprite: Clothing/OuterClothing/WinterCoats/coatsec.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterSec
-  - type: Armor # DeltaV - adds resists to coat
+  - type: Armor
     modifiers:
       coefficients:
         Blunt: 0.85
         Slash: 0.85
-        Piercing: 0.85 # DeltaV - not as resistant as pre-rebase, but still better than nothing
+        Piercing: 0.85 #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.75
 
 - type: entity