From 745b1dac06d192713a8b66fef57c665298c307c2 Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Fri, 20 Sep 2024 17:24:53 +0300
Subject: [PATCH] Cleanup

---
 Resources/Maps/_NF/POI/edison.yml             | 331 +++++++++---------
 .../_NF/Entities/Markers/warp_point.yml       |   9 +
 .../Structures/Machines/fax_machine.yml       |   9 +
 3 files changed, 181 insertions(+), 168 deletions(-)

diff --git a/Resources/Maps/_NF/POI/edison.yml b/Resources/Maps/_NF/POI/edison.yml
index fe92a2c8f10..6ac3627edad 100644
--- a/Resources/Maps/_NF/POI/edison.yml
+++ b/Resources/Maps/_NF/POI/edison.yml
@@ -3369,7 +3369,7 @@ entities:
       parent: 2
 - proto: AirlockMaint
   entities:
-  - uid: 3783
+  - uid: 3797
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -3420,7 +3420,7 @@ entities:
     - type: Transform
       pos: 12.5,1.5
       parent: 2
-  - uid: 3793
+  - uid: 3825
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -3640,7 +3640,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 37.5,-1.5
       parent: 2
-  - uid: 3888
+  - uid: 3927
     components:
     - type: Transform
       pos: 34.5,-4.5
@@ -4235,7 +4235,7 @@ entities:
       parent: 2
 - proto: Autolathe
   entities:
-  - uid: 3225
+  - uid: 3226
     components:
     - type: Transform
       pos: 7.5,12.5
@@ -4659,7 +4659,7 @@ entities:
       parent: 2
 - proto: BlockGameArcade
   entities:
-  - uid: 3226
+  - uid: 3227
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -11874,7 +11874,7 @@ entities:
     - type: Transform
       pos: 21.5,19.5
       parent: 2
-  - uid: 3261
+  - uid: 3262
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -11967,22 +11967,22 @@ entities:
       parent: 2
 - proto: ConveyorBelt
   entities:
-  - uid: 2692
+  - uid: 2700
     components:
     - type: Transform
       pos: -12.5,5.5
       parent: 2
-  - uid: 2707
+  - uid: 2708
     components:
     - type: Transform
       pos: -12.5,4.5
       parent: 2
-  - uid: 2729
+  - uid: 2730
     components:
     - type: Transform
       pos: -12.5,6.5
       parent: 2
-  - uid: 2730
+  - uid: 2731
     components:
     - type: Transform
       pos: -12.5,7.5
@@ -12046,46 +12046,46 @@ entities:
       rot: 3.141592653589793 rad
       pos: -12.5,2.5
       parent: 2
-  - uid: 4086
+  - uid: 4085
     components:
     - type: Transform
       pos: 11.5,-3.5
       parent: 2
-  - uid: 4092
+  - uid: 4091
     components:
     - type: Transform
       pos: 4.5,0.5
       parent: 2
-  - uid: 4105
+  - uid: 4104
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 14.5,9.5
       parent: 2
-  - uid: 4121
+  - uid: 4120
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 4.5,7.5
       parent: 2
-  - uid: 4131
+  - uid: 4130
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 14.5,16.5
       parent: 2
-  - uid: 4132
+  - uid: 4131
     components:
     - type: Transform
       pos: 17.5,16.5
       parent: 2
-  - uid: 4144
+  - uid: 4143
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -6.5,18.5
       parent: 2
-  - uid: 4155
+  - uid: 4154
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -12093,19 +12093,19 @@ entities:
       parent: 2
 - proto: DisposalJunction
   entities:
-  - uid: 2731
+  - uid: 3181
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -10.5,-3.5
       parent: 2
-  - uid: 4074
+  - uid: 4073
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 0.5,-3.5
       parent: 2
-  - uid: 4138
+  - uid: 4137
     components:
     - type: Transform
       pos: -3.5,18.5
@@ -12118,481 +12118,481 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -11.5,2.5
       parent: 2
-  - uid: 4087
+  - uid: 4086
     components:
     - type: Transform
       pos: 0.5,0.5
       parent: 2
