Final yaml fixes

DeltaV-Station · Apr 7, 2024 · b5a6229 · b5a6229
1 parent aff5fec
commit b5a6229
Show file tree

Hide file tree

Showing 11 changed files with 242 additions and 244 deletions.
diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/courierdrobe.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/courierdrobe.yml
@@ -1,6 +1,6 @@
 - type: messagePack
   id: CourierDrobeAds
-  advertisements:
+  messages:
     - advertisement-courierdrobe-1
     - advertisement-courierdrobe-2
     - advertisement-courierdrobe-3

diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml
@@ -1,6 +1,6 @@
 - type: messagePack
   id: PrideDrobeAds
-  advertisements:
+  messages:
   - advertisement-pride-1
   - advertisement-pride-2
   - advertisement-pride-3
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
@@ -6,100 +6,100 @@
   components:
   - type: Mail
     contents:
-    # Author Books
-    - id: BookNarsieLegend
-      prob: 0.02
-      orGroup: bookauthor
-    - id: BookTruth
-      prob: 0.02
-      orGroup: bookauthor
-    - id: BookWorld
-      prob: 0.1
-      orGroup: bookauthor
-    - id: BookIanAntarctica
-      prob: 0.05
-      orGroup: bookauthor
-    - id: BookSlothClownSSS
-      prob: 0.04
-      orGroup: bookauthor
-    - id: BookSlothClownPranks
-      prob: 0.04
-      orGroup: bookauthor
-    - id: BookSlothClownMMD
-      prob: 0.04
-      orGroup: bookauthor
-    - id: BookStruck
-      prob: 0.1
-      orGroup: bookauthor
-    - id: BookSun
-      prob: 0.1
-      orGroup: bookauthor
-    - id: BookPossum
-      prob: 0.1
-      orGroup: bookauthor
-    - id: BookCafe
-      prob: 0.1
-      orGroup: bookauthor
-    - id: BookFeather
-      prob: 0.1
-      orGroup: bookauthor
-    - id: BookIanLostWolfPup
-      prob: 0.05
-      orGroup: bookauthor
-    - id: BookIanRanch
-      prob: 0.05
-      orGroup: bookauthor
-    - id: BookIanOcean
-      prob: 0.05
-      orGroup: bookauthor
-    - id: BookIanMountain
-      prob: 0.05
-      orGroup: bookauthor
-    - id: BookIanCity
-      prob: 0.05
-      orGroup: bookauthor
-    - id: BookIanArctic
-      prob: 0.05
-      orGroup: bookauthor
-    - id: BookIanDesert
-      prob: 0.05
-      orGroup: bookauthor
-    - id: BookNames
-      prob: 0.08
-      orGroup: bookauthor
-    - id: BookEarth
-      prob: 0.08
-      orGroup: bookauthor
-    - id: BookTemple
-      prob: 0.09
-      orGroup: bookauthor
-    - id: BookAurora
-      prob: 0.1
-      orGroup: bookauthor
-    - id: BookWatched
-      prob: 0.04
-      orGroup: bookauthor
-    - id: BookMedicalOfficer
-      prob: 0.06
-      orGroup: bookauthor
-    - id: BookMorgue
-      prob: 0.06
-      orGroup: bookauthor
-    - id: BookRufus
-      prob: 0.1
-      orGroup: bookauthor
-    - id: BookMap
-      prob: 0.08
-      orGroup: bookauthor
-    - id: BookJourney
-      prob: 0.1
-      orGroup: bookauthor
-    - id: BookInspiration
-      prob: 0.09
-      orGroup: bookauthor
-    - id: BookRandom # The "spawn nothing" in the 'orGroup'
-      prob: 0.3
-      orGroup: bookauthor
+#    # Author Books
+#    - id: BookNarsieLegend
+#      prob: 0.02
+#      orGroup: bookauthor
+#    - id: BookTruth
+#      prob: 0.02
+#      orGroup: bookauthor
+#    - id: BookWorld
+#      prob: 0.1
+#      orGroup: bookauthor
+#    - id: BookIanAntarctica
+#      prob: 0.05
+#      orGroup: bookauthor
+#    - id: BookSlothClownSSS
+#      prob: 0.04
+#      orGroup: bookauthor
+#    - id: BookSlothClownPranks
+#      prob: 0.04
+#      orGroup: bookauthor
+#    - id: BookSlothClownMMD
+#      prob: 0.04
+#      orGroup: bookauthor
+#    - id: BookStruck
+#      prob: 0.1
+#      orGroup: bookauthor
+#    - id: BookSun
+#      prob: 0.1
+#      orGroup: bookauthor
+#    - id: BookPossum
+#      prob: 0.1
+#      orGroup: bookauthor
+#    - id: BookCafe
+#      prob: 0.1
+#      orGroup: bookauthor
+#    - id: BookFeather
+#      prob: 0.1
+#      orGroup: bookauthor
+#    - id: BookIanLostWolfPup
+#      prob: 0.05
+#      orGroup: bookauthor
+#    - id: BookIanRanch
+#      prob: 0.05
+#      orGroup: bookauthor
+#    - id: BookIanOcean
+#      prob: 0.05
+#      orGroup: bookauthor
+#    - id: BookIanMountain
+#      prob: 0.05
+#      orGroup: bookauthor
+#    - id: BookIanCity
+#      prob: 0.05
+#      orGroup: bookauthor
+#    - id: BookIanArctic
+#      prob: 0.05
+#      orGroup: bookauthor
+#    - id: BookIanDesert
+#      prob: 0.05
+#      orGroup: bookauthor
+#    - id: BookNames
+#      prob: 0.08
+#      orGroup: bookauthor
+#    - id: BookEarth
+#      prob: 0.08
+#      orGroup: bookauthor
+#    - id: BookTemple
+#      prob: 0.09
+#      orGroup: bookauthor
+#    - id: BookAurora
+#      prob: 0.1
+#      orGroup: bookauthor
+#    - id: BookWatched
+#      prob: 0.04
+#      orGroup: bookauthor
+#    - id: BookMedicalOfficer
+#      prob: 0.06
+#      orGroup: bookauthor
+#    - id: BookMorgue
+#      prob: 0.06
+#      orGroup: bookauthor
+#    - id: BookRufus
+#      prob: 0.1
+#      orGroup: bookauthor
+#    - id: BookMap
+#      prob: 0.08
+#      orGroup: bookauthor
+#    - id: BookJourney
+#      prob: 0.1
+#      orGroup: bookauthor
+#    - id: BookInspiration
+#      prob: 0.09
+#      orGroup: bookauthor
+#    - id: BookRandom # The "spawn nothing" in the 'orGroup'
+#      prob: 0.3
+#      orGroup: bookauthor
     # id: Guidebook Books
     - id: BookSpaceEncyclopedia
       prob: 0.2
