Merge remote-tracking branch 'upstream/master'

Colin-Tel · Sep 16, 2023 · 3ffe090 · 3ffe090
2 parents 60d93dc + 5b71cf5
commit 3ffe090
Show file tree

Hide file tree

Showing 3 changed files with 20,242 additions and 18,371 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -444,3 +444,12 @@ Entries:
       message: Made changes to exterior and Medical Department of Glacier Station.
   id: 60
   time: '2023-09-09T20:08:53.0000000+00:00'
+- author: Velcroboy
+  changes:
+    - type: Tweak
+      message: >-
+        Overhauled Bar/Kitchen/Hydro and swapped location with Dorms. Hopefully
+        this livens things up a bit for our service crew members. Please! Report
+        any bugs/issues in the mapping channel in Discord.  
+  id: 61
+  time: '2023-09-14T16:14:37.0000000+00:00'
diff --git a/Resources/Maps/arena.yml b/Resources/Maps/arena.yml
@@ -57937,13 +57937,6 @@ entities:
         - 0
         - 0
       type: EntityStorage
-- proto: CrateNPCCow
-  entities:
-  - uid: 1714
-    components:
-    - pos: -13.5,-14.5
-      parent: 6747
-      type: Transform
 - proto: CrateNPCDuck
   entities:
   - uid: 11119
@@ -74483,7 +74476,7 @@ entities:
       pos: 43.5,30.5
       parent: 6747
       type: Transform
-    - color: '#FF1212FF'
+    - color: '#66FF66FF'
       type: AtmosPipeColor
 - proto: GasFilterFlipped
   entities:
@@ -74728,20 +74721,12 @@ entities:
       type: Transform
     - color: '#CC6600FF'
       type: AtmosPipeColor
-  - uid: 11825
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 43.5,31.5
-      parent: 6747
-      type: Transform
-    - color: '#66FF66FF'
-      type: AtmosPipeColor
   - uid: 23527
     components:
     - pos: 43.5,33.5
       parent: 6747
       type: Transform
-    - color: '#FF9999FF'
+    - color: '#66FF66FF'
       type: AtmosPipeColor
   - uid: 25075
     components:
@@ -74964,15 +74949,6 @@ entities:
       type: AtmosPipeColor
     - enabled: True
       type: AmbientSound
-  - uid: 7936
-    components:
-    - pos: 46.5,32.5
-      parent: 6747
-      type: Transform
-    - color: '#CC6600FF'
-      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
   - uid: 7952
     components:
     - pos: 37.5,42.5
@@ -77762,6 +77738,25 @@ entities:
       type: AtmosPipeColor
     - enabled: True
       type: AmbientSound
+  - uid: 7934
+    components:
+    - pos: 43.5,31.5
+      parent: 6747
+      type: Transform
+    - color: '#66FF66FF'
+      type: AtmosPipeColor
+    - enabled: True
+      type: AmbientSound
+  - uid: 7936
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 47.5,30.5
+      parent: 6747
+      type: Transform
+    - color: '#CC6600FF'
+      type: AtmosPipeColor
+    - enabled: True
+      type: AmbientSound
   - uid: 7959
     components:
     - pos: 37.5,41.5
@@ -102736,16 +102731,6 @@ entities:
       type: AtmosPipeColor
     - enabled: True
       type: AmbientSound
-  - uid: 7935
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 47.5,30.5
-      parent: 6747
-      type: Transform
-    - color: '#CC6600FF'
-      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
   - uid: 7937
     components:
     - pos: 45.5,32.5
@@ -104703,6 +104688,15 @@ entities:
       type: Transform
     - color: '#0335FCFF'
       type: AtmosPipeColor
+  - uid: 22380
+    components:
+    - pos: 46.5,32.5
+      parent: 6747
+      type: Transform
+    - color: '#CC6600FF'
+      type: AtmosPipeColor
+    - enabled: True
+      type: AmbientSound
   - uid: 23660
     components:
     - pos: 3.5,-8.5
@@ -105977,7 +105971,7 @@ entities:
     - pos: 45.5,31.5
       parent: 6747
       type: Transform
-    - color: '#66FF66FF'
+    - color: '#CC6600FF'
       type: AtmosPipeColor
 - proto: GasThermoMachineFreezer
   entities:
@@ -106005,23 +105999,21 @@ entities:
     - pos: -3.5,-86.5
       parent: 6747
       type: Transform
-  - uid: 24980
+- proto: GasThermoMachineFreezerEnabled
+  entities:
+  - uid: 11825
     components:
     - pos: 0.5,-20.5
       parent: 6747
       type: Transform
-    - targetTemperature: 0
-      enabled: True
+    - targetTemperature: 249.8167
       type: GasThermoMachine
-    - powerDisabled: False
-      type: ApcPowerReceiver
-    - color: '#E5CCFFFF'
-      type: AtmosPipeColor
 - proto: GasThermoMachineHeater
   entities:
-  - uid: 7934
+  - uid: 7935
     components:
-    - pos: 47.5,31.5
+    - rot: -1.5707963267948966 rad
+      pos: 47.5,32.5
       parent: 6747
       type: Transform
     - color: '#CC6600FF'
@@ -145984,6 +145976,13 @@ entities:
     - pos: 38.5,-39.5
       parent: 6747
       type: Transform
+- proto: SpawnMobCow
+  entities:
+  - uid: 1714
+    components:
+    - pos: -13.5,-14.5
+      parent: 6747
+      type: Transform
 - proto: SpawnMobDrone
   entities:
   - uid: 7708
@@ -167457,13 +167456,6 @@ entities:
       type: Transform
     - location: Engineering
       type: WarpPoint
-  - uid: 22380
-    components:
-    - pos: 47.5,32.5
-      parent: 6747
-      type: Transform
-    - location: Atmospherics
-      type: WarpPoint
   - uid: 22381
     components:
     - pos: 47.5,12.5
@@ -167510,6 +167502,13 @@ entities:
       type: Transform
     - location: Arena
       type: WarpPoint
+  - uid: 24980
+    components:
+    - name: Atmospherics
+      type: MetaData
+    - pos: 47.5,31.5
+      parent: 6747
+      type: Transform
 - proto: WashingMachine
   entities:
   - uid: 2780