diff --git a/Resources/Changelog/Parts/changey.yml b/Resources/Changelog/Parts/changey.yml
new file mode 100644
index 0000000000..6adb8c410c
--- /dev/null
+++ b/Resources/Changelog/Parts/changey.yml
@@ -0,0 +1,4 @@
+author: Swept
+changes:
+  - type: Fix 
+    message: Fixes a bunch of weirdly rotated stuff on Saltern.
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 23e7025aa9..f3815bfb5d 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -600,9 +600,13 @@ entities:
 - uid: 68
   type: VendingMachineCoffee
   components:
+  - name: Hot drinks machine
+    type: MetaData
   - pos: -11.5,-17.5
     parent: 853
     type: Transform
+  - enabled: False
+    type: PointLight
   - enabled: False
     type: AmbientSound
 - uid: 69
@@ -652,8 +656,6 @@ entities:
     pos: -3.470539,16.956116
     parent: 853
     type: Transform
-  - solution: drink
-    type: RefillableSolution
   - solution: drink
     type: DrainableSolution
 - uid: 74
@@ -702,8 +704,6 @@ entities:
   - pos: 8.439846,26.712742
     parent: 853
     type: Transform
-  - solution: drink
-    type: RefillableSolution
   - solution: drink
     type: DrainableSolution
 - uid: 81
@@ -881,17 +881,15 @@ entities:
     parent: 853
     type: Transform
 - uid: 106
-  type: WeldingFuelTankFull
+  type: WaterTankFull
   components:
-  - rot: 1.5707963705062866 rad
-    pos: -1.5,-11.5
+  - pos: 0.5,-11.5
     parent: 853
     type: Transform
 - uid: 107
-  type: WaterTankFull
+  type: WeldingFuelTankFull
   components:
-  - rot: 1.5707963705062866 rad
-    pos: 0.5,-11.5
+  - pos: -1.5,-11.5
     parent: 853
     type: Transform
 - uid: 108
@@ -933,8 +931,6 @@ entities:
   - pos: 8.661116,25.513401
     parent: 853
     type: Transform
-  - solution: drink
-    type: RefillableSolution
   - solution: drink
     type: DrainableSolution
 - uid: 114
@@ -985,6 +981,8 @@ entities:
   - pos: -8.5,1.5
     parent: 853
     type: Transform
+  - enabled: False
+    type: PointLight
   - enabled: False
     type: AmbientSound
 - uid: 121
@@ -1068,6 +1066,8 @@ entities:
   - pos: -22.5,0.5
     parent: 853
     type: Transform
+  - enabled: False
+    type: PointLight
   - enabled: False
     type: AmbientSound
 - uid: 131
@@ -1093,8 +1093,7 @@ entities:
 - uid: 133
   type: SignEngineering
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: 30.305984,-0.5
+  - pos: 30.315523,-0.56386197
     parent: 853
     type: Transform
 - uid: 134
@@ -1752,6 +1751,8 @@ entities:
     pos: -28.5,11.5
     parent: 853
     type: Transform
+  - enabled: False
+    type: PointLight
   - enabled: False
     type: AmbientSound
 - uid: 192
@@ -6906,8 +6907,7 @@ entities:
 - uid: 653
   type: SignInterrogation
   components:
-  - rot: 3.141592653589793 rad
-    pos: -0.42353058,11.3777275
+  - pos: -0.50669944,11.429551
     parent: 853
     type: Transform
 - uid: 654
@@ -8265,6 +8265,8 @@ entities:
   - pos: -0.5,18.5
     parent: 853
     type: Transform
+  - enabled: False
+    type: PointLight
   - enabled: False
     type: AmbientSound
 - uid: 808
@@ -12915,7 +12917,7 @@ entities:
       - 0
       - 0
     type: GridAtmosphere
-  - linearDamping: 0.05
+  - angularDamping: 0.1
     fixtures:
     - shape: !type:PolygonShape
         vertices:
@@ -14642,6 +14644,8 @@ entities:
     pos: -17.5,-9.5
     parent: 853
     type: Transform
+  - enabled: False
+    type: PointLight
   - enabled: False
     type: AmbientSound
 - uid: 900
@@ -15023,8 +15027,6 @@ entities:
     pos: 8.5,17.5
     parent: 853
     type: Transform
-  - bodyType: Dynamic
-    type: Physics
 - uid: 956
   type: Table
   components:
@@ -15199,6 +15201,8 @@ entities:
   - pos: -11.5,-9.5
     parent: 853
     type: Transform
+  - enabled: False
+    type: PointLight
   - enabled: False
     type: AmbientSound
 - uid: 981
@@ -15237,10 +15241,14 @@ entities:
 - uid: 985
   type: VendingMachineCoffee
   components:
+  - name: Hot drinks machine
+    type: MetaData
   - rot: 4.371139006309477E-08 rad
     pos: 0.5,23.5
     parent: 853
     type: Transform
+  - enabled: False
+    type: PointLight
   - enabled: False
     type: AmbientSound
 - uid: 986
@@ -15250,6 +15258,8 @@ entities:
     pos: 1.5,21.5
     parent: 853
     type: Transform