@@ -143,28 +143,28 @@
     - id: BookRandom # The "spawn nothing" in the 'orGroup'
       prob: 0.5
       orGroup: bookguide
-    # Other Books
-    - id: BookEscalation
-      prob: 0.2
-      orGroup: bookother
-    - id: BookEscalationSecurity
-      prob: 0.15
-      orGroup: bookother
-    - id: BookAtmosDistro
-      prob: 0.1
-      orGroup: bookother
-    - id: BookAtmosWaste
-      prob: 0.1
-      orGroup: bookother
-    - id: BookAtmosAirAlarms
-      prob: 0.1
-      orGroup: bookother
-    - id: BookAtmosVentsMore
-      prob: 0.1
-      orGroup: bookother
-    - id: BookRandom # The "spawn nothing" in the 'orGroup'
-      prob: 0.7
-      orGroup: bookother
+#    # Other Books
+#    - id: BookEscalation
+#      prob: 0.2
+#      orGroup: bookother
+#    - id: BookEscalationSecurity
+#      prob: 0.15
+#      orGroup: bookother
+#    - id: BookAtmosDistro
+#      prob: 0.1
+#      orGroup: bookother
+#    - id: BookAtmosWaste
+#      prob: 0.1
+#      orGroup: bookother
+#    - id: BookAtmosAirAlarms
+#      prob: 0.1
+#      orGroup: bookother
+#    - id: BookAtmosVentsMore
+#      prob: 0.1
+#      orGroup: bookother
+#    - id: BookRandom # The "spawn nothing" in the 'orGroup'
+#      prob: 0.7
+#      orGroup: bookother
 
 - type: entity
   noSpawn: true

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
@@ -215,13 +215,13 @@
   - type: AccessReader
     access: [["Detective"]]
 
-- type: entity
-  parent: DoorElectronics
-  id: DoorElectronicsBrig
-  suffix: Brig, Locked
-  components:
-  - type: AccessReader
-    access: [["Brig"]]
+#- type: entity
+#  parent: DoorElectronics
+#  id: DoorElectronicsBrig
+#  suffix: Brig, Locked
+#  components:
+#  - type: AccessReader
+#    access: [["Brig"]]
 
 - type: entity
   parent: DoorElectronics

diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -135,7 +135,7 @@
   - type: RCDDeconstructable
     cost: 6
     delay: 8
-    fx: EffectRCDDeconstruct8    
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
@@ -262,7 +262,7 @@
   - type: RCDDeconstructable
     cost: 6
     delay: 8
-    fx: EffectRCDDeconstruct8   
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
@@ -298,7 +298,7 @@
   - type: RCDDeconstructable
     cost: 6
     delay: 8
-    fx: EffectRCDDeconstruct8  
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
@@ -419,7 +419,7 @@
   - type: RCDDeconstructable
     cost: 6
     delay: 8
-    fx: EffectRCDDeconstruct8    
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
@@ -662,7 +662,7 @@
   - type: RCDDeconstructable
     cost: 6
     delay: 8
-    fx: EffectRCDDeconstruct8    
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
@@ -698,7 +698,7 @@
   - type: RCDDeconstructable
     cost: 6
     delay: 8
-    fx: EffectRCDDeconstruct8    
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
@@ -820,7 +820,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/shuttle.rsi
   - type: Icon
@@ -873,7 +872,7 @@
   - type: RCDDeconstructable
     cost: 6
     delay: 8
-    fx: EffectRCDDeconstruct8    
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
@@ -1255,7 +1254,7 @@
   - type: RCDDeconstructable
     cost: 6
     delay: 8
-    fx: EffectRCDDeconstruct8    
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:

diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Advertisements/maildrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Advertisements/maildrobe.yml
@@ -1,5 +1,5 @@
 - type: messagePack
   id: MailDrobeAds
-  advertisements:
+  messages:
     - advertisement-maildrobe-1
     - advertisement-maildrobe-2