Foxmerge (#264)

🆑
- add: Nitrous oxide tanks are now in surgical bags.
- add: Added the advanced microwave.
- add: Added the bloodloss cryo chems, hemoxadone and cynoxadone
- tweak: Doubled how much chef gets of certain ChefVend items, such as
flour, sugar, rice, and cornmeal.

Resources/Locale/en-US/deltav/reagents/meta/medicine.ftl

@@ -0,0 +1,5 @@
+reagent-name-hemoxadone = hemoxadone
+reagent-desc-hemoxadone = A cryogenics chemical. Used to treat severe blood loss by regenerating red blood cells and promoting reperfusion. Works regardless of the patient being alive or dead.
+
+reagent-name-cyanoxadone = cyanoxadone
+reagent-desc-cyanoxadone = A cryogenics chemical. Used to treat severe blood loss in blue-blooded creatures by regenerating hemocyanin and promoting reperfusion. Works regardless of the patient being alive or dead.

Resources/Prototypes/Atmospherics/thresholds.yml

@@ -15,11 +15,11 @@
     threshold: 550 # HazardHighPressure from Atmospherics.cs
   lowerBound: !type:AlarmThresholdSetting
     # Actual low pressure damage threshold is at 20 kPa, but below ~85 kPa you can't breathe due to lack of oxygen.
-    threshold: 20
+    threshold: 40 # DeltaV - was 80
   upperWarnAround: !type:AlarmThresholdSetting
     threshold: 0.7 # 385 kPa, WarningHighPressure from Atmospherics.cs
   lowerWarnAround: !type:AlarmThresholdSetting
-    threshold: 4.5 # ~90 kPa
+    threshold: 2 # DeltaV - 80kpa, was 1.05 (90kpa)
 
 # a reminder that all of these are percentages (where 1 is 100%),
 # so 0.01 is 1%,
@@ -28,6 +28,17 @@
 
 - type: alarmThreshold
   id: stationOxygen
+  lowerBound: !type:AlarmThresholdSetting
+    threshold: 0.10
+  upperBound: !type:AlarmThresholdSetting
+    threshold: 0.8 # DeltaV - was 0.3, ridiculous
+  lowerWarnAround: !type:AlarmThresholdSetting
+    threshold: 1.5
+  upperWarnAround: !type:AlarmThresholdSetting
+    threshold: 0.8
+
+- type: alarmThreshold
+  id: stationNitrogen
   lowerBound: !type:AlarmThresholdSetting
     threshold: 0.10
   lowerWarnAround: !type:AlarmThresholdSetting

Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml

@@ -13,6 +13,7 @@
       - id: Retractor
       - id: Scalpel
       - id: BoneGel # Shitmed Change
+      - id: NitrousOxideTankFilled # DeltaV - add anesthesia
 
 - type: entity
   id: ClothingBackpackDuffelCBURNFilled
@@ -48,6 +49,7 @@
       - id: ClothingHandsGlovesNitrile
       - id: EmergencyRollerBedSpawnFolded
       - id: BoneGel # Shitmed Change
+      - id: NitrousOxideTankFilled # DeltaV - add anesthesia
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle

Resources/Prototypes/DeltaV/Entities/Structures/Machines/advanced_microwave.yml

@@ -0,0 +1,25 @@
+- type: entity
+  parent: KitchenMicrowave
+  id: AdvancedMicrowave
+  name: Advanced Microwave
+  description: Don't stand too close to this thing, definitely dont put anything metal in.
+  components:
+  - type: Microwave
+    cookTimeMultiplier: 0.5
+    capacity: 30
+    canMicrowaveIdsSafely: false # No AA farm
+  - type: Sprite
+    sprite: _DV/Structures/Machines/advanced_microwave.rsi
+  - type: Machine
+    board: AdvancedMicrowaveMachineCircuitBoard
+  - type: Explosive
+    explosionType: Radioactive
+    maxIntensity: 60
+    totalIntensity: 50
+    intensitySlope: 10
+    canCreateVacuum: false
+    deleteAfterExplosion: false
+  - type: FoodRecipeProvider
+    providedRecipes: # if any new unique foods get added this will need updating
+    - RecipeBaguetteSword
+    - RecipeThrowingCroissant

Resources/Prototypes/DeltaV/Reagents/medicine.yml

@@ -0,0 +1,81 @@
+- type: reagent
+  id: Hemoxadone
+  name: reagent-name-hemoxadone
+  group: Medicine
+  desc: reagent-desc-hemoxadone
+  physicalDesc: reagent-physical-desc-metallic
+  flavor: medicine
+  color: "#ee0044"
+  worksOnTheDead: true
+  metabolisms:
+    Poison:
+      effects:
+      - !type:HealthChange
+        conditions:
+        - !type:OrganType
+          type: Arachnid
+          shouldHave: true
+        damage:
+          types:
+            Poison: 2
+    Medicine:
+      effects:
+      - !type:HealthChange
+        conditions:
+        - !type:Temperature
+          max: 213.0
+        - !type:OrganType
+          type: Arachnid
+          shouldHave: false
+        damage:
+          types:
+            Bloodloss: -6
+      - !type:ModifyBloodLevel
+        conditions:
+        - !type:Temperature
+          max: 213.0
+        - !type:OrganType
+          type: Arachnid
+          shouldHave: false
+        amount: 6
+
+- type: reagent
+  id: Cyanoxadone
+  name: reagent-name-cyanoxadone
+  group: Medicine
+  desc: reagent-desc-cyanoxadone
+  physicalDesc: reagent-physical-desc-metallic
+  flavor: medicine
+  color: "#00eeff"
+  worksOnTheDead: true
+  metabolisms:
+    Poison:
+      effects:
+      - !type:HealthChange
+        conditions:
+        - !type:OrganType
+          type: Arachnid
+          shouldHave: false
+        damage:
+          types:
+            Poison: 2
+    Medicine:
+      effects:
+      - !type:HealthChange
+        conditions:
+        - !type:Temperature
+          max: 213.0
+        - !type:OrganType
+          type: Arachnid
+          shouldHave: true
+        damage:
+          types:
+            Bloodloss: -6
+      - !type:ModifyBloodLevel
+        conditions:
+        - !type:Temperature
+          max: 213.0
+        - !type:OrganType
+          type: Arachnid
+          shouldHave: true
+        amount: 6

Resources/Prototypes/DeltaV/Recipes/Lathes/electronics.yml

@@ -6,3 +6,8 @@
      Steel: 100
      Glass: 900
      Silver: 100
+
+- type: latheRecipe
+  parent: BaseGoldCircuitboardRecipe
+  id: AdvancedMicrowaveMachineCircuitBoard
+  result: AdvancedMicrowaveMachineCircuitBoard

Resources/Prototypes/DeltaV/Recipes/Reactions/medicine.yml

@@ -0,0 +1,27 @@
+- type: reaction
+  id: Hemoxadone
+  minTemp: 370
+  reactants:
+    Iron:
+      amount: 2
+    Traumoxadone:
+      amount: 1
+    Blood:
+      amount: 1
+      catalyst: true
+  products:
+    Hemoxadone: 2
+
+- type: reaction
+  id: Cyanoxadone
+  minTemp: 370
+  reactants:
+    Copper:
+      amount: 2
+    Traumoxadone:
+      amount: 1
+    CopperBlood:
+      amount: 1
+      catalyst: true
+  products:
+    Cyanoxadone: 2

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

@@ -14,7 +14,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 50
+        maxVol: 100 # DeltaV - More reagents for chefs
   - type: SolutionTransfer
     # This is potentially badly-handled due to 'drink opening',
     #  but it lets the flour be tampered with, refilled, etc.
@@ -92,10 +92,10 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 50
+        maxVol: 100 # DeltaV - More reagents for chefs
         reagents:
         - ReagentId: Flour
-          Quantity: 50
+          Quantity: 100 # DeltaV - More reagents for chefs
 
 - type: entity
   parent: [ReagentPacketBase, ItemHeftyBase]
@@ -126,7 +126,7 @@
       food:
         reagents:
         - ReagentId: Cornmeal
-          Quantity: 50
+          Quantity: 100 # DeltaV - More reagents for chefs
 
 - type: entity
   parent: ReagentPacketBase
@@ -157,7 +157,7 @@
       food:
         reagents:
         - ReagentId: Rice
-          Quantity: 50
+          Quantity: 100 # DeltaV - More reagents for chefs
 
 - type: entity
   parent: ReagentPacketBase
@@ -188,7 +188,7 @@
       food:
         reagents:
         - ReagentId: Sugar
-          Quantity: 50
+          Quantity: 100 # DeltaV - More reagents for chefs
 
 - type: entity
   parent: ReagentPacketBase

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -619,6 +619,7 @@
     - ClarkePeripheralsElectronics
     - BaseComputerModularCircuitBoard # Arcadis - Modular Computer System
     - DiskBurnerMachineCircuitboard # Arcadis - Modular Computer System
+    - AdvancedMicrowaveMachineCircuitBoard
   - type: EmagLatheRecipes
     emagDynamicRecipes:
     - ShuttleGunDusterCircuitboard

Resources/Prototypes/Research/civilianservices.yml

@@ -54,6 +54,7 @@
   - FatExtractorMachineCircuitboard
   - BiofabricatorMachineCircuitboard
   - BiomassReclaimerMachineCircuitboard
+  - AdvancedMicrowaveMachineCircuitBoard # DeltaV
 
 # TODO: Add recipes to manufacture Vacsuits.
 # - type: technology

Resources/Prototypes/_DV/Entities/Objects/Devices/CircuitBoards/Machine/production.yml

@@ -0,0 +1,12 @@
+- type: entity
+  parent: MicrowaveMachineCircuitboard
+  id: AdvancedMicrowaveMachineCircuitBoard
+  name: advanced microwave machine board
+  components:
+  - type: MachineBoard
+    prototype: AdvancedMicrowave
+    requirements:
+      Capacitor: 2
+    materialRequirements:
+      Glass: 4
+      Cable: 5

Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml

@@ -50,6 +50,10 @@ Cryo pods separate out each reagent from the beaker in the pod, injecting a smal
 <GuideReagentEmbed Reagent="Aloxadone"/>
 <GuideReagentEmbed Reagent="Stelloxadone"/>
 <GuideReagentEmbed Reagent="Doxarubixadone"/>
+<GuideReagentEmbed Reagent="Hemoxadone"/>
+<GuideReagentEmbed Reagent="Cyanoxadone"/>
+<GuideReagentEmbed Reagent="Dexalin"/>
+<GuideReagentEmbed Reagent="Leporazine"/>
 <GuideReagentEmbed Reagent="Necrosol"/>
 <GuideReagentEmbed Reagent="Opporozidone"/>
 

Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/meta.json

@@ -0,0 +1,41 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from /tg/station at commit 9065b811726ae52be5d1889f436c01a24efbf47a, edited by github user @Flareguy for Space Station 14, edited by github user Stop-Signs for DeltaV",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "mw"
+        },
+        {
+            "name": "mw_unlit"
+        },
+        {
+            "name": "mw0"
+        },
+        {
+            "name": "mw_running_unlit"
+        },
+        {
+            "name": "mwb"
+        },
+        {
+            "name": "mwbloody"
+        },
+        {
+            "name": "mwbloody0"
+        },
+        {
+            "name": "mwbloody1"
+        },
+        {
+            "name": "mwbloodyo"
+        },
+        {
+            "name": "mwo"
+        }
+    ]
+}