Merge branch 'master' into 2020-08-19-firelocks

Resources/Prototypes/Entities/Constructible/Walls/atmos_plaque.yml

@@ -0,0 +1,22 @@
+- type: entity
+  parent: BaseSign
+  id: PlaqueAtmos
+  name: Atmos Plaque
+  components:
+  - type: Collidable
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.3,-0.3,0.3,0.3"
+      layer:
+      - Opaque
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      - Clickable
+
+  - type: Icon
+    state: atmosplaque
+  - type: Sprite
+    state: atmosplaque
+  - type: AtmosPlaque

Resources/Prototypes/Entities/Constructible/Walls/signs.yml

@@ -974,50 +974,6 @@
   - type: Icon
     state: atmos_waste
 
-- type: entity
-  parent: BaseSign
-  id: PlaqueZum
-  name: zumos plaque
-  description: "This plaque commemorates the rise of the Atmos ZUM division. May they carry the torch that the Atmos ZAS, LINDA and FEA divisions left behind."
-  components:
-  - type: Collidable
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.3,-0.3,0.3,0.3"
-      layer:
-      - Opaque
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
-      - Clickable
-  - type: Sprite
-    state: zumosplaque
-  - type: Icon
-    state: zumosplaque
-
-- type: entity
-  parent: BaseSign
-  id: PlaqueAtmos
-  name: atmos plaque
-  description: "This plaque commemorates the fall of the Atmos FEA division. For all the charred, dizzy, and brittle men who have died in its hands."
-  components:
-    - type: Collidable
-      shapes:
-        - !type:PhysShapeAabb
-          bounds: "-0.3,-0.3,0.3,0.3"
-          layer:
-            - Opaque
-            - Impassable
-            - MobImpassable
-            - VaultImpassable
-            - SmallImpassable
-            - Clickable
-    - type: Sprite
-      state: atmosplaque
-    - type: Icon
-      state: atmosplaque
-
 - type: entity
   parent: BaseSign
   id: SignSmoking

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

@@ -128,12 +128,26 @@
       layer:
       - Opaque
       - MobImpassable
+  - type: AtmosExposed
+  - type: Temperature
+    heatDamageThreshold: 360
+    coldDamageThreshold: 260
+    currentTemperature: 310.15
+    specificHeat: 42
+    tempDamageCoefficient: 0.1
   - type: BodyManager
     criticalThreshold: 100
     deadThreshold: 200
     baseTemplate: bodyTemplate.Humanoid
     basePreset: bodyPreset.BasicHuman
   - type: Metabolism
+    metabolismHeat: 5000
+    radiatedHeat: 400
+    implicitHeatRegulation: 5000
+    sweatHeatRegulation: 5000
+    shiveringHeatRegulation: 5000
+    normalBodyTemperature: 310.15
+    thermalRegulationTemperatureThreshold: 25
     needsGases:
       Oxygen: 0.006365740
     producesGases: