Fix master + prototypes (#8772)

2022-06-12 13:50:07 +10:00
parent 354017cce0
commit 01d70fbab7
27 changed files with 779 additions and 776 deletions
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -25571,13 +25571,13 @@ entities:
    parent: 30
    type: Transform
 - uid: 406
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: -26.5,14.5
    parent: 30
    type: Transform
 - uid: 407
-  type: APCBasic
+  type: BaseAPC
  components:
  - rot: -1.5707963267948966 rad
    pos: -6.5,13.5
@@ -25590,7 +25590,7 @@ entities:
    parent: 30
    type: Transform
 - uid: 409
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: -2.5,18.5
    parent: 30
@@ -25604,13 +25604,13 @@ entities:
    parent: 30
    type: Transform
 - uid: 411
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: -26.5,21.5
    parent: 30
    type: Transform
 - uid: 412
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: -30.5,11.5
    parent: 30
@@ -33164,7 +33164,7 @@ entities:
  - canCollide: False
    type: Physics
 - uid: 1462
-  type: APCBasic
+  type: BaseAPC
  components:
  - rot: -1.5707963267948966 rad
    pos: -45.5,32.5
@@ -33700,20 +33700,20 @@ entities:
      cell_slot: !type:ContainerSlot {}
    type: ContainerContainer
 - uid: 1537
-  type: APCBasic
+  type: BaseAPC
  components:
  - rot: -1.5707963267948966 rad
    pos: -48.5,20.5
    parent: 30
    type: Transform
 - uid: 1538
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: -46.5,-0.5
    parent: 30
    type: Transform
 - uid: 1539
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: -37.5,16.5
    parent: 30
@@ -34496,7 +34496,7 @@ entities:
      ItemCabinet: !type:ContainerSlot {}
    type: ContainerContainer
 - uid: 1653
-  type: APCBasic
+  type: BaseAPC
  components:
  - rot: -1.5707963267948966 rad
    pos: -33.5,32.5
@@ -53408,7 +53408,7 @@ entities:
    - machine_board
    type: Construction
 - uid: 3519
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: -47.5,59.5
    parent: 30
@@ -53430,7 +53430,7 @@ entities:
      paper_label: !type:ContainerSlot {}
    type: ContainerContainer
 - uid: 3521
-  type: APCBasic
+  type: BaseAPC
  components:
  - rot: -1.5707963267948966 rad
    pos: -45.5,49.5
@@ -53439,7 +53439,7 @@ entities:
  - startingCharge: 12000
    type: Battery
 - uid: 3522
-  type: APCBasic
+  type: BaseAPC
  components:
  - rot: 1.5707963267948966 rad
    pos: -36.5,53.5
@@ -54014,7 +54014,7 @@ entities:
    parent: 30
    type: Transform
 - uid: 3617
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: -50.5,11.5
    parent: 30
@@ -64239,7 +64239,7 @@ entities:
        ents: []
    type: ContainerContainer
 - uid: 5051
-  type: APCBasic
+  type: BaseAPC
  components:
  - rot: 1.5707963267948966 rad
    pos: -23.5,40.5
@@ -67565,7 +67565,7 @@ entities:
    parent: 30
    type: Transform
 - uid: 5561
-  type: APCBasic
+  type: BaseAPC
  components:
  - rot: 1.5707963267948966 rad
    pos: 8.5,42.5
@@ -69961,14 +69961,14 @@ entities:
      Toggle: []
    type: SignalReceiver
 - uid: 5861
-  type: APCBasic
+  type: BaseAPC
  components:
  - rot: 1.5707963267948966 rad
    pos: -13.5,45.5
    parent: 30
    type: Transform
 - uid: 5862
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: 4.5,35.5
    parent: 30
@@ -75788,7 +75788,7 @@ entities:
    parent: 30
    type: Transform
 - uid: 6605
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: 19.5,28.5
    parent: 30
@@ -80805,7 +80805,7 @@ entities:
        ents: []
    type: ContainerContainer
 - uid: 7285
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: -27.5,-17.5
    parent: 30
@@ -84637,20 +84637,20 @@ entities:
  - canCollide: False
    type: Physics
 - uid: 7610
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: -15.5,-3.5
    parent: 30
    type: Transform
 - uid: 7611
-  type: APCBasic
+  type: BaseAPC
  components:
  - rot: 1.5707963267948966 rad
    pos: -20.5,-20.5
    parent: 30
    type: Transform
 - uid: 7612
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: -35.5,-3.5
    parent: 30
@@ -84666,7 +84666,7 @@ entities:
    - machine_board
    type: Construction
 - uid: 7614
-  type: APCBasic
+  type: BaseAPC
  components:
  - rot: 3.141592653589793 rad
    pos: -0.5,-0.5
@@ -90003,7 +90003,7 @@ entities:
    parent: 30
    type: Transform
 - uid: 8363
-  type: APCBasic
+  type: BaseAPC
  components:
  - rot: 1.5707963267948966 rad
    pos: 10.5,-16.5
@@ -96565,7 +96565,7 @@ entities:
  - canCollide: False
    type: Physics
 - uid: 9130
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: 9.5,-30.5
    parent: 30
@@ -96573,7 +96573,7 @@ entities:
  - startingCharge: 12000
    type: Battery
 - uid: 9131
-  type: APCBasic
+  type: BaseAPC
  components:
  - rot: 3.141592653589793 rad
    pos: 21.5,-12.5
@@ -97632,7 +97632,7 @@ entities:
    parent: 30
    type: Transform
 - uid: 9272
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: 0.5,-31.5
    parent: 30
@@ -99701,7 +99701,7 @@ entities:
    parent: 30
    type: Transform
 - uid: 9573
-  type: APCBasic
+  type: BaseAPC
  components:
  - rot: 1.5707963267948966 rad
    pos: -20.5,-38.5
@@ -117476,13 +117476,13 @@ entities:
  - canCollide: False
    type: Physics
 - uid: 11807
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: 22.5,-0.5
    parent: 30
    type: Transform
 - uid: 11808
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: 33.5,-0.5
    parent: 30
@@ -129206,19 +129206,19 @@ entities:
    parent: 30
    type: Transform
 - uid: 13096
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: 32.5,16.5
    parent: 30
    type: Transform
 - uid: 13097
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: 24.5,9.5
    parent: 30
    type: Transform
 - uid: 13098
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: 20.5,24.5
    parent: 30
@@ -131630,7 +131630,7 @@ entities:
    parent: 30
    type: Transform
 - uid: 13444
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: 15.5,55.5
    parent: 30
@@ -143635,7 +143635,7 @@ entities:
        uid: 11673
    type: SignalReceiver
 - uid: 14541
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: 48.5,20.5
    parent: 30
@@ -144763,7 +144763,7 @@ entities:
    parent: 30
    type: Transform
 - uid: 14729
-  type: APCBasic
+  type: BaseAPC
  components:
  - rot: 1.5707963267948966 rad
    pos: 32.5,44.5
@@ -166650,26 +166650,26 @@ entities:
    parent: 30
    type: Transform
 - uid: 17938
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: -59.5,-25.5
    parent: 30
    type: Transform
 - uid: 17939
-  type: APCBasic
+  type: BaseAPC
  components:
  - rot: -1.5707963267948966 rad
    pos: -43.5,-22.5
    parent: 30
    type: Transform
 - uid: 17940
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: -65.5,-47.5
    parent: 30
    type: Transform
 - uid: 17941
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: -76.5,-42.5
    parent: 30
@@ -168885,7 +168885,7 @@ entities:
    parent: 30
    type: Transform
 - uid: 18298
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: -79.5,-58.5
    parent: 30
@@ -183123,7 +183123,7 @@ entities:
    parent: 30
    type: Transform
 - uid: 20045
-  type: APCBasic
+  type: BaseAPC
  components:
  - pos: 0.5,85.5
    parent: 30