Merge remote-tracking branch 'upstream/master' into ups

Resources/Prototypes/Reagents/gases.yml

@@ -14,6 +14,10 @@
         conditions:
         - !type:OrganType
           type: Human
+      - !type:Oxygenate # WD
+        conditions:
+        - !type:OrganType
+          type: AnthroAnimal
       - !type:Oxygenate
         conditions:
         - !type:OrganType
@@ -450,6 +454,11 @@
         conditions:
         - !type:OrganType
           type: Human
+      - !type:Oxygenate # WD
+        factor: 8
+        conditions:
+        - !type:OrganType
+          type: AnthroAnimal
       - !type:Oxygenate
         factor: 8
         conditions:

Resources/Prototypes/Reagents/narcotics.yml

@@ -522,7 +522,7 @@
   desc: reagent-desc-tear-gas
   physicalDesc: reagent-physical-desc-milky
   flavor: salty
-  color: "#96a8b5"
+  color: "#B54B3BBA"
   boilingPoint: 255.0
   meltingPoint: 36.0
   metabolisms:

Resources/Prototypes/Reagents/toxins.yml

@@ -412,6 +412,8 @@
           min: 1
         - !type:OrganType
           type: Animal # Applying damage to the mobs with lower metabolism capabilities
+        - !type:OrganType # WD
+          type: AnthroAnimal
         damage:
           types:
             Poison: 0.4
@@ -422,6 +424,8 @@
             min: 3
           - !type:OrganType
             type: Animal
+          - !type:OrganType # WD
+            type: AnthroAnimal
 
 - type: reagent
   id: Amatoxin
@@ -488,6 +492,9 @@
           - !type:OrganType
             type: Animal
             shouldHave: false
+          - !type:OrganType # WD
+            type: AnthroAnimal
+            shouldHave: false
         reagent: Protein
         type: Local
         visualType: MediumCaution
@@ -499,11 +506,17 @@
           - !type:OrganType
             type: Animal
             shouldHave: false
+          - !type:OrganType # WD
+            type: AnthroAnimal
+            shouldHave: false
       - !type:HealthChange
         conditions:
         - !type:OrganType
           type: Animal
           shouldHave: false
+        - !type:OrganType # WD
+          type: AnthroAnimal
+          shouldHave: false
         damage:
           types:
             Poison: 1
@@ -512,6 +525,9 @@
         - !type:OrganType
           type: Animal
           shouldHave: true
+        - !type:OrganType # WD
+          type: AnthroAnimal
+          shouldHave: true
         reagent: Protein
         amount: 0.5
 
@@ -533,6 +549,8 @@
           min: 1
         - !type:OrganType
           type: Animal
+        - !type:OrganType # WD
+          type: AnthroAnimal
         damage:
           types:
             Poison: 0.06
@@ -575,6 +593,8 @@
           min: 1
         - !type:OrganType
           type: Animal
+        - !type:OrganType # WD
+          type: AnthroAnimal
         damage:
           types:
             Poison: 0.06