+  - enabled: False
+    type: PointLight
   - enabled: False
     type: AmbientSound
 - uid: 987
@@ -15305,6 +15315,8 @@ entities:
   - pos: -13.5,1.5
     parent: 853
     type: Transform
+  - enabled: False
+    type: PointLight
   - enabled: False
     type: AmbientSound
 - uid: 993
@@ -15334,8 +15346,6 @@ entities:
     pos: 22.5,-14.5
     parent: 853
     type: Transform
-  - bodyType: Dynamic
-    type: Physics
 - uid: 997
   type: CableApcExtension
   components:
@@ -15839,6 +15849,8 @@ entities:
   - pos: -18.5,-2.5
     parent: 853
     type: Transform
+  - enabled: False
+    type: PointLight
   - enabled: False
     type: AmbientSound
 - uid: 1059
@@ -16475,8 +16487,7 @@ entities:
 - uid: 1136
   type: SheetPlasteel
   components:
-  - rot: 3.141592653589793 rad
-    pos: 46.608032,4.3461604
+  - pos: 46.859222,4.579251
     parent: 853
     type: Transform
   - canCollide: False
@@ -16494,6 +16505,8 @@ entities:
     pos: 13.5,-11.5
     parent: 853
     type: Transform
+  - enabled: False
+    type: PointLight
   - enabled: False
     type: AmbientSound
 - uid: 1139
@@ -16599,6 +16612,8 @@ entities:
     pos: 19.5,-4.5
     parent: 853
     type: Transform
+  - enabled: False
+    type: PointLight
   - enabled: False
     type: AmbientSound
 - uid: 1152
@@ -16692,8 +16707,6 @@ entities:
     type: Transform
   - sleepTime: 1114.4688
     type: Physics
-  - solution: drink
-    type: RefillableSolution
   - solution: drink
     type: DrainableSolution
 - uid: 1162
@@ -16732,8 +16745,6 @@ entities:
     pos: 28.5,1.5
     parent: 853
     type: Transform
-  - bodyType: Dynamic
-    type: Physics
 - uid: 1166
   type: Chair
   components:
@@ -16741,8 +16752,6 @@ entities:
     pos: 26.5,1.5
     parent: 853
     type: Transform
-  - bodyType: Dynamic
-    type: Physics
 - uid: 1167
   type: LockerHeadOfSecurityFilled
   components:
@@ -16826,8 +16835,7 @@ entities:
 - uid: 1176
   type: SheetPlasteel
   components:
-  - rot: 3.141592653589793 rad
-    pos: 46.920532,4.6742854
+  - pos: 46.546722,4.5896745
     parent: 853
     type: Transform
   - canCollide: False
@@ -17380,6 +17388,8 @@ entities:
     pos: -34.5,2.5
     parent: 853
     type: Transform
+  - enabled: False
+    type: PointLight
   - enabled: False
     type: AmbientSound
 - uid: 1236
@@ -17638,6 +17648,8 @@ entities:
     pos: 31.5,-0.5
     parent: 853
     type: Transform
+  - enabled: False
+    type: PointLight
   - enabled: False
     type: AmbientSound
 - uid: 1264
@@ -19980,8 +19992,6 @@ entities:
     pos: -3.5,-23.5
     parent: 853
     type: Transform
-  - bodyType: Dynamic
-    type: Physics
 - uid: 1536
   type: Chair
   components:
@@ -19989,8 +19999,6 @@ entities:
     pos: 38.5,-0.5
     parent: 853
     type: Transform
-  - bodyType: Dynamic
-    type: Physics
 - uid: 1537
   type: Table
   components:
@@ -20005,6 +20013,8 @@ entities:
     pos: 31.5,0.5
     parent: 853
     type: Transform
+  - enabled: False
+    type: PointLight
   - enabled: False
     type: AmbientSound
 - uid: 1539
@@ -20017,8 +20027,7 @@ entities:
 - uid: 1540
   type: SignArmory
   components:
-  - rot: 1.5707963705062866 rad
-    pos: -13.678196,17.5
+  - pos: -13.507725,17.439112
     parent: 853
     type: Transform
 - uid: 1541
@@ -25944,10 +25953,14 @@ entities:
 - uid: 2383
   type: VendingMachineCoffee
   components:
+  - name: Hot drinks machine
+    type: MetaData
   - rot: 4.371139006309477E-08 rad
     pos: 5.5,-13.5
     parent: 853
     type: Transform
+  - enabled: False
+    type: PointLight
   - enabled: False
     type: AmbientSound
 - uid: 2384
@@ -26349,6 +26362,8 @@ entities:
     pos: 29.5,6.5
     parent: 853
     type: Transform
+  - enabled: False
+    type: PointLight
   - enabled: False
     type: AmbientSound
 - uid: 2436
@@ -26401,8 +26416,6 @@ entities:
     pos: -8.476567,-17.420076
     parent: 853
     type: Transform
-  - solution: drink
-    type: RefillableSolution
   - solution: drink
     type: DrainableSolution
 - uid: 2443