-  - uid: 4120
+  - uid: 4119
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 4.5,9.5
       parent: 2
-  - uid: 4136
+  - uid: 4135
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 15.5,10.5
       parent: 2
-  - uid: 4137
+  - uid: 4136
     components:
     - type: Transform
       pos: 14.5,10.5
       parent: 2
 - proto: DisposalPipe
   entities:
-  - uid: 1706
+  - uid: 1707
     components:
     - type: Transform
       pos: -11.5,1.5
       parent: 2
-  - uid: 2713
+  - uid: 2714
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 10.5,-3.5
       parent: 2
-  - uid: 3181
+  - uid: 3199
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -10.5,-2.5
       parent: 2
-  - uid: 3199
+  - uid: 3224
     components:
     - type: Transform
       pos: -11.5,0.5
       parent: 2
-  - uid: 3224
+  - uid: 3225
     components:
     - type: Transform
       pos: -10.5,-1.5
       parent: 2
-  - uid: 3249
+  - uid: 3250
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -12.5,3.5
       parent: 2
-  - uid: 3250
+  - uid: 3251
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -12.5,4.5
       parent: 2
-  - uid: 3251
+  - uid: 3252
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -12.5,5.5
       parent: 2
-  - uid: 3252
+  - uid: 3260
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -12.5,6.5
       parent: 2
-  - uid: 3479
+  - uid: 3753
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 9.5,-3.5
       parent: 2
-  - uid: 3926
+  - uid: 3928
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 8.5,-3.5
       parent: 2
-  - uid: 3958
+  - uid: 3929
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 7.5,-3.5
       parent: 2
-  - uid: 4069
+  - uid: 3958
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 6.5,-3.5
       parent: 2
-  - uid: 4070
+  - uid: 4069
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 5.5,-3.5
       parent: 2
-  - uid: 4071
+  - uid: 4070
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 4.5,-3.5
       parent: 2
-  - uid: 4072
+  - uid: 4071
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 3.5,-3.5
       parent: 2
-  - uid: 4073
+  - uid: 4072
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 2.5,-3.5
       parent: 2
-  - uid: 4075
+  - uid: 4074
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,-3.5
       parent: 2
-  - uid: 4076
+  - uid: 4075
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -1.5,-3.5
       parent: 2
-  - uid: 4077
+  - uid: 4076
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,-3.5
       parent: 2
-  - uid: 4078
+  - uid: 4077
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,-3.5
       parent: 2
-  - uid: 4079
+  - uid: 4078
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -4.5,-3.5
       parent: 2
-  - uid: 4080
+  - uid: 4079
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -5.5,-3.5
       parent: 2
-  - uid: 4081
+  - uid: 4080
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -6.5,-3.5
       parent: 2
-  - uid: 4082
+  - uid: 4081
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -7.5,-3.5
       parent: 2
-  - uid: 4083
+  - uid: 4082
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -8.5,-3.5
       parent: 2
-  - uid: 4084
+  - uid: 4083
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -9.5,-3.5
       parent: 2
-  - uid: 4085
+  - uid: 4084
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,-3.5
       parent: 2
-  - uid: 4088
+  - uid: 4087
     components:
     - type: Transform
       pos: 0.5,-0.5
       parent: 2
-  - uid: 4089
+  - uid: 4088
     components:
     - type: Transform
       pos: 0.5,-1.5
       parent: 2
-  - uid: 4090
+  - uid: 4089
     components:
     - type: Transform
       pos: 0.5,-2.5
       parent: 2
-  - uid: 4093
+  - uid: 4092
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 3.5,0.5
       parent: 2
-  - uid: 4094
+  - uid: 4093
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,0.5
       parent: 2
-  - uid: 4095
+  - uid: 4094
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,0.5
       parent: 2
-  - uid: 4096
+  - uid: 4095
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,1.5
       parent: 2
-  - uid: 4097
+  - uid: 4096
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,2.5
       parent: 2
-  - uid: 4098
+  - uid: 4097
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,3.5
       parent: 2
-  - uid: 4099
+  - uid: 4098
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,4.5
       parent: 2
-  - uid: 4100
+  - uid: 4099
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,5.5
       parent: 2
