Eye damage (#10262)

Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

@@ -65,17 +65,14 @@
 - type: entity
   parent: ClothingEyesBase
   id: ClothingEyesGlassesMeson
-  name: optical meson scanners
-  description: The pinnacle of modern science, wallhacks in real life
+  name: engineering goggles #less confusion
+  description: Green-tinted goggles using a proprietary polymer that provides protection from eye damage of all types.
   components:
   - type: Sprite
     sprite: Clothing/Eyes/Glasses/meson.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Glasses/meson.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Radiation: 0.5
+  - type: EyeProtection
 
 - type: entity
   parent: ClothingEyesBase
@@ -87,6 +84,7 @@
     sprite: Clothing/Eyes/Glasses/glasses.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Glasses/glasses.rsi
+  - type: VisionCorrection
 
 - type: entity
   parent: ClothingEyesBase
@@ -99,6 +97,8 @@
   - type: Clothing
     sprite: Clothing/Eyes/Glasses/sunglasses.rsi
   - type: FlashImmunity
+  - type: EyeProtection
+    protectionTime: 5
 
 - type: entity
   parent: ClothingEyesBase
@@ -111,6 +111,8 @@
   - type: Clothing
     sprite: Clothing/Eyes/Glasses/secglasses.rsi
   - type: FlashImmunity
+  - type: EyeProtection
+    protectionTime: 5
 
 #Make a scanner category when these actually function and we get the trayson
 - type: entity

Resources/Prototypes/Entities/Clothing/Eyes/misc.yml

@@ -8,6 +8,8 @@
     sprite: Clothing/Eyes/Misc/eyepatch.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Misc/eyepatch.rsi
+  - type: EyeProtection
+    protectionTime: 5
 
 - type: entity
   parent: ClothingEyesBase

Resources/Prototypes/Entities/Clothing/Head/welding.yml

@@ -7,6 +7,7 @@
   - type: IngestionBlocker
   - type: FlashImmunity
   - type: IdentityBlocker
+  - type: EyeProtection
 
 - type: entity
   parent: WeldingMaskBase

Resources/Prototypes/Entities/Clothing/Masks/masks.yml

@@ -36,6 +36,8 @@
   - type: Clothing
     sprite: Clothing/Mask/gassyndicate.rsi
   - type: FlashImmunity
+  - type: EyeProtection
+    protectionTime: 5
 
 - type: entity
   parent: ClothingMaskGas

Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml

@@ -112,6 +112,7 @@
     - Stutter
     - Electrocution
     - ForcedSleep
+    - TemporaryBlindness
   - type: Body
     template: AnimalTemplate
     preset: AnimalPreset
@@ -179,6 +180,7 @@
       - Stutter
       - Electrocution
       - ForcedSleep
+      - TemporaryBlindness
   - type: ThermalRegulator
     metabolismHeat: 800
     radiatedHeat: 100

Resources/Prototypes/Entities/Mobs/Species/base.yml

@@ -80,6 +80,7 @@
       - PressureImmunity
       - Muted
       - ForcedSleep
+      - TemporaryBlindness
   - type: DiseaseCarrier
   - type: Blindable
   # Other

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml

@@ -108,6 +108,17 @@
     - state: carrot
   - type: SliceableFood
     slice: FoodCakeCarrotSlice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+        - ReagentId: JuiceCarrot
+          Quantity: 15
+        - ReagentId: Sugar
+          Quantity: 5
+        - ReagentId: Vitamin
+          Quantity: 5
 
 - type: entity
   name: slice of carrot cake
@@ -120,6 +131,18 @@
     - state: plate-small
     - state: plate-slice-shading
     - state: carrot-slice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 6
+        reagents:
+        - ReagentId: JuiceCarrot
+          Quantity: 3
+        - ReagentId: Sugar
+          Quantity: 1
+        - ReagentId: Vitamin
+          Quantity: 1
+
 # Tastes like sweetness, cake, carrot.
 
 - type: entity

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml

@@ -265,5 +265,7 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 2
+        - ReagentId: JuiceCarrot
+          Quantity: 1
   - type: Sprite
     state: dink

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml

@@ -74,7 +74,8 @@
   - type: Sprite
     layers:
     - state: margherita-slice
-# Tastes like crust, tomato, cheese.
+  - type: SliceableFood
+    slice: FoodPizzaMeatSlice
 
 - type: entity
   name: meat pizza
@@ -133,6 +134,17 @@
     - state: vegetable
   - type: SliceableFood
     slice: FoodPizzaVegetableSlice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 40
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 25
+        - ReagentId: JuiceCarrot
+          Quantity: 5
+        - ReagentId: Vitamin
+          Quantity: 5
 
 - type: entity
   name: slice of vegetable pizza
@@ -143,6 +155,18 @@
   - type: Sprite
     layers:
     - state: vegetable-slice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 40
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 4
+        - ReagentId: JuiceCarrot
+          Quantity: 1
+        - ReagentId: Vitamin
+          Quantity: 1
+
 # Tastes like crust, tomato, cheese, carrot.
 
 - type: entity

Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml

@@ -61,6 +61,14 @@
   components:
   - type: Sprite
     state: fries-carrot
+    netsync: false
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 26
+        reagents:
+        - ReagentId: JuiceCarrot
+          Quantity: 20
 # Tastes like carrots, salt.
 
 - type: entity

Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

@@ -228,7 +228,7 @@
       food:
         maxVol: 9
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: JuiceCarrot
           Quantity: 5
         - ReagentId: Vitamin
           Quantity: 4

Resources/Prototypes/Entities/Objects/Tools/welders.yml

@@ -50,6 +50,7 @@
     radius: 1.5
     color: orange
   - type: Appearance
+  - type: RequiresEyeProtection
 
 - type: entity
   name: industrial welding tool