@@ -41698,9 +41711,13 @@ entities:
 - uid: 4038
   type: VendingMachineCoffee
   components:
+  - name: Hot drinks machine
+    type: MetaData
   - pos: -11.5,11.5
     parent: 853
     type: Transform
+  - enabled: False
+    type: PointLight
   - enabled: False
     type: AmbientSound
 - uid: 4039
@@ -47377,19 +47394,15 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 4766
-  type: AMEJar
+  type: Rack
   components:
-  - rot: 3.141592653589793 rad
-    pos: 42.867836,11.333441
+  - pos: 43.5,11.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4767
   type: AMEJar
   components:
-  - rot: 3.141592653589793 rad
-    pos: 42.50846,11.364691
+  - pos: 43.358795,11.489559
     parent: 853
     type: Transform
   - canCollide: False
@@ -48088,6 +48101,23 @@ entities:
       DisposalUnit: !type:Container
         ents: []
     type: ContainerContainer
+- uid: 4833
+  type: ExtinguisherCabinet
+  components:
+  - pos: 14.336893,-3.6277943
+    parent: 853
+    type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
+- uid: 4834
+  type: AMEJar
+  components:
+  - pos: 43.692127,11.562527
+    parent: 853
+    type: Transform
+  - canCollide: False
+    type: Physics
 - uid: 4835
   type: CableHV
   components:
@@ -48730,192 +48760,279 @@ entities:
   - pos: -26.5,-1.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4922
   type: ExtinguisherCabinetFilled
   components:
   - pos: -26.5,-4.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4923
   type: ExtinguisherCabinetFilled
   components:
   - pos: -15.5,-0.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4924
   type: ExtinguisherCabinetFilled
   components:
   - pos: -18.5,8.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4925
   type: ExtinguisherCabinetFilled
   components:
   - pos: -30.5,10.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4926
   type: ExtinguisherCabinetFilled
   components:
   - pos: -34.5,-2.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4927
   type: ExtinguisherCabinetFilled
   components:
   - pos: -16.5,-8.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4928
   type: ExtinguisherCabinetFilled
   components:
   - pos: -6.5,-16.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4929
   type: ExtinguisherCabinetFilled
   components:
   - pos: -6.5,-18.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4930
   type: ExtinguisherCabinetFilled
   components:
   - pos: 8.5,-17.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4931
   type: ExtinguisherCabinetFilled
   components:
   - pos: 16.5,-16.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4932
   type: ExtinguisherCabinetFilled
   components:
   - pos: 24.5,-16.5
     parent: 853
     type: Transform
-- uid: 4933
-  type: ExtinguisherCabinetFilled
-  components:
-  - pos: 25.5,-7.5
-    parent: 853
-    type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4934
   type: ExtinguisherCabinetFilled
   components:
   - pos: 32.5,-5.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4935
   type: ExtinguisherCabinetFilled
   components:
   - pos: 41.5,-1.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4936
   type: ExtinguisherCabinetFilled
   components:
   - pos: 46.5,-11.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4937
   type: ExtinguisherCabinetFilled
   components:
   - pos: 52.5,-11.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4938
   type: ExtinguisherCabinetFilled
   components:
   - pos: 45.5,6.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4939
   type: ExtinguisherCabinetFilled
   components:
   - pos: 17.5,9.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4940
   type: ExtinguisherCabinetFilled
   components:
   - pos: 9.5,12.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4941
   type: ExtinguisherCabinetFilled
   components:
   - pos: -10.5,13.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4942
   type: ExtinguisherCabinetFilled
   components:
   - pos: -6.5,18.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4943
   type: ExtinguisherCabinetFilled
   components:
   - pos: 0.5,16.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4944
   type: ExtinguisherCabinetFilled
   components:
   - pos: 11.5,18.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4945
   type: ExtinguisherCabinetFilled
   components:
   - pos: 5.5,24.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4946
   type: ExtinguisherCabinetFilled
   components:
   - pos: 1.5,26.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4947
   type: ExtinguisherCabinetFilled
   components:
   - pos: -3.5,-25.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4948
   type: ExtinguisherCabinetFilled
   components:
   - pos: -13.5,-23.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4949
   type: ExtinguisherCabinetFilled
   components:
   - pos: 11.5,-28.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4950
   type: ExtinguisherCabinetFilled
   components:
   - pos: 20.5,-20.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4951
   type: ExtinguisherCabinetFilled
   components:
   - pos: 29.5,11.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4952
   type: ExtinguisherCabinetFilled
   components:
   - pos: 44.5,11.5
     parent: 853
     type: Transform
+  - containers:
+      cabinetSlot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4953
   type: Poweredlight
   components:
@@ -49490,8 +49607,6 @@ entities:
     type: Transform
   - canCollide: False
     type: Physics
-  - solution: drink
-    type: RefillableSolution
   - solution: drink
     type: DrainableSolution
 - uid: 5029
@@ -49901,8 +50016,6 @@ entities:
     type: Transform
   - canCollide: False
     type: Physics
-  - solution: drink
-    type: RefillableSolution
   - solution: drink
     type: DrainableSolution
 - uid: 5080