-  - uid: 4101
+  - uid: 4100
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,6.5
       parent: 2
-  - uid: 4102
+  - uid: 4101
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,7.5
       parent: 2
-  - uid: 4103
+  - uid: 4102
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,8.5
       parent: 2
-  - uid: 4107
+  - uid: 4106
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 13.5,9.5
       parent: 2
-  - uid: 4108
+  - uid: 4107
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 12.5,9.5
       parent: 2
-  - uid: 4109
+  - uid: 4108
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 11.5,9.5
       parent: 2
-  - uid: 4110
+  - uid: 4109
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 10.5,9.5
       parent: 2
-  - uid: 4111
+  - uid: 4110
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,9.5
       parent: 2
-  - uid: 4112
+  - uid: 4111
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 8.5,9.5
       parent: 2
-  - uid: 4113
+  - uid: 4112
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 7.5,9.5
       parent: 2
-  - uid: 4114
+  - uid: 4113
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 6.5,9.5
       parent: 2
-  - uid: 4115
+  - uid: 4114
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 5.5,9.5
       parent: 2
-  - uid: 4116
+  - uid: 4115
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,9.5
       parent: 2
-  - uid: 4117
+  - uid: 4116
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 3.5,9.5
       parent: 2
-  - uid: 4118
+  - uid: 4117
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,9.5
       parent: 2
-  - uid: 4119
+  - uid: 4118
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,9.5
       parent: 2
-  - uid: 4122
+  - uid: 4121
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,8.5
       parent: 2
-  - uid: 4123
+  - uid: 4122
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 16.5,16.5
       parent: 2
-  - uid: 4124
+  - uid: 4123
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 15.5,16.5
       parent: 2
-  - uid: 4125
+  - uid: 4124
     components:
     - type: Transform
       pos: 14.5,15.5
       parent: 2
-  - uid: 4126
+  - uid: 4125
     components:
     - type: Transform
       pos: 14.5,14.5
       parent: 2
-  - uid: 4127
+  - uid: 4126
     components:
     - type: Transform
       pos: 14.5,13.5
       parent: 2
-  - uid: 4128
+  - uid: 4127
     components:
     - type: Transform
       pos: 14.5,12.5
       parent: 2
-  - uid: 4129
+  - uid: 4128
     components:
     - type: Transform
       pos: 14.5,11.5
       parent: 2
-  - uid: 4134
+  - uid: 4133
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 17.5,10.5
       parent: 2
-  - uid: 4135
+  - uid: 4134
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 16.5,10.5
       parent: 2
-  - uid: 4141
+  - uid: 4140
     components:
     - type: Transform
       pos: -6.5,19.5
       parent: 2
-  - uid: 4142
+  - uid: 4141
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -5.5,18.5
       parent: 2
-  - uid: 4143
+  - uid: 4142
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -4.5,18.5
       parent: 2
-  - uid: 4145
+  - uid: 4144
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,17.5
       parent: 2
-  - uid: 4146
+  - uid: 4145
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,16.5
       parent: 2
-  - uid: 4147
+  - uid: 4146
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,15.5
       parent: 2
-  - uid: 4148
+  - uid: 4147
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,14.5
       parent: 2
-  - uid: 4149
+  - uid: 4148
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,13.5
       parent: 2
-  - uid: 4150
+  - uid: 4149
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,12.5
       parent: 2
-  - uid: 4151
+  - uid: 4150
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,11.5
       parent: 2
-  - uid: 4152
+  - uid: 4151
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,10.5
       parent: 2
-  - uid: 4153
+  - uid: 4152
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -1.5,9.5
       parent: 2
-  - uid: 4154
+  - uid: 4153
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -12600,59 +12600,59 @@ entities:
       parent: 2
 - proto: DisposalTrunk
   entities:
-  - uid: 1711
+  - uid: 1837
     components:
     - type: Transform
       pos: -12.5,7.5
       parent: 2
-  - uid: 2709
+  - uid: 2712
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -10.5,-4.5
       parent: 2
-  - uid: 2712
+  - uid: 2713
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 11.5,-4.5
       parent: 2
-  - uid: 4091
+  - uid: 4090
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,-0.5
       parent: 2
-  - uid: 4104
+  - uid: 4103
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 3.5,7.5
       parent: 2
-  - uid: 4106
+  - uid: 4105
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 18.5,10.5
       parent: 2
-  - uid: 4130
+  - uid: 4129
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 15.5,9.5
       parent: 2
-  - uid: 4133
+  - uid: 4132
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 17.5,15.5
       parent: 2
-  - uid: 4139
+  - uid: 4138
     components:
     - type: Transform
       pos: -3.5,19.5
       parent: 2
-  - uid: 4140
+  - uid: 4139
     components:
     - type: Transform
       pos: -6.5,20.5
@@ -12706,7 +12706,7 @@ entities:
       parent: 2
 - proto: DisposalYJunction
   entities:
-  - uid: 4156
+  - uid: 4155
     components:
     - type: Transform
       pos: 0.5,9.5
@@ -12796,7 +12796,7 @@ entities:
     - type: Transform
       pos: 10.2251625,39.61654
       parent: 2
-- proto: FaxMachineBase
+- proto: FaxMachineNFEdison
   entities:
   - uid: 1695
     components:
@@ -13026,7 +13026,7 @@ entities:
       - 1748
 - proto: FireAxeCabinetFilled
   entities:
-  - uid: 2725
+  - uid: 2726
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -14999,12 +14999,6 @@ entities:
     - type: Transform
       pos: 14.5,32.5
       parent: 2
-  - uid: 2169
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -20.5,30.5
-      parent: 2
   - uid: 2503
     components:
     - type: Transform
@@ -15059,6 +15053,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -18.5,15.5
       parent: 2
+  - uid: 2691
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,30.5
+      parent: 2
   - uid: 3300
     components:
     - type: Transform
@@ -19924,7 +19924,7 @@ entities:
     - type: Transform
       pos: -3.5,-1.5
       parent: 2
-  - uid: 3260
+  - uid: 3261
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -19945,7 +19945,7 @@ entities:
     - type: Transform
       pos: -18.5,33.5
       parent: 2
-  - uid: 3880
+  - uid: 3882
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -20514,13 +20514,13 @@ entities:
       parent: 2
 - proto: PlasticFlapsClear
   entities:
-  - uid: 2726
+  - uid: 2727
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -6.5,-1.5
       parent: 2
-  - uid: 2727
+  - uid: 2728
     components:
     - type: Transform
       pos: 7.5,-1.5
@@ -21046,7 +21046,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -19.5,19.5
       parent: 2
-  - uid: 1708
+  - uid: 1709
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -21057,7 +21057,7 @@ entities:
     - type: Transform
       pos: 18.5,10.5
       parent: 2
-  - uid: 2728
+  - uid: 2729
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -21098,7 +21098,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 11.5,9.5
       parent: 2
-  - uid: 3265
+  - uid: 3751
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -21672,7 +21672,7 @@ entities:
       parent: 2
 - proto: Recycler
   entities:
-  - uid: 1837
+  - uid: 1859
     components:
     - type: Transform
       pos: -12.5,5.5
@@ -22600,7 +22600,7 @@ entities:
     - type: Transform
       pos: 19.5,20.5
       parent: 2
-  - uid: 1707
+  - uid: 1708
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -22706,7 +22706,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -18.5,11.5
       parent: 2
-  - uid: 3882
+  - uid: 3926
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -23509,7 +23509,7 @@ entities:
       parent: 2
 - proto: SpaceVillainArcade
   entities:
-  - uid: 3227
+  - uid: 3249
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -23524,23 +23524,20 @@ entities:
       parent: 2
 - proto: SpawnPointLatejoin
   entities:
-  - uid: 3927
+  - uid: 1705
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 18.5,12.5
+      pos: -0.5,-4.5
       parent: 2
-  - uid: 3928
+  - uid: 3479
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,12.5
+      pos: 0.5,-4.5
       parent: 2
-  - uid: 3929
+  - uid: 4156
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 16.5,12.5
+      pos: 1.5,-4.5
       parent: 2
 - proto: StationMap
   entities:
@@ -23637,7 +23634,7 @@ entities:
     - type: Transform
       pos: -8.5,13.5
       parent: 2
-  - uid: 3262
+  - uid: 3265
     components:
     - type: Transform
       pos: -10.5,11.5
@@ -23917,7 +23914,7 @@ entities:
       parent: 2
 - proto: TableGlass
   entities:
-  - uid: 3751
+  - uid: 3754
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -24122,7 +24119,7 @@ entities:
       parent: 2
 - proto: VendingMachineFlatpackVend
   entities:
-  - uid: 2714
+  - uid: 2725
     components:
     - type: Transform
       pos: -6.5,13.5
@@ -26560,7 +26557,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,-7.5
       parent: 2
-  - uid: 1705
+  - uid: 1706
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -26578,12 +26575,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 3.5,-7.5
       parent: 2
-  - uid: 1859
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.5,7.5
-      parent: 2
   - uid: 1911
     components:
     - type: Transform
@@ -26620,6 +26611,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,-7.5
       parent: 2
+  - uid: 2169
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -13.5,7.5
+      parent: 2
   - uid: 2339
     components:
     - type: Transform
@@ -26650,49 +26647,49 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -12.5,-3.5
       parent: 2
-  - uid: 3753
+  - uid: 3783
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -13.5,2.5
       parent: 2
-  - uid: 3754
+  - uid: 3793
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -13.5,3.5
       parent: 2
-  - uid: 3797
+  - uid: 3867
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -10.5,3.5
       parent: 2
-  - uid: 3825
+  - uid: 3876
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -11.5,8.5
       parent: 2
-  - uid: 3867
+  - uid: 3878
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -14.5,8.5
       parent: 2
-  - uid: 3876
+  - uid: 3880
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -12.5,8.5
       parent: 2
-  - uid: 3878
+  - uid: 3881
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -13.5,8.5
       parent: 2
-  - uid: 3881
+  - uid: 3888
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -26899,7 +26896,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: -20.5,31.5
       parent: 2
-- proto: WarpPoint
+- proto: WarpPointNFEdison
   entities:
   - uid: 3925
     components:
@@ -26907,8 +26904,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,14.5
       parent: 2
-    - type: WarpPoint
-      location: Edison Power Plant
 - proto: WaterCooler
   entities:
   - uid: 2706
@@ -26918,13 +26913,13 @@ entities:
       parent: 2
 - proto: WindoorSecure
   entities:
-  - uid: 1709
+  - uid: 1710
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -11.5,6.5
       parent: 2
-  - uid: 2708
+  - uid: 2709
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -26962,7 +26957,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,-1.5
       parent: 2
-  - uid: 2691
+  - uid: 2692
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -26970,13 +26965,13 @@ entities:
       parent: 2
 - proto: WindowReinforcedDirectional
   entities:
-  - uid: 1710
+  - uid: 1711
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -11.5,7.5
       parent: 2
-  - uid: 2700
+  - uid: 2707
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
diff --git a/Resources/Prototypes/_NF/Entities/Markers/warp_point.yml b/Resources/Prototypes/_NF/Entities/Markers/warp_point.yml
index 3f70c7b391d..fa1d61c528b 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/warp_point.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/warp_point.yml
@@ -152,5 +152,14 @@
   - type: WarpPoint
     location: Derelict McCargo
 
+- type: entity
+  id: WarpPointNFEdison
+  parent: WarpPoint
+  suffix: POI, Edison
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: WarpPoint
+    location: Edison Power Plant
+
 # Events
 
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/fax_machine.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/fax_machine.yml
index a9793ad1808..99b2e7a570b 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/fax_machine.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/fax_machine.yml
@@ -192,6 +192,15 @@
   - type: FaxMachine
     name: "NFSD Outpost Lawyer"
 
+- type: entity
+  parent: [BaseStructureDisableToolUse, FaxMachineBase]
+  id: FaxMachineNFEdison
+  suffix: POI, Edison
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: FaxMachine
+    name: "Edison Power Plant"
+
 # Events
 - type: entity
   parent: FaxMachineNFLPBravo