From 307762cc615c7a41bac2b36759535d56fd3a53d2 Mon Sep 17 00:00:00 2001 From: AF-Buyrcsp2 Date: Mon, 22 Jul 2024 10:11:30 +0800 Subject: [PATCH 001/123] base (#1718) --- Resources/Maps/_NF/Shuttles/camper.yml | 406 +++++++++++-------------- 1 file changed, 183 insertions(+), 223 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/camper.yml b/Resources/Maps/_NF/Shuttles/camper.yml index a35206de700..d18620fb124 100644 --- a/Resources/Maps/_NF/Shuttles/camper.yml +++ b/Resources/Maps/_NF/Shuttles/camper.yml @@ -173,15 +173,14 @@ entities: -1,0: 0: 20431 0,1: - 1: 4354 + 1: 258 -1,1: 0: 238 - 1: 4352 + 1: 256 -2,1: 1: 8 -1,-1: - 0: 32582 - 2: 8 + 0: 32590 0,-2: 1: 272 -1,-2: @@ -223,21 +222,6 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 21.6852 - - 81.57766 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -323,47 +307,47 @@ entities: - type: Transform pos: 0.5,-5.5 parent: 1 - - uid: 14 + - uid: 13 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,6.5 parent: 1 - - uid: 15 + - uid: 14 components: - type: Transform pos: 0.5,-6.5 parent: 1 - - uid: 17 + - uid: 15 components: - type: Transform pos: 0.5,6.5 parent: 1 - - uid: 18 + - uid: 16 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-6.5 parent: 1 - - uid: 19 + - uid: 17 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,-3.5 parent: 1 - - uid: 20 + - uid: 18 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-6.5 parent: 1 - - uid: 21 + - uid: 19 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-3.5 parent: 1 - - uid: 22 + - uid: 20 components: - type: Transform rot: 3.141592653589793 rad @@ -371,24 +355,14 @@ entities: parent: 1 - proto: Bed entities: - - uid: 23 - components: - - type: Transform - pos: -1.5,-4.5 - parent: 1 - - uid: 24 - components: - - type: Transform - pos: -1.5,-4.5 - parent: 1 - - uid: 25 + - uid: 21 components: - type: Transform pos: -1.5,-4.5 parent: 1 - proto: BedsheetBlue entities: - - uid: 26 + - uid: 22 components: - type: Transform rot: 3.141592653589793 rad @@ -396,162 +370,162 @@ entities: parent: 1 - proto: BoxPaper entities: - - uid: 27 + - uid: 23 components: - type: Transform pos: -1.4186039,5.4487333 parent: 1 - proto: Bucket entities: - - uid: 28 + - uid: 24 components: - type: Transform pos: -3.1369505,2.8069963 parent: 1 - proto: CableApcExtension entities: - - uid: 29 + - uid: 25 components: - type: Transform pos: -1.5,-0.5 parent: 1 - - uid: 30 + - uid: 26 components: - type: Transform pos: -1.5,4.5 parent: 1 - - uid: 31 + - uid: 27 components: - type: Transform pos: -1.5,3.5 parent: 1 - - uid: 32 + - uid: 28 components: - type: Transform pos: -1.5,2.5 parent: 1 - - uid: 33 + - uid: 29 components: - type: Transform pos: -1.5,-0.5 parent: 1 - - uid: 34 + - uid: 30 components: - type: Transform pos: -1.5,0.5 parent: 1 - - uid: 35 + - uid: 31 components: - type: Transform pos: -1.5,1.5 parent: 1 - - uid: 36 + - uid: 32 components: - type: Transform pos: -1.5,-2.5 parent: 1 - - uid: 37 + - uid: 33 components: - type: Transform pos: -1.5,-3.5 parent: 1 - - uid: 38 + - uid: 34 components: - type: Transform pos: -1.5,-1.5 parent: 1 - - uid: 39 + - uid: 35 components: - type: Transform pos: -2.5,1.5 parent: 1 - - uid: 40 + - uid: 36 components: - type: Transform pos: -1.5,-4.5 parent: 1 - - uid: 41 + - uid: 37 components: - type: Transform pos: -1.5,5.5 parent: 1 - proto: CableHV entities: - - uid: 42 + - uid: 38 components: - type: Transform pos: 0.5,-0.5 parent: 1 - - uid: 43 + - uid: 39 components: - type: Transform pos: 0.5,0.5 parent: 1 - proto: CableMV entities: - - uid: 44 + - uid: 40 components: - type: Transform pos: -0.5,1.5 parent: 1 - - uid: 45 + - uid: 41 components: - type: Transform pos: 0.5,-0.5 parent: 1 - - uid: 46 + - uid: 42 components: - type: Transform pos: 0.5,0.5 parent: 1 - - uid: 47 + - uid: 43 components: - type: Transform pos: -0.5,0.5 parent: 1 - - uid: 48 + - uid: 44 components: - type: Transform pos: -2.5,1.5 parent: 1 - - uid: 49 + - uid: 45 components: - type: Transform pos: -1.5,1.5 parent: 1 - proto: CarpetBlue entities: - - uid: 50 + - uid: 46 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,-3.5 parent: 1 - - uid: 51 + - uid: 47 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,-4.5 parent: 1 - - uid: 52 + - uid: 48 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-4.5 parent: 1 - - uid: 53 + - uid: 49 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-3.5 parent: 1 - - uid: 54 + - uid: 50 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-4.5 parent: 1 - - uid: 55 + - uid: 51 components: - type: Transform rot: -1.5707963267948966 rad @@ -559,27 +533,27 @@ entities: parent: 1 - proto: Catwalk entities: - - uid: 56 + - uid: 52 components: - type: Transform pos: 0.5,2.5 parent: 1 - - uid: 57 + - uid: 53 components: - type: Transform pos: -0.5,0.5 parent: 1 - - uid: 58 + - uid: 54 components: - type: Transform pos: 0.5,0.5 parent: 1 - - uid: 59 + - uid: 55 components: - type: Transform pos: 0.5,1.5 parent: 1 - - uid: 60 + - uid: 56 components: - type: Transform rot: 3.141592653589793 rad @@ -587,7 +561,7 @@ entities: parent: 1 - proto: ChairFolding entities: - - uid: 61 + - uid: 57 components: - type: Transform rot: 3.141592653589793 rad @@ -595,13 +569,13 @@ entities: parent: 1 - proto: ChairPilotSeat entities: - - uid: 62 + - uid: 58 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,4.5 parent: 1 - - uid: 63 + - uid: 59 components: - type: Transform rot: 3.141592653589793 rad @@ -609,7 +583,7 @@ entities: parent: 1 - proto: ClosetWallMaintenanceFilledRandom entities: - - uid: 64 + - uid: 60 components: - type: Transform rot: -1.5707963267948966 rad @@ -617,28 +591,28 @@ entities: parent: 1 - proto: ComfyChair entities: - - uid: 65 + - uid: 61 components: - type: Transform pos: -2.5,-3.5 parent: 1 - proto: ComputerTabletopShuttle entities: - - uid: 66 + - uid: 62 components: - type: Transform pos: -2.5,5.5 parent: 1 - proto: ComputerTabletopStationRecords entities: - - uid: 67 + - uid: 63 components: - type: Transform pos: -0.5,5.5 parent: 1 - proto: ComputerTelevision entities: - - uid: 68 + - uid: 64 components: - type: Transform rot: 3.141592653589793 rad @@ -646,14 +620,14 @@ entities: parent: 1 - proto: CrateFreezer entities: - - uid: 69 + - uid: 65 components: - type: Transform pos: -3.5,0.5 parent: 1 - proto: CurtainsBlackOpen entities: - - uid: 70 + - uid: 66 components: - type: Transform rot: 3.141592653589793 rad @@ -661,7 +635,7 @@ entities: parent: 1 - proto: CurtainsBlueOpen entities: - - uid: 71 + - uid: 67 components: - type: Transform rot: 3.141592653589793 rad @@ -669,7 +643,7 @@ entities: parent: 1 - proto: CurtainsWhiteOpen entities: - - uid: 72 + - uid: 68 components: - type: Transform rot: -1.5707963267948966 rad @@ -677,7 +651,7 @@ entities: parent: 1 - proto: DefibrillatorCabinetFilled entities: - - uid: 73 + - uid: 69 components: - type: Transform rot: 1.5707963267948966 rad @@ -685,27 +659,27 @@ entities: parent: 1 - proto: DresserFilled entities: - - uid: 74 + - uid: 70 components: - type: Transform pos: -0.5,-4.5 parent: 1 - proto: DrinkBeerBottleFull entities: - - uid: 75 + - uid: 71 components: - type: Transform pos: -1.9612398,5.593486 parent: 1 - proto: DrinkGlass entities: - - uid: 76 + - uid: 72 components: - type: Transform rot: 3.141592653589793 rad pos: -3.8106375,-0.12930775 parent: 1 - - uid: 77 + - uid: 73 components: - type: Transform rot: 3.141592653589793 rad @@ -713,7 +687,7 @@ entities: parent: 1 - proto: EmergencyLight entities: - - uid: 16 + - uid: 74 components: - type: Transform rot: 1.5707963267948966 rad @@ -721,7 +695,7 @@ entities: parent: 1 - proto: ExtinguisherCabinetFilled entities: - - uid: 85 + - uid: 75 components: - type: Transform rot: 3.141592653589793 rad @@ -729,14 +703,14 @@ entities: parent: 1 - proto: FaxMachineShip entities: - - uid: 86 + - uid: 76 components: - type: Transform pos: -1.5,5.5 parent: 1 - proto: GasPassiveVent entities: - - uid: 87 + - uid: 77 components: - type: Transform rot: -1.5707963267948966 rad @@ -746,7 +720,7 @@ entities: color: '#CC1111FF' - proto: GasPipeBend entities: - - uid: 88 + - uid: 78 components: - type: Transform rot: 3.141592653589793 rad @@ -754,7 +728,7 @@ entities: parent: 1 - type: AtmosPipeColor color: '#CC1111FF' - - uid: 89 + - uid: 79 components: - type: Transform rot: 3.141592653589793 rad @@ -762,14 +736,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#CC1111FF' - - uid: 90 + - uid: 80 components: - type: Transform pos: -1.5,-1.5 parent: 1 - type: AtmosPipeColor color: '#CC1111FF' - - uid: 91 + - uid: 81 components: - type: Transform rot: -1.5707963267948966 rad @@ -777,7 +751,7 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 92 + - uid: 82 components: - type: Transform rot: 3.141592653589793 rad @@ -787,14 +761,14 @@ entities: color: '#0055CCFF' - proto: GasPipeStraight entities: - - uid: 93 + - uid: 83 components: - type: Transform pos: -1.5,-2.5 parent: 1 - type: AtmosPipeColor color: '#CC1111FF' - - uid: 94 + - uid: 84 components: - type: Transform rot: -1.5707963267948966 rad @@ -802,7 +776,7 @@ entities: parent: 1 - type: AtmosPipeColor color: '#CC1111FF' - - uid: 95 + - uid: 85 components: - type: Transform rot: -1.5707963267948966 rad @@ -812,7 +786,7 @@ entities: color: '#CC1111FF' - proto: GasPort entities: - - uid: 96 + - uid: 86 components: - type: Transform pos: -0.5,2.5 @@ -821,7 +795,7 @@ entities: color: '#0055CCFF' - proto: GasPressurePumpOn entities: - - uid: 97 + - uid: 87 components: - type: Transform rot: 3.141592653589793 rad @@ -831,7 +805,7 @@ entities: color: '#0055CCFF' - proto: GasValve entities: - - uid: 78 + - uid: 88 components: - type: Transform pos: -2.5,-0.5 @@ -840,7 +814,7 @@ entities: color: '#CC1111FF' - proto: GasVentPump entities: - - uid: 99 + - uid: 89 components: - type: Transform pos: -1.5,3.5 @@ -849,7 +823,7 @@ entities: color: '#0055CCFF' - proto: GasVentScrubber entities: - - uid: 100 + - uid: 90 components: - type: Transform pos: -2.5,0.5 @@ -858,86 +832,86 @@ entities: color: '#CC1111FF' - proto: GravityGeneratorMini entities: - - uid: 101 + - uid: 91 components: - type: Transform pos: 0.5,2.5 parent: 1 - proto: Grille entities: - - uid: 102 + - uid: 92 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,1.5 parent: 1 - - uid: 103 + - uid: 93 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-0.5 parent: 1 - - uid: 104 + - uid: 94 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,-3.5 parent: 1 - - uid: 105 + - uid: 95 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,4.5 parent: 1 - - uid: 106 + - uid: 96 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,-4.5 parent: 1 - - uid: 107 + - uid: 97 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-3.5 parent: 1 - - uid: 108 + - uid: 98 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,4.5 parent: 1 - - uid: 109 + - uid: 99 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,5.5 parent: 1 - - uid: 110 + - uid: 100 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,6.5 parent: 1 - - uid: 111 + - uid: 101 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,6.5 parent: 1 - - uid: 112 + - uid: 102 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,6.5 parent: 1 - - uid: 113 + - uid: 103 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,5.5 parent: 1 - - uid: 114 + - uid: 104 components: - type: Transform rot: 1.5707963267948966 rad @@ -945,14 +919,14 @@ entities: parent: 1 - proto: KitchenKnife entities: - - uid: 115 + - uid: 105 components: - type: Transform pos: -3.4543009,-0.5313598 parent: 1 - proto: LockerWoodenGeneric entities: - - uid: 117 + - uid: 106 components: - type: Transform pos: -0.5,-3.5 @@ -977,14 +951,14 @@ entities: - 0 - proto: Plunger entities: - - uid: 118 + - uid: 107 components: - type: Transform pos: -3.9147282,2.3184562 parent: 1 - proto: PortableGeneratorPacmanShuttle entities: - - uid: 119 + - uid: 108 components: - type: Transform pos: 0.5,0.5 @@ -995,7 +969,7 @@ entities: bodyType: Static - proto: PosterContrabandEAT entities: - - uid: 122 + - uid: 109 components: - type: Transform rot: 1.5707963267948966 rad @@ -1003,14 +977,14 @@ entities: parent: 1 - proto: PosterContrabandTools entities: - - uid: 123 + - uid: 110 components: - type: Transform pos: 0.5,3.5 parent: 1 - proto: PosterLegitEatMeat entities: - - uid: 124 + - uid: 111 components: - type: Transform rot: 1.5707963267948966 rad @@ -1018,7 +992,7 @@ entities: parent: 1 - proto: PosterLegitNoERP entities: - - uid: 125 + - uid: 112 components: - type: Transform rot: 3.141592653589793 rad @@ -1026,13 +1000,13 @@ entities: parent: 1 - proto: PoweredLightPostSmallRed entities: - - uid: 128 + - uid: 113 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,-6.5 parent: 1 - - uid: 129 + - uid: 114 components: - type: Transform rot: 1.5707963267948966 rad @@ -1040,36 +1014,36 @@ entities: parent: 1 - proto: PoweredSmallLight entities: - - uid: 13 + - uid: 115 components: - type: Transform pos: -0.5,-3.5 parent: 1 - - uid: 80 + - uid: 116 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,4.5 parent: 1 - - uid: 82 + - uid: 117 components: - type: Transform pos: -3.5,0.5 parent: 1 - - uid: 130 + - uid: 118 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,2.5 parent: 1 - - uid: 131 + - uid: 119 components: - type: Transform pos: 0.5,-1.5 parent: 1 - proto: Rack entities: - - uid: 136 + - uid: 120 components: - type: Transform rot: -1.5707963267948966 rad @@ -1077,26 +1051,26 @@ entities: parent: 1 - proto: RandomPosterAny entities: - - uid: 79 + - uid: 121 components: - type: Transform pos: -0.5,-2.5 parent: 1 - - uid: 83 + - uid: 122 components: - type: Transform pos: -0.5,-5.5 parent: 1 - proto: RollingPin entities: - - uid: 137 + - uid: 123 components: - type: Transform pos: -3.562829,-0.3866073 parent: 1 - proto: SheetPlasma entities: - - uid: 138 + - uid: 124 components: - type: Transform rot: 3.141592653589793 rad @@ -1104,86 +1078,86 @@ entities: parent: 1 - proto: ShipyardCamperInfo entities: - - uid: 211 + - uid: 125 components: - type: Transform pos: 0.43701267,0.44958544 parent: 1 - proto: ShuttleWindow entities: - - uid: 139 + - uid: 126 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,1.5 parent: 1 - - uid: 140 + - uid: 127 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-0.5 parent: 1 - - uid: 141 + - uid: 128 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,-3.5 parent: 1 - - uid: 142 + - uid: 129 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,4.5 parent: 1 - - uid: 143 + - uid: 130 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,5.5 parent: 1 - - uid: 144 + - uid: 131 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-3.5 parent: 1 - - uid: 145 + - uid: 132 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,4.5 parent: 1 - - uid: 146 + - uid: 133 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-4.5 parent: 1 - - uid: 147 + - uid: 134 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,-4.5 parent: 1 - - uid: 148 + - uid: 135 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,6.5 parent: 1 - - uid: 149 + - uid: 136 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,6.5 parent: 1 - - uid: 150 + - uid: 137 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,6.5 parent: 1 - - uid: 151 + - uid: 138 components: - type: Transform rot: 1.5707963267948966 rad @@ -1191,7 +1165,7 @@ entities: parent: 1 - proto: SignFire entities: - - uid: 152 + - uid: 139 components: - type: Transform rot: -1.5707963267948966 rad @@ -1199,7 +1173,7 @@ entities: parent: 1 - proto: SignNosmoking entities: - - uid: 153 + - uid: 140 components: - type: Transform rot: -1.5707963267948966 rad @@ -1207,7 +1181,7 @@ entities: parent: 1 - proto: SignSpace entities: - - uid: 154 + - uid: 141 components: - type: Transform rot: 3.141592653589793 rad @@ -1215,78 +1189,64 @@ entities: parent: 1 - proto: Sink entities: - - uid: 155 + - uid: 142 components: - type: Transform pos: -2.5,0.5 parent: 1 - proto: SmallGyroscope entities: - - uid: 157 + - uid: 143 components: - type: Transform pos: 0.5,1.5 parent: 1 - - type: Thruster - originalPowerLoad: 200 - proto: SmallThruster entities: - - uid: 158 + - uid: 144 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,-3.5 parent: 1 - - type: Thruster - originalPowerLoad: 500 - - uid: 159 + - uid: 145 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-6.5 parent: 1 - - type: Thruster - originalPowerLoad: 500 - - uid: 160 + - uid: 146 components: - type: Transform pos: -4.5,4.5 parent: 1 - - type: Thruster - originalPowerLoad: 500 - - uid: 161 + - uid: 147 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-3.5 parent: 1 - - type: Thruster - originalPowerLoad: 500 - - uid: 162 + - uid: 148 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-6.5 parent: 1 - - type: Thruster - originalPowerLoad: 500 - - uid: 163 + - uid: 149 components: - type: Transform pos: 1.5,4.5 parent: 1 - - type: Thruster - originalPowerLoad: 500 - proto: Soap entities: - - uid: 164 + - uid: 150 components: - type: Transform pos: -3.5809164,2.197432 parent: 1 - proto: SpawnPointLatejoin entities: - - uid: 165 + - uid: 151 components: - type: Transform rot: 3.141592653589793 rad @@ -1294,7 +1254,7 @@ entities: parent: 1 - proto: SubstationWallBasic entities: - - uid: 166 + - uid: 152 components: - type: Transform rot: 3.141592653589793 rad @@ -1302,7 +1262,7 @@ entities: parent: 1 - proto: SuitStorageWallmountBasic entities: - - uid: 167 + - uid: 153 components: - type: Transform rot: -1.5707963267948966 rad @@ -1312,13 +1272,13 @@ entities: canCollide: False - proto: TableCounterMetal entities: - - uid: 168 + - uid: 154 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,-1.5 parent: 1 - - uid: 169 + - uid: 155 components: - type: Transform rot: -1.5707963267948966 rad @@ -1326,18 +1286,18 @@ entities: parent: 1 - proto: TableReinforced entities: - - uid: 170 + - uid: 156 components: - type: Transform pos: -2.5,5.5 parent: 1 - - uid: 171 + - uid: 157 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,5.5 parent: 1 - - uid: 172 + - uid: 158 components: - type: Transform rot: -1.5707963267948966 rad @@ -1345,7 +1305,7 @@ entities: parent: 1 - proto: ToiletEmpty entities: - - uid: 174 + - uid: 159 components: - type: Transform rot: 1.5707963267948966 rad @@ -1353,131 +1313,131 @@ entities: parent: 1 - proto: TrashBag entities: - - uid: 175 + - uid: 160 components: - type: Transform pos: -2.4956446,0.6085676 parent: 1 - proto: WallShuttle entities: - - uid: 176 + - uid: 161 components: - type: Transform pos: 1.5,0.5 parent: 1 - - uid: 177 + - uid: 162 components: - type: Transform pos: -4.5,1.5 parent: 1 - - uid: 178 + - uid: 163 components: - type: Transform pos: -4.5,3.5 parent: 1 - - uid: 179 + - uid: 164 components: - type: Transform pos: 1.5,2.5 parent: 1 - - uid: 180 + - uid: 165 components: - type: Transform pos: -4.5,-1.5 parent: 1 - - uid: 181 + - uid: 166 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,3.5 parent: 1 - - uid: 182 + - uid: 167 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,3.5 parent: 1 - - uid: 183 + - uid: 168 components: - type: Transform pos: -4.5,-2.5 parent: 1 - - uid: 184 + - uid: 169 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-2.5 parent: 1 - - uid: 185 + - uid: 170 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-5.5 parent: 1 - - uid: 186 + - uid: 171 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-5.5 parent: 1 - - uid: 187 + - uid: 172 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,-5.5 parent: 1 - - uid: 188 + - uid: 173 components: - type: Transform pos: -4.5,2.5 parent: 1 - - uid: 189 + - uid: 174 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,-2.5 parent: 1 - - uid: 190 + - uid: 175 components: - type: Transform pos: 1.5,-2.5 parent: 1 - - uid: 191 + - uid: 176 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,3.5 parent: 1 - - uid: 192 + - uid: 177 components: - type: Transform pos: -4.5,0.5 parent: 1 - - uid: 193 + - uid: 178 components: - type: Transform pos: 1.5,-0.5 parent: 1 - proto: WallShuttleDiagonal entities: - - uid: 194 + - uid: 179 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,-5.5 parent: 1 - - uid: 195 + - uid: 180 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,-5.5 parent: 1 - - uid: 196 + - uid: 181 components: - type: Transform pos: -3.5,6.5 parent: 1 - - uid: 197 + - uid: 182 components: - type: Transform rot: -1.5707963267948966 rad @@ -1485,63 +1445,63 @@ entities: parent: 1 - proto: WallShuttleInterior entities: - - uid: 198 + - uid: 183 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-0.5 parent: 1 - - uid: 199 + - uid: 184 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-0.5 parent: 1 - - uid: 200 + - uid: 185 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,1.5 parent: 1 - - uid: 201 + - uid: 186 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,1.5 parent: 1 - - uid: 202 + - uid: 187 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-2.5 parent: 1 - - uid: 203 + - uid: 188 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,3.5 parent: 1 - - uid: 204 + - uid: 189 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,3.5 parent: 1 - - uid: 205 + - uid: 190 components: - type: Transform pos: -2.5,-2.5 parent: 1 - proto: WarpPointShip entities: - - uid: 206 + - uid: 191 components: - type: Transform pos: -1.5,0.5 parent: 1 - proto: Wrench entities: - - uid: 81 + - uid: 192 components: - type: Transform pos: -0.5,0.5 From 4a655c32fd71c7704a9f26ca3d17580577fc0b10 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Mon, 22 Jul 2024 05:12:38 +0300 Subject: [PATCH 002/123] Prospector (Update) (#1714) --- Resources/Maps/_NF/Shuttles/prospector.yml | 1499 +++++++++-------- .../Prototypes/_NF/Shipyard/prospector.yml | 2 +- 2 files changed, 776 insertions(+), 725 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/prospector.yml b/Resources/Maps/_NF/Shuttles/prospector.yml index 357fb3144c3..bb8b71e1bd6 100644 --- a/Resources/Maps/_NF/Shuttles/prospector.yml +++ b/Resources/Maps/_NF/Shuttles/prospector.yml @@ -15,13 +15,14 @@ entities: - uid: 201 components: - type: MetaData - - pos: 0.13793182,0.67738855 + - type: Transform + pos: 0.13793182,0.67738855 parent: invalid - type: Transform - - chunks: + - type: MapGrid + chunks: -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAVQAAAAAAVQAAAAAAVQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAACcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAADVQAAAAADXQAAAAABVQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAADVQAAAAABXQAAAAABXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAAAVQAAAAADXQAAAAADXQAAAAAD + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAVQAAAAAAVQAAAAAAVQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAADVQAAAAADXQAAAAABVQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAADVQAAAAABXQAAAAABXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAAAVQAAAAADXQAAAAADXQAAAAAD version: 6 0,-1: ind: 0,-1 @@ -33,25 +34,25 @@ entities: version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAACVQAAAAABcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAACcgAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAHAAAAAABHAAAAAABHAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAHAAAAAADHAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAYQAAAAAAVQAAAAABcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAHAAAAAABHAAAAAABHAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAHAAAAAADHAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 - type: MapGrid - type: Broadphase - - bodyStatus: InAir + - type: Physics + bodyStatus: InAir angularDamping: 0.05 linearDamping: 0.05 fixedRotation: False bodyType: Dynamic - type: Physics - - fixtures: {} - type: Fixtures + - type: Fixtures + fixtures: {} - type: OccluderTree - type: Shuttle - type: GridPathfinding - - gravityShakeSound: !type:SoundPathSpecifier + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg - type: Gravity - - chunkCollection: + - type: DecalGrid + chunkCollection: version: 2 nodes: - node: @@ -61,7 +62,6 @@ entities: decals: 29: -3,-3 30: -4,-2 - 31: -4,0 - node: color: '#FFFFFFFF' id: Bot @@ -122,42 +122,56 @@ entities: 7: -1,-5 8: 0,-5 9: 1,-5 + - node: + color: '#96DAFFFF' + id: DeliveryGreyscale + decals: + 32: -4,0 + - node: + color: '#FF5C5CFF' + id: DeliveryGreyscale + decals: + 31: -6,0 + - node: + color: '#FFFFFFFF' + id: DeliveryGreyscale + decals: + 33: -3,-6 + 34: -2,-7 + 35: -1,-7 + 36: 0,-7 + 37: 1,-6 - node: angle: 4.71238898038469 rad color: '#FFFFFFFF' id: LoadingArea decals: 28: -2,-3 - type: DecalGrid - - version: 2 + - type: GridAtmosphere + version: 2 data: tiles: - -1,-1: - 0: 65535 - 0,-1: - 0: 4375 - 1: 26208 -2,-1: - 0: 61166 + 0: 60992 -2,-2: 1: 51200 + -2,0: + 0: 4 + 1: 35840 + -1,-1: + 0: 65522 -1,-2: 1: 1 - 0: 65534 + 0: 61120 + -1,0: + 0: 61091 0,-2: - 0: 30579 + 0: 13072 1: 4 + 0,-1: + 1: 26208 0,0: - 0: 30583 - 0,1: - 0: 7 - -2,0: - 0: 238 - 1: 35840 - -1,0: - 0: 65535 - -1,1: - 0: 15 + 0: 13104 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -175,7 +189,7 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True moles: - 0 - 0 @@ -190,1407 +204,1394 @@ entities: - 0 - 0 chunkSize: 4 - type: GridAtmosphere - type: GasTileOverlay - type: RadiationGridResistance - - id: Prospector - type: BecomesStation + - type: BecomesStation + id: Prospector - type: SpreaderGrid - proto: ActionToggleLight entities: - uid: 164 components: - - flags: InContainer - type: MetaData - - parent: 160 - type: Transform - - container: 160 - type: InstantAction + - type: Transform + parent: 160 + - type: InstantAction + container: 160 - proto: AirAlarm entities: - uid: 235 components: - - pos: 0.5,-3.5 + - type: Transform + pos: 0.5,-3.5 parent: 201 - type: Transform - - ShutdownSubscribers: + - type: DeviceList + devices: - 233 - type: DeviceNetwork - - devices: - - 233 - type: DeviceList - uid: 236 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -1.5,1.5 parent: 201 - type: Transform - - ShutdownSubscribers: - - 213 - - 227 - - 228 - - 215 - type: DeviceNetwork - - devices: + - type: DeviceList + devices: - 228 - 227 - 213 - 215 - type: DeviceList -- proto: AirCanister - entities: - - uid: 237 - components: - - anchored: True - pos: -5.5,-0.5 - parent: 201 - type: Transform - - bodyType: Static - type: Physics - proto: AirlockCargoGlass entities: - uid: 155 components: - - pos: -2.5,-3.5 + - type: Transform + pos: -2.5,-3.5 parent: 201 - type: Transform - proto: AirlockCommandGlass entities: - uid: 156 components: - - pos: -2.5,1.5 + - type: Transform + pos: -2.5,1.5 parent: 201 - type: Transform - proto: AirlockExternalGlass entities: - uid: 142 components: - - pos: -4.5,-1.5 + - type: Transform + pos: -4.5,-1.5 parent: 201 - type: Transform - - uid: 143 + - uid: 172 components: - - pos: -4.5,0.5 + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-0.5 parent: 201 - type: Transform - proto: AirlockGlassShuttle entities: - uid: 18 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: -6.5,-1.5 parent: 201 - type: Transform - - uid: 21 + - uid: 22 components: - - rot: -1.5707963267948966 rad - pos: -6.5,0.5 + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,-0.5 parent: 201 - type: Transform - proto: APCBasic entities: - uid: 96 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -2.5,-6.5 parent: 201 - type: Transform - proto: AppraisalTool entities: - uid: 196 components: - - pos: 1.3489224,-4.3157334 + - type: Transform + pos: 1.3489224,-4.3157334 parent: 201 - type: Transform - proto: AtmosDeviceFanTiny entities: - uid: 11 components: - - pos: 0.5,-2.5 + - type: Transform + pos: 0.5,-2.5 parent: 201 - type: Transform - uid: 12 components: - - pos: 0.5,-1.5 + - type: Transform + pos: 0.5,-1.5 parent: 201 - type: Transform - uid: 13 components: - - pos: 0.5,-0.5 + - type: Transform + pos: 0.5,-0.5 parent: 201 - type: Transform - - uid: 27 + - uid: 21 components: - - pos: -6.5,-1.5 + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-0.5 parent: 201 - type: Transform - - uid: 28 + - uid: 27 components: - - pos: -6.5,0.5 + - type: Transform + pos: -6.5,-1.5 parent: 201 - type: Transform - uid: 114 components: - - pos: -6.5,-2.5 + - type: Transform + pos: -6.5,-2.5 parent: 201 - type: Transform - proto: AtmosFixBlockerMarker entities: - uid: 149 components: - - pos: -5.5,-4.5 + - type: Transform + pos: -5.5,-4.5 parent: 201 - type: Transform - uid: 183 components: - - pos: -4.5,-4.5 + - type: Transform + pos: -4.5,-4.5 parent: 201 - type: Transform - uid: 184 components: - - pos: -4.5,-5.5 + - type: Transform + pos: -4.5,-5.5 parent: 201 - type: Transform - uid: 185 components: - - pos: -3.5,-7.5 + - type: Transform + pos: -3.5,-7.5 parent: 201 - type: Transform - uid: 186 components: - - pos: 2.5,-7.5 + - type: Transform + pos: 2.5,-7.5 parent: 201 - type: Transform - uid: 187 components: - - pos: 2.5,-2.5 + - type: Transform + pos: 2.5,-2.5 parent: 201 - type: Transform - uid: 188 components: - - pos: 2.5,-1.5 + - type: Transform + pos: 2.5,-1.5 parent: 201 - type: Transform - uid: 189 components: - - pos: 2.5,-0.5 + - type: Transform + pos: 2.5,-0.5 parent: 201 - type: Transform - uid: 190 components: - - pos: 1.5,-2.5 + - type: Transform + pos: 1.5,-2.5 parent: 201 - type: Transform - uid: 191 components: - - pos: 1.5,-1.5 + - type: Transform + pos: 1.5,-1.5 parent: 201 - type: Transform - uid: 192 components: - - pos: 1.5,-0.5 + - type: Transform + pos: 1.5,-0.5 parent: 201 - type: Transform - uid: 193 components: - - pos: -4.5,3.5 + - type: Transform + pos: -4.5,3.5 parent: 201 - type: Transform - uid: 194 components: - - pos: -4.5,2.5 + - type: Transform + pos: -4.5,2.5 parent: 201 - type: Transform - uid: 195 components: - - pos: -5.5,2.5 + - type: Transform + pos: -5.5,2.5 parent: 201 - type: Transform - proto: BlastDoor entities: - - uid: 9 - components: - - rot: 3.141592653589793 rad - pos: 0.5,-2.5 - parent: 201 - type: Transform - - links: - - 103 - type: DeviceLinkSink - - uid: 10 + - uid: 171 components: - - rot: 3.141592653589793 rad + - type: Transform pos: -4.5,-2.5 parent: 201 - type: Transform - - links: - - 83 - type: DeviceLinkSink - - uid: 25 + - type: DeviceLinkSink + links: + - 28 + - uid: 206 components: - - rot: 3.141592653589793 rad + - type: Transform pos: -6.5,-2.5 parent: 201 - type: Transform - - links: - - 83 - type: DeviceLinkSink - - uid: 171 + - type: DeviceLinkSink + links: + - 28 + - uid: 229 components: - - rot: 3.141592653589793 rad + - type: Transform pos: 0.5,-0.5 parent: 201 - type: Transform - - links: - - 103 - type: DeviceLinkSink - - uid: 172 + - type: DeviceLinkSink + links: + - 23 + - uid: 230 components: - - rot: 3.141592653589793 rad + - type: Transform pos: 0.5,-1.5 parent: 201 - type: Transform - - links: - - 103 - type: DeviceLinkSink + - type: DeviceLinkSink + links: + - 23 + - uid: 231 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 201 + - type: DeviceLinkSink + links: + - 23 +- proto: ButtonFrameCaution + entities: + - uid: 25 + components: + - type: Transform + pos: -1.5,0.5 + parent: 201 + - uid: 200 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-3.5 + parent: 201 - proto: CableApcExtension entities: - uid: 69 components: - - pos: -2.5,-4.5 + - type: Transform + pos: -2.5,-4.5 parent: 201 - type: Transform - uid: 92 components: - - pos: -2.5,-6.5 + - type: Transform + pos: -2.5,-6.5 parent: 201 - type: Transform - uid: 93 components: - - pos: -2.5,-5.5 + - type: Transform + pos: -2.5,-5.5 parent: 201 - type: Transform - uid: 94 components: - - pos: -2.5,-3.5 + - type: Transform + pos: -2.5,-3.5 parent: 201 - type: Transform - uid: 97 components: - - pos: -2.5,-2.5 + - type: Transform + pos: -2.5,-2.5 parent: 201 - type: Transform - uid: 98 components: - - pos: -2.5,-1.5 + - type: Transform + pos: -2.5,-1.5 parent: 201 - type: Transform - uid: 99 components: - - pos: -2.5,-0.5 + - type: Transform + pos: -2.5,-0.5 parent: 201 - type: Transform - uid: 100 components: - - pos: -2.5,0.5 + - type: Transform + pos: -2.5,0.5 parent: 201 - type: Transform - uid: 101 components: - - pos: -2.5,1.5 + - type: Transform + pos: -2.5,1.5 parent: 201 - type: Transform - uid: 102 components: - - pos: -2.5,2.5 + - type: Transform + pos: -2.5,2.5 parent: 201 - type: Transform - uid: 104 components: - - pos: -1.5,-1.5 + - type: Transform + pos: -1.5,-1.5 parent: 201 - type: Transform - uid: 105 components: - - pos: -0.5,-1.5 + - type: Transform + pos: -0.5,-1.5 parent: 201 - type: Transform - uid: 106 components: - - pos: -3.5,-1.5 + - type: Transform + pos: -3.5,-1.5 parent: 201 - type: Transform - uid: 107 components: - - pos: -4.5,-1.5 + - type: Transform + pos: -4.5,-1.5 parent: 201 - type: Transform - uid: 108 components: - - pos: 1.5,-5.5 + - type: Transform + pos: 1.5,-5.5 parent: 201 - type: Transform - uid: 109 components: - - pos: 0.5,-5.5 + - type: Transform + pos: 0.5,-5.5 parent: 201 - type: Transform - uid: 110 components: - - pos: -0.5,-5.5 + - type: Transform + pos: -0.5,-5.5 parent: 201 - type: Transform - uid: 111 components: - - pos: -1.5,-5.5 + - type: Transform + pos: -1.5,-5.5 parent: 201 - type: Transform - uid: 112 components: - - pos: -1.5,2.5 + - type: Transform + pos: -1.5,2.5 parent: 201 - type: Transform - uid: 113 components: - - pos: -0.5,2.5 + - type: Transform + pos: -0.5,2.5 parent: 201 - type: Transform - uid: 168 components: - - pos: -3.5,0.5 + - type: Transform + pos: -3.5,0.5 parent: 201 - type: Transform - uid: 210 components: - - pos: -4.5,0.5 + - type: Transform + pos: -4.5,0.5 + parent: 201 + - uid: 226 + components: + - type: Transform + pos: 0.5,-1.5 parent: 201 - type: Transform - proto: CableHV entities: - uid: 86 components: - - pos: 0.5,-6.5 + - type: Transform + pos: 0.5,-6.5 parent: 201 - type: Transform - uid: 88 components: - - pos: -0.5,-6.5 + - type: Transform + pos: -0.5,-6.5 parent: 201 - type: Transform - uid: 89 components: - - pos: -1.5,-6.5 + - type: Transform + pos: -1.5,-6.5 parent: 201 - type: Transform - proto: CableMV entities: - uid: 90 components: - - pos: -1.5,-6.5 + - type: Transform + pos: -1.5,-6.5 parent: 201 - type: Transform - uid: 91 components: - - pos: -2.5,-6.5 + - type: Transform + pos: -2.5,-6.5 parent: 201 - type: Transform - proto: CableTerminal entities: - uid: 87 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 0.5,-6.5 parent: 201 - type: Transform - proto: Catwalk entities: - - uid: 145 - components: - - rot: 1.5707963267948966 rad - pos: -1.5,-5.5 - parent: 201 - type: Transform - uid: 176 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -0.5,-5.5 parent: 201 - type: Transform - uid: 177 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: 0.5,-5.5 parent: 201 - type: Transform - proto: ChairFolding entities: - uid: 239 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: 0.5,-5.5 parent: 201 - type: Transform - proto: ChairPilotSeat entities: - uid: 157 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: 0.5,2.5 parent: 201 - type: Transform - proto: ClothingNeckCloakMiner entities: - uid: 148 components: - - pos: 1.5,1.5000001 + - type: Transform + pos: 1.5,1.5000001 parent: 201 - type: Transform - proto: ComputerTabletopShuttle entities: - uid: 220 components: - - pos: 0.5,3.5 + - type: Transform + pos: 0.5,3.5 parent: 201 - type: Transform - proto: ComputerTabletopStationRecords entities: - uid: 221 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 1.5,2.5 parent: 201 - type: Transform - proto: ConveyorBelt entities: - uid: 14 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -0.5,-2.5 parent: 201 - type: Transform - - links: + - type: DeviceLinkSink + links: - 169 - type: DeviceLinkSink - uid: 15 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: 0.5,-2.5 parent: 201 - type: Transform - - links: + - type: DeviceLinkSink + links: - 169 - type: DeviceLinkSink - uid: 16 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: 1.5,-2.5 parent: 201 - type: Transform - - links: + - type: DeviceLinkSink + links: - 169 - type: DeviceLinkSink - uid: 17 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -4.5,-2.5 parent: 201 - type: Transform - - links: + - type: DeviceLinkSink + links: - 179 - type: DeviceLinkSink - uid: 19 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -5.5,-2.5 parent: 201 - type: Transform - - links: + - type: DeviceLinkSink + links: - 179 - type: DeviceLinkSink - uid: 20 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -6.5,-2.5 parent: 201 - type: Transform - - links: + - type: DeviceLinkSink + links: - 179 - type: DeviceLinkSink - uid: 144 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -3.5,-2.5 parent: 201 - type: Transform - - links: + - type: DeviceLinkSink + links: - 179 - type: DeviceLinkSink - proto: DefibrillatorCabinetFilled entities: - - uid: 206 + - uid: 103 components: - - pos: -3.5,1.5 + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,2.5 parent: 201 - type: Transform - proto: EmergencyLight entities: - uid: 242 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -1.5,-6.5 parent: 201 - type: Transform - uid: 243 components: - - pos: -1.5,-0.5 + - type: Transform + pos: -1.5,-0.5 parent: 201 - type: Transform - uid: 244 components: - - pos: -0.5,3.5 + - type: Transform + pos: -0.5,3.5 parent: 201 - type: Transform - proto: ExtinguisherCabinetFilled entities: - uid: 207 components: - - pos: -1.5,-3.5 + - type: Transform + pos: -1.5,-3.5 parent: 201 - type: Transform - proto: FaxMachineShip entities: - uid: 161 components: - - pos: 1.5,3.5 + - type: Transform + pos: 1.5,3.5 parent: 201 - type: Transform - proto: FirelockGlass entities: - uid: 153 components: - - pos: -2.5,1.5 + - type: Transform + pos: -2.5,1.5 parent: 201 - type: Transform - uid: 154 components: - - pos: -2.5,-3.5 + - type: Transform + pos: -2.5,-3.5 + parent: 201 +- proto: GasMixerOnFlipped + entities: + - uid: 140 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-0.5 parent: 201 - type: Transform + - type: GasMixer + inletTwoConcentration: 0.22000003 + inletOneConcentration: 0.78 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPassiveVent entities: - uid: 123 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -4.5,-4.5 parent: 201 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#990000FF' - proto: GasPipeBend entities: - uid: 118 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -2.5,-5.5 parent: 201 - type: Transform - - color: '#0000CCFF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 122 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-0.5 + parent: 201 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 198 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -2.5,2.5 parent: 201 - type: Transform - - color: '#0000CCFF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPipeFourway entities: - uid: 211 components: - - pos: -2.5,-0.5 + - type: Transform + pos: -2.5,-0.5 parent: 201 - type: Transform - - color: '#0000CCFF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPipeStraight entities: - uid: 119 components: - - pos: -2.5,-2.5 + - type: Transform + pos: -2.5,-2.5 parent: 201 - type: Transform - - color: '#0000CCFF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 121 components: - - pos: -2.5,-4.5 + - type: Transform + pos: -2.5,-4.5 parent: 201 - type: Transform - - color: '#0000CCFF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 124 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -3.5,-4.5 parent: 201 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#990000FF' - uid: 125 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -1.5,-4.5 parent: 201 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#990000FF' - uid: 126 components: - - pos: -2.5,-3.5 + - type: Transform + pos: -2.5,-3.5 parent: 201 - type: Transform - - color: '#0000CCFF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 178 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -2.5,1.5 parent: 201 - type: Transform - - color: '#0000CCFF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 203 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -4.5,-0.5 parent: 201 - type: Transform - - color: '#0000CCFF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 212 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -2.5,0.5 parent: 201 - type: Transform - - color: '#0000CCFF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 217 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -0.5,-0.5 parent: 201 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#990000FF' - uid: 218 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -0.5,0.5 parent: 201 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#990000FF' - uid: 219 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -2.5,-1.5 parent: 201 - type: Transform - - color: '#0000CCFF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 222 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -0.5,-3.5 parent: 201 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#990000FF' - uid: 223 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -0.5,1.5 parent: 201 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#990000FF' - uid: 224 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -0.5,-2.5 parent: 201 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#990000FF' - uid: 225 components: - - rot: 3.141592653589793 rad + - type: Transform + anchored: False + rot: 3.141592653589793 rad pos: -0.5,-3.5 parent: 201 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#990000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - proto: GasPipeTJunction entities: - uid: 117 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -0.5,-4.5 parent: 201 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#990000FF' - uid: 216 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: -0.5,-1.5 parent: 201 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#990000FF' - proto: GasPort entities: - - uid: 200 + - uid: 9 components: - - rot: 1.5707963267948966 rad - pos: -5.5,-0.5 + - type: Transform + pos: -5.5,0.5 parent: 201 - type: Transform - - color: '#0000CCFF' - type: AtmosPipeColor -- proto: GasPressurePump - entities: - - uid: 120 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 166 components: - - rot: 1.5707963267948966 rad - pos: -3.5,-0.5 + - type: Transform + pos: -3.5,0.5 parent: 201 - type: Transform - - color: '#0000CCFF' - type: AtmosPipeColor - - uid: 122 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPressurePumpOnMax + entities: + - uid: 141 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: -2.5,-4.5 parent: 201 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#990000FF' - proto: GasVentPump entities: - uid: 213 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: -1.5,2.5 parent: 201 - type: Transform - - ShutdownSubscribers: - - 236 - type: DeviceNetwork - - color: '#0000CCFF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 214 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: -1.5,-5.5 parent: 201 - type: Transform - - color: '#0000CCFF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 215 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: -1.5,-0.5 parent: 201 - type: Transform - - ShutdownSubscribers: - - 236 - type: DeviceNetwork - - color: '#0000CCFF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasVentScrubber entities: - uid: 227 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -1.5,-1.5 parent: 201 - type: Transform - - ShutdownSubscribers: - - 236 - type: DeviceNetwork - - color: '#990000FF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#990000FF' - uid: 228 components: - - pos: -0.5,2.5 + - type: Transform + pos: -0.5,2.5 parent: 201 - type: Transform - - ShutdownSubscribers: - - 236 - type: DeviceNetwork - - color: '#990000FF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#990000FF' - uid: 233 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 0.5,-4.5 parent: 201 - type: Transform - - ShutdownSubscribers: - - 235 - type: DeviceNetwork - - color: '#990000FF' - type: AtmosPipeColor + - type: AtmosPipeColor + color: '#990000FF' - proto: GravityGeneratorMini entities: - uid: 174 components: - - pos: 1.5,-5.5 + - type: Transform + pos: 1.5,-5.5 parent: 201 - type: Transform - proto: Grille entities: - uid: 2 components: - - pos: 1.5,0.5 + - type: Transform + pos: 1.5,0.5 parent: 201 - type: Transform - uid: 5 components: - - pos: -0.5,0.5 + - type: Transform + pos: -0.5,0.5 parent: 201 - type: Transform - uid: 6 components: - - pos: 2.5,1.5 + - type: Transform + pos: 2.5,1.5 parent: 201 - type: Transform - uid: 7 components: - - pos: 2.5,2.5 - parent: 201 - type: Transform - - uid: 23 - components: - - rot: -1.5707963267948966 rad - pos: -6.5,-0.5 + - type: Transform + pos: 2.5,2.5 parent: 201 - type: Transform - uid: 30 components: - - pos: -5.5,1.5 + - type: Transform + pos: -5.5,1.5 parent: 201 - type: Transform - uid: 35 components: - - pos: -3.5,3.5 + - type: Transform + pos: -3.5,3.5 parent: 201 - type: Transform - uid: 36 components: - - pos: -2.5,4.5 + - type: Transform + pos: -2.5,4.5 parent: 201 - type: Transform - uid: 37 components: - - pos: -1.5,4.5 + - type: Transform + pos: -1.5,4.5 parent: 201 - type: Transform - uid: 38 components: - - pos: 0.5,4.5 + - type: Transform + pos: 0.5,4.5 parent: 201 - type: Transform - uid: 39 components: - - pos: 1.5,4.5 + - type: Transform + pos: 1.5,4.5 parent: 201 - type: Transform - uid: 40 components: - - pos: 2.5,3.5 + - type: Transform + pos: 2.5,3.5 parent: 201 - type: Transform - uid: 52 components: - - pos: -5.5,-3.5 + - type: Transform + pos: -5.5,-3.5 parent: 201 - type: Transform - uid: 59 components: - - pos: -3.5,-4.5 + - type: Transform + pos: -3.5,-4.5 parent: 201 - type: Transform - uid: 61 components: - - pos: 2.5,-5.5 + - type: Transform + pos: 2.5,-5.5 parent: 201 - type: Transform - uid: 66 components: - - pos: 2.5,-4.5 + - type: Transform + pos: 2.5,-4.5 parent: 201 - type: Transform - uid: 68 components: - - pos: 1.5,-3.5 + - type: Transform + pos: 1.5,-3.5 parent: 201 - type: Transform - uid: 70 components: - - pos: -3.5,-5.5 + - type: Transform + pos: -3.5,-5.5 parent: 201 - type: Transform - uid: 77 components: - - pos: -1.5,-7.5 + - type: Transform + pos: -1.5,-7.5 parent: 201 - type: Transform - uid: 78 components: - - pos: -0.5,-7.5 + - type: Transform + pos: -0.5,-7.5 parent: 201 - type: Transform - uid: 79 components: - - pos: 0.5,-7.5 + - type: Transform + pos: 0.5,-7.5 parent: 201 - type: Transform - uid: 132 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: -0.5,-3.5 parent: 201 - type: Transform - - uid: 140 - components: - - pos: -4.5,-0.5 - parent: 201 - type: Transform - proto: GroundTobacco entities: - uid: 181 components: - - pos: 1.6025628,-4.4469357 + - type: Transform + pos: 1.6025628,-4.4469357 parent: 201 - type: Transform - proto: Gyroscope entities: - uid: 139 components: - - pos: -4.5,2.5 + - type: Transform + pos: -4.5,2.5 parent: 201 - type: Transform - proto: IntercomSupply entities: - uid: 128 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 0.5,0.5 parent: 201 - type: Transform - uid: 129 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: 2.5,-3.5 parent: 201 - type: Transform - uid: 130 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: -6.5,1.5 parent: 201 - type: Transform - proto: LockerQuarterMasterFilled entities: - uid: 8 components: - - pos: -0.5,3.5 + - type: Transform + pos: -0.5,3.5 parent: 201 - type: Transform - proto: LockerSalvageSpecialistFilled entities: - uid: 159 components: - - pos: -0.5,-4.5 + - type: Transform + pos: -0.5,-4.5 parent: 201 - type: Transform - proto: Matchbox entities: - uid: 180 components: - - pos: 1.6783751,-4.3457556 + - type: Transform + pos: 1.6783751,-4.3457556 + parent: 201 +- proto: NitrogenCanister + entities: + - uid: 120 + components: + - type: Transform + anchored: True + pos: -5.5,0.5 parent: 201 - type: Transform + - type: Physics + bodyType: Static - proto: OreProcessor entities: - uid: 152 components: - - pos: -2.5,-5.5 + - type: Transform + pos: -2.5,-5.5 parent: 201 - type: Transform +- proto: OxygenCanister + entities: + - uid: 83 + components: + - type: Transform + anchored: True + pos: -3.5,0.5 + parent: 201 + - type: Physics + bodyType: Static - proto: Pickaxe entities: - uid: 182 components: - - rot: 1.5707963267948966 rad - pos: 2.3781967,-1.4218146 - parent: 201 - type: Transform + - type: Transform + parent: 232 + - type: Physics + canCollide: False - proto: PlasticFlapsAirtightClear entities: - uid: 26 components: - - pos: -6.5,-2.5 + - type: Transform + pos: -6.5,-2.5 parent: 201 - type: Transform - uid: 134 components: - - pos: -4.5,-2.5 + - type: Transform + pos: -4.5,-2.5 parent: 201 - type: Transform -- proto: PortableGeneratorPacman +- proto: PortableGeneratorPacmanShuttle entities: - - uid: 205 + - uid: 145 components: - - anchored: True + - type: Transform pos: 0.5,-6.5 parent: 201 - type: Transform - - storage: - Plasma: 1500 - type: MaterialStorage - - bodyType: Static - type: Physics - - type: InsertingMaterialStorage - + - type: FuelGenerator + on: False + - type: Physics + bodyType: Static - proto: PottedPlantRandomPlastic entities: - uid: 167 components: - - pos: -0.5,1.5 + - type: Transform + pos: -0.5,1.5 parent: 201 - type: Transform - proto: PowerCellRecharger entities: - uid: 197 components: - - pos: -2.5,3.5 + - type: Transform + pos: -2.5,3.5 parent: 201 - type: Transform - proto: Poweredlight entities: - uid: 163 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -1.5,2.5 parent: 201 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver + - type: ApcPowerReceiver + powerLoad: 0 - uid: 165 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -1.5,-2.5 parent: 201 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver + - type: ApcPowerReceiver + powerLoad: 0 - uid: 170 components: - - pos: -1.5,-4.5 + - type: Transform + pos: -1.5,-4.5 parent: 201 - type: Transform - proto: PoweredlightSodium entities: - uid: 162 components: - - pos: 2.5,-0.5 + - type: Transform + pos: 2.5,-0.5 parent: 201 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver + - type: ApcPowerReceiver + powerLoad: 0 - proto: Rack entities: - uid: 136 components: - - pos: 1.5,1.5 + - type: Transform + pos: 1.5,1.5 parent: 201 - type: Transform - proto: ReinforcedWindow entities: - uid: 4 components: - - pos: 1.5,0.5 - parent: 201 - type: Transform - - uid: 22 - components: - - rot: -1.5707963267948966 rad - pos: -6.5,-0.5 + - type: Transform + pos: 1.5,0.5 parent: 201 - type: Transform - uid: 31 components: - - pos: -5.5,1.5 + - type: Transform + pos: -5.5,1.5 parent: 201 - type: Transform - uid: 44 components: - - pos: 2.5,1.5 + - type: Transform + pos: 2.5,1.5 parent: 201 - type: Transform - uid: 45 components: - - pos: 2.5,2.5 + - type: Transform + pos: 2.5,2.5 parent: 201 - type: Transform - uid: 46 components: - - pos: 2.5,3.5 + - type: Transform + pos: 2.5,3.5 parent: 201 - type: Transform - uid: 47 components: - - pos: 1.5,4.5 + - type: Transform + pos: 1.5,4.5 parent: 201 - type: Transform - uid: 48 components: - - pos: 0.5,4.5 + - type: Transform + pos: 0.5,4.5 parent: 201 - type: Transform - uid: 49 components: - - pos: -1.5,4.5 + - type: Transform + pos: -1.5,4.5 parent: 201 - type: Transform - uid: 50 components: - - pos: -2.5,4.5 + - type: Transform + pos: -2.5,4.5 parent: 201 - type: Transform - uid: 51 components: - - pos: -3.5,3.5 + - type: Transform + pos: -3.5,3.5 parent: 201 - type: Transform - uid: 56 components: - - pos: -5.5,-3.5 + - type: Transform + pos: -5.5,-3.5 parent: 201 - type: Transform - uid: 60 components: - - pos: -3.5,-4.5 + - type: Transform + pos: -3.5,-4.5 parent: 201 - type: Transform - uid: 63 components: - - pos: 1.5,-3.5 + - type: Transform + pos: 1.5,-3.5 parent: 201 - type: Transform - uid: 64 components: - - pos: 2.5,-4.5 + - type: Transform + pos: 2.5,-4.5 parent: 201 - type: Transform - uid: 65 components: - - pos: -3.5,-5.5 + - type: Transform + pos: -3.5,-5.5 parent: 201 - type: Transform - uid: 71 components: - - pos: 2.5,-5.5 + - type: Transform + pos: 2.5,-5.5 parent: 201 - type: Transform - uid: 80 components: - - pos: 0.5,-7.5 + - type: Transform + pos: 0.5,-7.5 parent: 201 - type: Transform - uid: 81 components: - - pos: -0.5,-7.5 + - type: Transform + pos: -0.5,-7.5 parent: 201 - type: Transform - uid: 82 components: - - pos: -1.5,-7.5 - parent: 201 - type: Transform - - uid: 141 - components: - - pos: -4.5,-0.5 + - type: Transform + pos: -1.5,-7.5 parent: 201 - type: Transform - proto: SheetPlasma entities: - - uid: 166 + - uid: 173 components: - - pos: 0.4796412,-5.530752 + - type: Transform + pos: 0.51698303,-6.477809 parent: 201 - type: Transform - - count: 15 - type: Stack - - size: 15 - type: Item - proto: SignalButtonDirectional entities: - - uid: 83 + - uid: 23 components: - - rot: 3.141592653589793 rad - pos: -3.5,-3.5 + - type: Transform + pos: -1.5,0.5 parent: 201 - type: Transform - - linkedPorts: - 10: + - type: DeviceLinkSource + linkedPorts: + 229: - Pressed: Toggle - 25: + 230: - Pressed: Toggle - type: DeviceLinkSource - - uid: 103 + 231: + - Pressed: Toggle + - uid: 28 components: - - pos: -1.5,0.5 + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-3.5 parent: 201 - type: Transform - - linkedPorts: + - type: DeviceLinkSource + linkedPorts: 171: - Pressed: Toggle - 172: + 206: - Pressed: Toggle - 9: - - Pressed: Toggle - type: DeviceLinkSource - proto: SignMinerDock entities: - uid: 151 components: - - pos: -6.5,-3.5 + - type: Transform + pos: -6.5,-3.5 parent: 201 - type: Transform - uid: 208 components: - - pos: 2.5,4.5 + - type: Transform + pos: 2.5,4.5 parent: 201 - type: Transform - uid: 209 components: - - pos: 1.5,-7.5 + - type: Transform + pos: 1.5,-7.5 parent: 201 - type: Transform - proto: SMESBasic entities: - uid: 84 components: - - pos: -0.5,-6.5 + - type: Transform + pos: -0.5,-6.5 parent: 201 - type: Transform - proto: SmokingPipeFilledTobacco entities: - uid: 175 components: - - pos: 1.4256667,-4.3204603 + - type: Transform + pos: 1.4256667,-4.3204603 parent: 201 - type: Transform - proto: SpawnPointLatejoin entities: - uid: 238 components: - - pos: 0.5,-5.5 + - type: Transform + pos: 0.5,-5.5 parent: 201 - type: Transform - proto: SubstationBasic entities: - uid: 85 components: - - pos: -1.5,-6.5 + - type: Transform + pos: -1.5,-6.5 parent: 201 - type: Transform - proto: SuitStorageQuartermaster entities: - uid: 202 components: - - pos: -1.5,3.5 + - type: Transform + pos: -1.5,3.5 parent: 201 - type: Transform - proto: SuitStorageSalv entities: - uid: 146 components: - - pos: 0.5,-4.5 + - type: Transform + pos: 0.5,-4.5 parent: 201 - type: Transform - proto: Table entities: - uid: 147 components: - - pos: 1.5,-4.5 + - type: Transform + pos: 1.5,-4.5 parent: 201 - type: Transform - proto: TableReinforced entities: - uid: 115 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: 1.5,2.5 parent: 201 - type: Transform - uid: 116 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: 0.5,3.5 parent: 201 - type: Transform - uid: 127 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 1.5,3.5 parent: 201 - type: Transform - uid: 158 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -2.5,3.5 parent: 201 - type: Transform - proto: Thruster entities: - uid: 135 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -3.5,-7.5 parent: 201 - type: Transform - uid: 137 components: - - pos: -4.5,3.5 + - type: Transform + pos: -4.5,3.5 parent: 201 - type: Transform - uid: 138 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 2.5,-7.5 parent: 201 - type: Transform - uid: 150 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -5.5,2.5 parent: 201 - type: Transform - proto: TwoWayLever entities: - uid: 169 components: - - pos: 2.5,-0.5 + - type: Transform + pos: 2.5,-0.5 parent: 201 - type: Transform - - linkedPorts: + - type: DeviceLinkSource + linkedPorts: 16: - Left: Forward - Right: Reverse @@ -1603,13 +1604,13 @@ entities: - Left: Forward - Right: Reverse - Middle: Off - type: DeviceLinkSource - uid: 179 components: - - pos: -2.5,-0.5 + - type: Transform + pos: -2.5,-0.5 parent: 201 - type: Transform - - linkedPorts: + - type: DeviceLinkSource + linkedPorts: 144: - Left: Forward - Right: Reverse @@ -1626,185 +1627,235 @@ entities: - Left: Forward - Right: Reverse - Middle: Off - type: DeviceLinkSource - proto: WallReinforced entities: - uid: 1 components: - - pos: 2.5,0.5 + - type: Transform + pos: 2.5,0.5 parent: 201 - type: Transform - uid: 3 components: - - pos: 0.5,0.5 + - type: Transform + pos: 0.5,0.5 + parent: 201 + - uid: 10 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,0.5 parent: 201 - type: Transform - uid: 24 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: -6.5,-3.5 parent: 201 - type: Transform - uid: 29 components: - - pos: -6.5,1.5 + - type: Transform + pos: -6.5,1.5 parent: 201 - type: Transform - uid: 32 components: - - pos: -4.5,1.5 + - type: Transform + pos: -4.5,1.5 parent: 201 - type: Transform - uid: 33 components: - - pos: -3.5,1.5 + - type: Transform + pos: -3.5,1.5 parent: 201 - type: Transform - uid: 34 components: - - pos: -3.5,2.5 + - type: Transform + pos: -3.5,2.5 parent: 201 - type: Transform - uid: 41 components: - - pos: -3.5,4.5 + - type: Transform + pos: -3.5,4.5 parent: 201 - type: Transform - uid: 42 components: - - pos: -0.5,4.5 + - type: Transform + pos: -0.5,4.5 parent: 201 - type: Transform - uid: 43 components: - - pos: 2.5,4.5 + - type: Transform + pos: 2.5,4.5 parent: 201 - type: Transform - uid: 57 components: - - pos: -4.5,-3.5 + - type: Transform + pos: -4.5,-3.5 parent: 201 - type: Transform - uid: 58 components: - - pos: -3.5,-3.5 + - type: Transform + pos: -3.5,-3.5 parent: 201 - type: Transform - uid: 62 components: - - pos: -3.5,-6.5 + - type: Transform + pos: -3.5,-6.5 parent: 201 - type: Transform - uid: 67 components: - - pos: 2.5,-3.5 + - type: Transform + pos: 2.5,-3.5 parent: 201 - type: Transform - uid: 72 components: - - pos: 2.5,-6.5 + - type: Transform + pos: 2.5,-6.5 parent: 201 - type: Transform - uid: 73 components: - - pos: -2.5,-7.5 + - type: Transform + pos: -2.5,-7.5 parent: 201 - type: Transform - uid: 74 components: - - pos: 1.5,-7.5 + - type: Transform + pos: 1.5,-7.5 parent: 201 - type: Transform - uid: 75 components: - - pos: -2.5,-6.5 + - type: Transform + pos: -2.5,-6.5 parent: 201 - type: Transform - uid: 76 components: - - pos: 1.5,-6.5 + - type: Transform + pos: 1.5,-6.5 parent: 201 - type: Transform - uid: 95 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 0.5,-3.5 parent: 201 - type: Transform - proto: WallSolid entities: - uid: 53 components: - - pos: -1.5,1.5 + - type: Transform + pos: -1.5,1.5 parent: 201 - type: Transform - uid: 54 components: - - pos: -1.5,0.5 + - type: Transform + pos: -1.5,0.5 parent: 201 - type: Transform - uid: 131 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: -1.5,-3.5 parent: 201 - type: Transform + - uid: 143 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,0.5 + parent: 201 - proto: WarpPointShip entities: - uid: 199 components: - - pos: -2.5,-1.5 + - type: Transform + pos: -2.5,-1.5 parent: 201 - type: Transform - - location: Prospector - type: WarpPoint + - type: WarpPoint + location: Prospector - proto: WeaponCrusher entities: - uid: 204 components: - - pos: 1.4789997,1.534896 - parent: 201 - type: Transform + - type: Transform + parent: 232 + - type: Physics + canCollide: False - proto: WeaponCrusherDagger entities: - uid: 240 components: - - pos: 0.5,-5.5 + - type: Transform + pos: 0.5,-5.5 parent: 201 - type: Transform - proto: WeaponCrusherGlaive entities: - uid: 160 components: - - pos: 2.5188217,-1.4061896 - parent: 201 - type: Transform - - toggleActionEntity: 164 - type: UnpoweredFlashlight + - type: Transform + parent: 232 + - type: UnpoweredFlashlight + toggleActionEntity: 164 + - type: Physics + canCollide: False - type: ActionsContainer - - containers: + - type: ContainerContainer + containers: actions: !type:Container ents: - 164 - type: ContainerContainer +- proto: WeaponRackMeleeWallmountedSalvage + entities: + - uid: 232 + components: + - type: Transform + pos: 2.5,0.5 + parent: 201 + - type: ContainerContainer + containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: [] + weapon1_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: 182 + weapon2_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: 160 + weapon3_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: 204 + weapon4_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + weapon5_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + weapon6_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - proto: Window entities: - uid: 55 components: - - pos: -0.5,0.5 + - type: Transform + pos: -0.5,0.5 parent: 201 - type: Transform - uid: 133 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: -0.5,-3.5 parent: 201 - type: Transform - proto: Wrench entities: - uid: 241 components: - - pos: 0.4483912,-5.452627 + - type: Transform + pos: 0.4483912,-5.452627 parent: 201 - type: Transform ... diff --git a/Resources/Prototypes/_NF/Shipyard/prospector.yml b/Resources/Prototypes/_NF/Shipyard/prospector.yml index 43ff7c0c522..bea038ff219 100644 --- a/Resources/Prototypes/_NF/Shipyard/prospector.yml +++ b/Resources/Prototypes/_NF/Shipyard/prospector.yml @@ -12,7 +12,7 @@ id: Prospector name: NC Prospector description: A small mining vessel designed to assist salvage operations. - price: 23000 + price: 24500 category: Small group: Civilian shuttlePath: /Maps/_NF/Shuttles/prospector.yml From 81cbe397bb4ad292e7a2bf629b32a0534d24a376 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 22 Jul 2024 02:13:01 +0000 Subject: [PATCH 003/123] Automatic Changelog (#1714) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index bbdb6597ab2..5d04940ff7a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -5774,3 +5774,9 @@ Entries: message: Low pop of 20 and less might get free food from 2 new events now. id: 5131 time: '2024-07-20T16:55:16.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Tweak + message: Updated Prospector. Exterior light now works. + id: 5132 + time: '2024-07-22T02:12:38.0000000+00:00' From 314b7e5f02a349f68917f6e11bcf9c97d06f84a8 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Mon, 22 Jul 2024 05:14:05 +0300 Subject: [PATCH 004/123] Investigator (Update) (#1671) * Investigator (Update) * changed consoles, removed shutter * Update Resources/ServerInfo/_NF/Guidebook/Shipyard/Investigator.xml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --------- Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- .../Locale/en-US/_NF/guidebook/guides.ftl | 1 + Resources/Maps/_NF/Shuttles/investigator.yml | 2405 +++++++++-------- .../Prototypes/_NF/Guidebook/shipyard.yml | 6 + .../Prototypes/_NF/Guidebook/shuttle_maps.yml | 12 + .../Prototypes/_NF/Shipyard/investigator.yml | 16 +- .../_NF/Guidebook/Shipyard/Investigator.xml | 107 + .../shuttle_maps/128x96.rsi/investigator.png | Bin 0 -> 1737 bytes .../shuttle_maps/128x96.rsi/meta.json | 5 +- 8 files changed, 1413 insertions(+), 1139 deletions(-) create mode 100644 Resources/ServerInfo/_NF/Guidebook/Shipyard/Investigator.xml create mode 100644 Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/investigator.png diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl index cf31c535a43..d50bf918ab1 100644 --- a/Resources/Locale/en-US/_NF/guidebook/guides.ftl +++ b/Resources/Locale/en-US/_NF/guidebook/guides.ftl @@ -38,6 +38,7 @@ guide-entry-shipyard-gasbender = Gasbender guide-entry-shipyard-gourd = Gourd guide-entry-shipyard-hammer = Hammer guide-entry-shipyard-harbormaster = Harbormaster +guide-entry-shipyard-investigator = Investigator guide-entry-shipyard-kestrel = Kestrel guide-entry-shipyard-kilderkin = Kilderkin guide-entry-shipyard-lantern = Lantern diff --git a/Resources/Maps/_NF/Shuttles/investigator.yml b/Resources/Maps/_NF/Shuttles/investigator.yml index 08cdeffc14d..864725cd8fd 100644 --- a/Resources/Maps/_NF/Shuttles/investigator.yml +++ b/Resources/Maps/_NF/Shuttles/investigator.yml @@ -7,11 +7,13 @@ tilemap: 20: FloorBrokenWood 30: FloorDark 35: FloorDarkMono + 2: FloorGlass 78: FloorReinforced 90: FloorSteel 91: FloorSteelBurnt 97: FloorSteelDirty 101: FloorSteelMono + 1: FloorTechMaint 119: FloorWood 121: Lattice 122: Plating @@ -29,19 +31,19 @@ entities: chunks: 0,0: ind: 0,0 - tiles: egAAAAAAZQAAAAADZQAAAAAAZQAAAAABZQAAAAADZQAAAAABegAAAAAAWgAAAAACYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAABWgAAAAABYQAAAAAAWgAAAAAAWgAAAAADegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAHgAAAAACHgAAAAACHgAAAAABegAAAAAAegAAAAAAWgAAAAABWgAAAAAAWgAAAAABWgAAAAADWgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAHgAAAAADegAAAAAAHgAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAHgAAAAACHgAAAAACHgAAAAABegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAHgAAAAACegAAAAAAHgAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: egAAAAAAZQAAAAADZQAAAAAAZQAAAAABZQAAAAADZQAAAAABegAAAAAAWgAAAAACYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAABWgAAAAABYQAAAAAAWgAAAAAAWgAAAAADegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAHgAAAAACHgAAAAACHgAAAAABegAAAAAAegAAAAAAWgAAAAABWgAAAAAAWgAAAAABegAAAAAAWgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAAAAQAAAAAAegAAAAAAAQAAAAAAAQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAHgAAAAACHgAAAAACHgAAAAABegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAAAAQAAAAAAegAAAAAAAQAAAAAAAQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-1: ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAATgAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAAAWwAAAAAAWgAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAWgAAAAAAWgAAAAACWgAAAAAAWgAAAAACWgAAAAABegAAAAAAWgAAAAAAWgAAAAABWgAAAAADWgAAAAABWgAAAAABegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWgAAAAABWgAAAAABWgAAAAADWgAAAAABWgAAAAAAWgAAAAACWgAAAAABWgAAAAADWgAAAAACWgAAAAACWgAAAAACWgAAAAADegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAegAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAWgAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAATgAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAAAWwAAAAAAWgAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAWgAAAAAAWgAAAAACWgAAAAAAWgAAAAACWgAAAAABegAAAAAAWgAAAAAAWgAAAAABWgAAAAADWgAAAAABWgAAAAABegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAQAAAAAAWgAAAAABWgAAAAADWgAAAAABWgAAAAAAWgAAAAACAQAAAAAAWgAAAAADWgAAAAACWgAAAAACWgAAAAACWgAAAAADegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAegAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAWgAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAWgAAAAAAWgAAAAACWgAAAAACHgAAAAACHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAWgAAAAADWgAAAAAAWgAAAAAAIwAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAWgAAAAABWgAAAAACWgAAAAADHgAAAAABHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAIwAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAdwAAAAAAdwAAAAACdwAAAAAAdwAAAAACdwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAdwAAAAADdwAAAAADdwAAAAAAdwAAAAACdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAdwAAAAADDgAAAAABDgAAAAAAdwAAAAAAdwAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAIwAAAAAAHgAAAAAAHgAAAAAAHgAAAAACHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAIwAAAAAAAgAAAAAAAgAAAAAAIwAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAIwAAAAAAHgAAAAAAHgAAAAAAHgAAAAABHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAAQAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAdwAAAAAAdwAAAAACdwAAAAAAdwAAAAACdwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAdwAAAAADdwAAAAADdwAAAAAAdwAAAAACdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAQAAAAAAegAAAAAA version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAADgAAAAAADgAAAAADDgAAAAABdwAAAAAAdwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAADgAAAAADDgAAAAAADgAAAAAAdwAAAAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAADgAAAAAADgAAAAAADgAAAAABdwAAAAACdwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAAQAAAAAAAQAAAAAAegAAAAAAegAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAAQAAAAAAegAAAAAAegAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 1,-1: ind: 1,-1 @@ -86,8 +88,8 @@ entities: 11: 2,-2 12: 4,-2 13: 3,-2 - 53: 4,5 - 54: 2,5 + 48: 4,5 + 49: 2,5 - node: color: '#FFFFFFFF' id: Bot @@ -97,12 +99,10 @@ entities: 2: 4,-1 3: 1,0 4: 5,0 - 34: -5,-5 - 35: -2,-6 - 36: 3,0 - 126: 11,0 - 127: 11,0 - 128: 11,0 + 31: 3,0 + 112: 11,0 + 113: 11,0 + 114: 11,0 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' @@ -112,73 +112,77 @@ entities: 8: 4,0 - node: color: '#FFFFFFFF' - id: BotLeft + id: BotGreyscale + decals: + 137: -5,-5 + 138: -5,-6 + - node: + color: '#FFFFFFFF' + id: BoxGreyscale decals: - 90: -4,-7 + 139: -2,-6 + 200: -2,1 - node: color: '#FFFFFFFF' - id: BotRight + id: BrickTileDarkEndE decals: - 89: -5,-7 - 91: -3,-7 + 134: -3,-6 - node: color: '#FFFFFFFF' - id: BrickTileDarkLineE + id: BrickTileDarkEndW decals: - 31: -3,-7 - 32: -3,-6 - 33: -3,-5 + 135: -4,-6 - node: color: '#D4D4D43D' id: BrickTileWhiteCornerNe decals: - 103: 7,0 + 89: 7,0 - node: color: '#D4D4D40C' id: BrickTileWhiteLineE decals: - 39: 2,2 - 40: 2,5 - 41: 2,2 - 42: 2,5 + 34: 2,2 + 35: 2,5 + 36: 2,2 + 37: 2,5 - node: cleanable: True color: '#D4D4D40C' id: BrickTileWhiteLineE decals: - 55: 2,4 - 56: 2,4 + 50: 2,4 + 51: 2,4 - node: color: '#D4D4D43D' id: BrickTileWhiteLineE decals: - 100: 7,-3 - 101: 7,-2 - 102: 7,-1 + 86: 7,-3 + 87: 7,-2 + 88: 7,-1 - node: color: '#D4D4D40C' id: BrickTileWhiteLineW decals: - 37: 4,2 - 38: 4,5 - 43: 4,2 - 44: 4,5 - 45: 4,4 - 46: 4,4 + 32: 4,2 + 33: 4,5 + 38: 4,2 + 39: 4,5 + 40: 4,4 + 41: 4,4 - node: color: '#D4D4D43D' id: BrickTileWhiteLineW decals: - 95: 11,-3 - 96: 11,-2 - 97: 11,-1 - 98: 11,0 - 99: 11,1 + 81: 11,-3 + 82: 11,-2 + 83: 11,-1 + 84: 11,0 + 85: 11,1 - node: color: '#D381C996' id: CheckerNESW decals: - 129: 11,2 + 115: 11,2 - node: color: '#D4D4D428' id: CheckerNESW @@ -192,35 +196,35 @@ entities: color: '#D4D4D40C' id: CheckerNWSE decals: - 47: 3,4 - 48: 3,4 - 49: 3,2 - 50: 3,2 - 51: 3,5 - 52: 3,5 + 42: 3,4 + 43: 3,4 + 44: 3,2 + 45: 3,2 + 46: 3,5 + 47: 3,5 - node: color: '#D4D4D43D' id: CheckerNWSE decals: - 104: 9,-4 - 105: 8,-4 - 106: 10,-4 - 107: 10,-3 - 108: 9,-3 - 109: 8,-3 - 110: 8,-2 - 111: 9,-2 - 112: 10,-2 - 113: 10,-1 - 114: 9,-1 - 115: 8,-1 - 116: 8,0 - 117: 9,0 - 118: 10,0 - 119: 10,1 - 120: 9,1 - 124: 8,1 - 125: 9,2 + 90: 9,-4 + 91: 8,-4 + 92: 10,-4 + 93: 10,-3 + 94: 9,-3 + 95: 8,-3 + 96: 8,-2 + 97: 9,-2 + 98: 10,-2 + 99: 10,-1 + 100: 9,-1 + 101: 8,-1 + 102: 8,0 + 103: 9,0 + 104: 10,0 + 105: 10,1 + 106: 9,1 + 110: 8,1 + 111: 9,2 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' @@ -228,70 +232,146 @@ entities: decals: 9: 1,-1 10: 5,-1 + - node: + color: '#96DAFFFF' + id: DeliveryGreyscale + decals: + 194: -5,0 + - node: + color: '#FF5C5CFF' + id: DeliveryGreyscale + decals: + 193: -5,1 + - node: + color: '#FFFFFFFF' + id: DeliveryGreyscale + decals: + 136: -5,-7 + 195: -5,2 + 196: -4,2 + 197: -3,2 + 198: -2,2 + 199: -1,2 + 201: -1,0 + 202: -1,1 + 203: -2,-5 + 204: -1,-6 + 205: -2,-7 - node: cleanable: True color: '#FFFFFFFF' id: Dirt decals: - 130: 9,-5 - 131: 8,-2 - 132: 10,-1 - 133: 10,0 - 134: -4,-6 - 135: 8,-3 - 136: 8,-1 - 137: 9,1 - 138: 9,-1 - 139: 10,1 - 140: 11,-2 - 141: 3,-2 - 142: 4,-1 - 143: 4,0 - 144: 5,-3 - 145: 0,-2 - 146: -5,0 - 147: -4,0 + 116: 9,-5 + 117: 8,-2 + 118: 10,-1 + 119: 10,0 + 120: 8,-3 + 121: 8,-1 + 122: 9,1 + 123: 9,-1 + 124: 10,1 + 125: 11,-2 + 126: 3,-2 + 127: 4,-1 + 128: 4,0 + 129: 5,-3 + 130: 0,-2 + 131: -5,0 + 132: -4,0 + 140: -4,-6 + 141: -3,-6 - node: cleanable: True color: '#FFFFFFFF' id: DirtHeavy decals: - 63: 5,-2 - 64: 4,-3 - 65: 1,-2 - 66: 2,-3 - 67: 10,1 - 68: 7,2 - 69: -4,-5 - 70: -2,-5 - 71: -1,-5 - 72: -1,-7 - 73: -3,-7 - 74: -3,-6 - 79: 4,5 - 80: 3,4 - 81: 2,4 - 82: 4,2 - 83: 2,2 - 84: -4,0 - 85: -5,1 - 86: -4,2 - 87: -4,1 + 58: 5,-2 + 59: 4,-3 + 60: 1,-2 + 61: 2,-3 + 62: 10,1 + 63: 7,2 + 68: 4,5 + 69: 3,4 + 70: 2,4 + 71: 4,2 + 72: 2,2 + 73: -4,0 + 74: -5,1 + 75: -4,2 + 76: -4,1 + 142: -4,-5 + 143: -5,-5 + 144: -5,-7 + 145: -4,-7 + 146: -5,-6 + 147: -3,-7 + 148: -2,-7 + 149: -2,-6 + 150: -2,-5 + 151: -3,-5 + 152: -1,-5 + 153: -1,-6 + 154: -1,-7 + 155: -2,-7 + 156: -4,-5 + 157: -5,-5 + 158: -3,-5 + 159: -3,-7 - node: cleanable: True color: '#FFFFFFFF' id: DirtHeavyMonotile decals: - 75: 5,0 - 76: 2,-1 - 77: 2,0 - 78: 4,-1 + 64: 5,0 + 65: 2,-1 + 66: 2,0 + 67: 4,-1 + 179: -2,-3 + 180: -3,-2 + 181: -4,-2 + 182: -4,-3 + 183: -3,-3 + 184: -1,-2 + 185: -2,-3 - node: cleanable: True color: '#FFFFFFFF' id: DirtLight decals: - 88: 9,-9 + 77: 9,-9 + 160: -4,-3 + 161: -4,-2 + 162: -3,-2 + 163: -3,-3 + 164: -3,-3 + 165: -2,-3 + 166: -2,-2 + 167: -1,-2 + 168: -1,-3 + 169: -1,-3 + 170: -2,-2 + 171: -4,-2 + 172: -5,-2 + 173: -5,-2 + 174: -5,-3 + 175: -3,-3 + 176: -2,-3 + 177: -2,-2 + 178: -4,-2 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtMedium + decals: + 186: -3,-3 + 187: -3,-3 + 188: -4,-2 + 189: -4,-2 + 190: -3,-3 + 191: -2,-3 + 192: -2,-3 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' @@ -303,47 +383,47 @@ entities: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale decals: - 121: 7,2 + 107: 7,2 - node: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale270 decals: - 122: 7,1 + 108: 7,1 - node: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale90 decals: - 123: 8,2 + 109: 8,2 - node: cleanable: True color: '#FFFFFFFF' id: WarnLineE decals: - 60: 4,2 - 61: 4,4 - 62: 4,5 + 55: 4,2 + 56: 4,4 + 57: 4,5 - node: color: '#FFFFFFFF' id: WarnLineN decals: - 92: 10,-5 - 93: 9,-5 - 94: 8,-5 + 78: 10,-5 + 79: 9,-5 + 80: 8,-5 - node: cleanable: True color: '#FFFFFFFF' id: WarnLineS decals: - 57: 2,2 - 58: 2,4 - 59: 2,5 + 52: 2,2 + 53: 2,4 + 54: 2,5 - node: color: '#FFFFFFFF' id: WarnLineW decals: 25: 8,-7 28: 9,-7 - 148: 10,-7 + 133: 10,-7 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSe @@ -373,81 +453,76 @@ entities: data: tiles: 0,0: - 0: 65535 - 1,0: - 0: 65535 - 0,1: + 0: 20206 + -1,0: 0: 4095 + 0,1: + 0: 1262 + -1,1: + 1: 15 + 0,-1: + 0: 61408 + 1,0: + 0: 7099 1,1: - 0: 1911 + 0: 307 1: 8 + 1,-1: + 0: 49072 2,0: - 0: 65535 + 0: 3071 2,1: 1: 15 - 3,0: - 0: 4369 - 1: 238 + 2,-1: + 0: 65527 3,1: 1: 1 + 3,0: + 1: 238 + 3,-1: + 1: 12000 + 4,0: + 1: 119 0,-3: 1: 4096 + -1,-3: + 1: 65280 + -1,-2: + 0: 65520 0,-2: - 0: 4369 1: 57344 - 0,-1: - 0: 65535 + -1,-1: + 0: 20465 1,-2: 1: 29764 - 0: 34952 - 1,-1: - 0: 65535 1,-3: 1: 16384 - 0: 34816 2,-3: - 0: 65280 + 0: 28672 2,-2: - 0: 65535 - 2,-1: - 0: 65535 + 0: 29303 3,-3: 1: 4352 3,-2: 1: 4369 - 3,-1: - 0: 4369 - 1: 12000 - -2,-3: - 1: 52224 - -2,-2: - 0: 52428 + 4,-1: + 1: 10096 + -3,-1: + 1: 12272 + -3,0: + 1: 255 -2,-1: 1: 9008 - 0: 52428 - -1,-3: - 1: 65280 - -1,-2: - 0: 65535 - -1,-1: - 0: 65535 + 0: 2176 -2,0: 1: 51 - 0: 52428 + 0: 2184 + -2,-3: + 1: 52224 + -2,-2: + 0: 34944 -2,1: 1: 12 - -1,0: - 0: 65535 - -1,1: - 1: 15 - -3,-1: - 1: 12272 - -3,0: - 1: 255 - 4,-1: - 1: 10096 - 4,0: - 1: 119 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -465,7 +540,7 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True moles: - 0 - 0 @@ -492,59 +567,45 @@ entities: parent: 2 - type: DeviceList devices: - - 294 - - 280 - - 274 - 309 - - 167 - - 198 - 76 + - 198 + - 167 - 119 - - 275 - - type: AtmosDevice - joinedGrid: 2 - - uid: 252 + - 98 + - 196 + - uid: 306 components: - type: Transform rot: -1.5707963267948966 rad - pos: 0.5,1.5 + pos: 0.5,-4.5 parent: 2 - type: DeviceList devices: - 284 - - 289 - - 237 - - 308 - 307 - - 304 - - 298 - - 296 - - 273 - - type: AtmosDevice - joinedGrid: 2 - - uid: 306 + - uid: 466 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-4.5 + rot: 3.141592653589793 rad + pos: -3.5,-0.5 parent: 2 - type: DeviceList devices: - - 237 - - 284 - - 289 - - 307 - - type: AtmosDevice - joinedGrid: 2 -- proto: AirCanister - entities: - - uid: 191 + - 469 + - 357 + - uid: 494 components: - type: Transform - pos: -4.5,-4.5 + rot: 3.141592653589793 rad + pos: -4.5,-7.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 + - type: DeviceList + devices: + - 345 + - 354 + - 191 + - 210 - proto: AirlockCargoGlass entities: - uid: 110 @@ -559,6 +620,14 @@ entities: - type: Transform pos: -3.5,-3.5 parent: 2 +- proto: AirlockEngineeringGlass + entities: + - uid: 237 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-0.5 + parent: 2 - proto: AirlockExternalGlass entities: - uid: 692 @@ -614,33 +683,18 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,2.5 parent: 2 - - type: DeviceNetwork - deviceLists: - - 251 - uid: 284 components: - type: Transform pos: -1.5,-6.5 parent: 2 - - type: DeviceNetwork - deviceLists: - - 252 - - uid: 296 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-2.5 - parent: 2 - - type: DeviceNetwork - deviceLists: - - 252 - proto: APCBasic entities: - - uid: 334 + - uid: 223 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,2.5 + rot: 3.141592653589793 rad + pos: -0.5,-3.5 parent: 2 - uid: 335 components: @@ -688,6 +742,11 @@ entities: parent: 2 - proto: AtmosFixBlockerMarker entities: + - uid: 367 + components: + - type: Transform + pos: 6.5,-4.5 + parent: 2 - uid: 430 components: - type: Transform @@ -898,11 +957,6 @@ entities: - type: Transform pos: 6.5,-5.5 parent: 2 - - uid: 733 - components: - - type: Transform - pos: 6.5,-4.5 - parent: 2 - uid: 734 components: - type: Transform @@ -1160,149 +1214,172 @@ entities: - type: Transform pos: 8.5,2.5 parent: 2 -- proto: BarSign +- proto: BenchSofaLeft entities: - - uid: 24 + - uid: 322 components: - type: Transform - pos: -4.5,3.5 + rot: 3.141592653589793 rad + pos: -2.5,-2.5 + parent: 2 + - type: Physics + bodyType: Static +- proto: BenchSofaRight + entities: + - uid: 296 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-2.5 parent: 2 + - type: Physics + bodyType: Static - proto: BlastDoor entities: - - uid: 423 + - uid: 47 components: - - type: MetaData - flags: PvsPriority - type: Transform - pos: 7.5,-7.5 + pos: 3.5,-3.5 parent: 2 - type: DeviceLinkSink links: - - 702 - - uid: 687 + - 246 + - uid: 51 components: - - type: MetaData - flags: PvsPriority - type: Transform - pos: 1.5,3.5 + pos: 2.5,-3.5 parent: 2 - type: DeviceLinkSink links: - - 479 - - uid: 688 + - 246 + - uid: 54 components: - - type: MetaData - flags: PvsPriority - type: Transform - pos: 1.5,6.5 + pos: 7.5,-7.5 parent: 2 - type: DeviceLinkSink links: - - 479 - - uid: 689 + - 475 + - uid: 178 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,6.5 parent: 2 - type: DeviceLinkSink links: - - 479 - - uid: 690 + - 205 + - uid: 193 components: - - type: MetaData - flags: PvsPriority - type: Transform - pos: 5.5,3.5 + pos: 4.5,-3.5 parent: 2 - type: DeviceLinkSink links: - - 479 -- proto: BlastDoorOpen - entities: - - uid: 88 + - 246 + - uid: 245 components: - type: Transform - pos: 2.5,-3.5 + pos: 1.5,6.5 parent: 2 - type: DeviceLinkSink links: - - 469 - - uid: 91 + - 205 + - uid: 289 components: - type: Transform - pos: 4.5,-3.5 + pos: 5.5,3.5 parent: 2 - type: DeviceLinkSink links: - - 469 - - uid: 467 + - 205 + - uid: 291 components: - type: Transform - pos: 3.5,-3.5 + pos: 1.5,3.5 parent: 2 - type: DeviceLinkSink links: - - 469 -- proto: BoozeDispenser + - 205 +- proto: BorgCharger entities: - - uid: 476 + - uid: 282 components: - type: Transform - pos: -4.5,2.5 + rot: 3.141592653589793 rad + pos: 1.5,-2.5 parent: 2 -- proto: CableApcExtension +- proto: ButtonFrameCaution entities: - - uid: 7 + - uid: 24 components: - type: Transform - pos: 3.5,0.5 + rot: 1.5707963267948966 rad + pos: 7.5,-3.5 parent: 2 - - uid: 17 + - uid: 195 components: - type: Transform - pos: 3.5,-0.5 + rot: 1.5707963267948966 rad + pos: 0.5,1.5 parent: 2 - - uid: 193 + - uid: 234 components: - type: Transform - pos: 4.5,-3.5 + rot: 3.141592653589793 rad + pos: -0.5,-6.5 parent: 2 - - uid: 365 + - uid: 476 components: - type: Transform - pos: 0.5,2.5 + rot: 3.141592653589793 rad + pos: 5.5,-3.5 parent: 2 - - uid: 366 + - uid: 785 components: - type: Transform - pos: -0.5,2.5 + pos: 3.5,6.5 parent: 2 - - uid: 367 +- proto: CableApcExtension + entities: + - uid: 7 components: - type: Transform - pos: -1.5,2.5 + pos: 3.5,0.5 parent: 2 - - uid: 368 + - uid: 17 components: - type: Transform - pos: -3.5,2.5 + pos: 3.5,-0.5 parent: 2 - - uid: 369 + - uid: 99 components: - type: Transform - pos: -2.5,2.5 + pos: -3.5,-2.5 parent: 2 - - uid: 370 + - uid: 101 + components: + - type: Transform + pos: -2.5,-1.5 + parent: 2 + - uid: 102 + components: + - type: Transform + pos: -3.5,-1.5 + parent: 2 + - uid: 179 components: - type: Transform pos: -4.5,2.5 parent: 2 - - uid: 371 + - uid: 305 components: - type: Transform - pos: -1.5,1.5 + pos: -0.5,-3.5 + parent: 2 + - uid: 352 + components: + - type: Transform + pos: -0.5,-2.5 parent: 2 - uid: 372 components: @@ -1319,35 +1396,15 @@ entities: - type: Transform pos: -1.5,-1.5 parent: 2 - - uid: 375 + - uid: 379 components: - type: Transform - pos: -1.5,-2.5 + pos: -0.5,-1.5 parent: 2 - - uid: 376 + - uid: 380 components: - type: Transform - pos: -2.5,-2.5 - parent: 2 - - uid: 377 - components: - - type: Transform - pos: -3.5,-2.5 - parent: 2 - - uid: 378 - components: - - type: Transform - pos: -4.5,-2.5 - parent: 2 - - uid: 379 - components: - - type: Transform - pos: -0.5,-1.5 - parent: 2 - - uid: 380 - components: - - type: Transform - pos: 0.5,-1.5 + pos: 0.5,-1.5 parent: 2 - uid: 381 components: @@ -1484,16 +1541,6 @@ entities: - type: Transform pos: -2.5,-5.5 parent: 2 - - uid: 410 - components: - - type: Transform - pos: -1.5,-5.5 - parent: 2 - - uid: 411 - components: - - type: Transform - pos: -0.5,-5.5 - parent: 2 - uid: 412 components: - type: Transform @@ -1504,16 +1551,6 @@ entities: - type: Transform pos: -3.5,-8.5 parent: 2 - - uid: 414 - components: - - type: Transform - pos: -4.5,-8.5 - parent: 2 - - uid: 415 - components: - - type: Transform - pos: 2.5,-3.5 - parent: 2 - uid: 416 components: - type: Transform @@ -1574,11 +1611,6 @@ entities: - type: Transform pos: 3.5,4.5 parent: 2 - - uid: 466 - components: - - type: Transform - pos: 3.5,5.5 - parent: 2 - uid: 488 components: - type: Transform @@ -1589,16 +1621,6 @@ entities: - type: Transform pos: 6.5,2.5 parent: 2 - - uid: 677 - components: - - type: Transform - pos: -0.5,-4.5 - parent: 2 - - uid: 678 - components: - - type: Transform - pos: -0.5,-6.5 - parent: 2 - uid: 679 components: - type: Transform @@ -1609,25 +1631,25 @@ entities: - type: Transform pos: 4.5,2.5 parent: 2 - - uid: 681 + - uid: 688 components: - type: Transform - pos: 2.5,4.5 + pos: -2.5,0.5 parent: 2 - - uid: 682 + - uid: 689 components: - type: Transform - pos: 2.5,3.5 + pos: -2.5,1.5 parent: 2 - - uid: 683 + - uid: 690 components: - type: Transform - pos: 2.5,2.5 + pos: -3.5,1.5 parent: 2 - - uid: 695 + - uid: 694 components: - type: Transform - pos: -4.5,-0.5 + pos: -3.5,2.5 parent: 2 - uid: 696 components: @@ -1661,10 +1683,25 @@ entities: - type: Transform pos: 10.5,-4.5 parent: 2 - - uid: 170 + - uid: 106 components: - type: Transform - pos: -4.5,-6.5 + pos: -1.5,-0.5 + parent: 2 + - uid: 199 + components: + - type: Transform + pos: -3.5,-5.5 + parent: 2 + - uid: 203 + components: + - type: Transform + pos: -1.5,3.5 + parent: 2 + - uid: 204 + components: + - type: Transform + pos: -1.5,0.5 parent: 2 - uid: 209 components: @@ -1676,11 +1713,26 @@ entities: - type: Transform pos: 10.5,-2.5 parent: 2 - - uid: 226 + - uid: 240 components: - type: Transform pos: -3.5,-6.5 parent: 2 + - uid: 249 + components: + - type: Transform + pos: -5.5,-1.5 + parent: 2 + - uid: 254 + components: + - type: Transform + pos: -1.5,2.5 + parent: 2 + - uid: 292 + components: + - type: Transform + pos: 5.5,-1.5 + parent: 2 - uid: 311 components: - type: Transform @@ -1736,20 +1788,20 @@ entities: - type: Transform pos: 0.5,-8.5 parent: 2 - - uid: 322 + - uid: 324 components: - type: Transform - pos: -4.5,-5.5 + pos: -3.5,-7.5 parent: 2 - - uid: 324 + - uid: 359 components: - type: Transform - pos: -3.5,-7.5 + pos: -2.5,2.5 parent: 2 - - uid: 491 + - uid: 362 components: - type: Transform - pos: -5.5,-0.5 + pos: 7.5,-1.5 parent: 2 - uid: 507 components: @@ -1804,17 +1856,7 @@ entities: - uid: 517 components: - type: Transform - pos: -2.5,-6.5 - parent: 2 - - uid: 518 - components: - - type: Transform - pos: -2.5,-5.5 - parent: 2 - - uid: 519 - components: - - type: Transform - pos: -2.5,-4.5 + pos: -4.5,2.5 parent: 2 - uid: 520 components: @@ -1876,11 +1918,6 @@ entities: - type: Transform pos: 4.5,-1.5 parent: 2 - - uid: 532 - components: - - type: Transform - pos: 5.5,-1.5 - parent: 2 - uid: 533 components: - type: Transform @@ -1889,7 +1926,7 @@ entities: - uid: 534 components: - type: Transform - pos: 7.5,-1.5 + pos: -3.5,2.5 parent: 2 - uid: 535 components: @@ -1901,11 +1938,6 @@ entities: - type: Transform pos: 9.5,-1.5 parent: 2 - - uid: 537 - components: - - type: Transform - pos: -4.5,-0.5 - parent: 2 - uid: 538 components: - type: Transform @@ -1946,11 +1978,6 @@ entities: - type: Transform pos: 7.5,-0.5 parent: 2 - - uid: 547 - components: - - type: Transform - pos: -0.5,3.5 - parent: 2 - uid: 548 components: - type: Transform @@ -1966,11 +1993,6 @@ entities: - type: Transform pos: -0.5,0.5 parent: 2 - - uid: 551 - components: - - type: Transform - pos: -0.5,-0.5 - parent: 2 - uid: 620 components: - type: Transform @@ -2236,13 +2258,53 @@ entities: - type: Transform pos: -4.5,-1.5 parent: 2 - - uid: 676 +- proto: CableMV + entities: + - uid: 200 components: - type: Transform - pos: -1.5,-6.5 + pos: 5.5,-1.5 + parent: 2 + - uid: 201 + components: + - type: Transform + pos: -4.5,1.5 + parent: 2 + - uid: 206 + components: + - type: Transform + pos: -3.5,1.5 + parent: 2 + - uid: 257 + components: + - type: Transform + pos: -4.5,2.5 + parent: 2 + - uid: 280 + components: + - type: Transform + pos: -1.5,-0.5 + parent: 2 + - uid: 295 + components: + - type: Transform + pos: -1.5,0.5 + parent: 2 + - uid: 297 + components: + - type: Transform + pos: -2.5,1.5 + parent: 2 + - uid: 304 + components: + - type: Transform + pos: 7.5,-1.5 + parent: 2 + - uid: 325 + components: + - type: Transform + pos: -0.5,-3.5 parent: 2 -- proto: CableMV - entities: - uid: 336 components: - type: Transform @@ -2278,21 +2340,11 @@ entities: - type: Transform pos: 8.5,-1.5 parent: 2 - - uid: 343 - components: - - type: Transform - pos: 7.5,-1.5 - parent: 2 - uid: 344 components: - type: Transform pos: 6.5,-1.5 parent: 2 - - uid: 345 - components: - - type: Transform - pos: 5.5,-1.5 - parent: 2 - uid: 346 components: - type: Transform @@ -2323,120 +2375,65 @@ entities: - type: Transform pos: -0.5,-1.5 parent: 2 - - uid: 352 + - uid: 356 components: - type: Transform - pos: -3.5,-3.5 + pos: -1.5,-1.5 parent: 2 - - uid: 353 + - uid: 358 components: - type: Transform - pos: -3.5,-2.5 + pos: -2.5,0.5 parent: 2 - - uid: 354 + - uid: 685 components: - type: Transform - pos: -3.5,-1.5 + pos: -0.5,-2.5 parent: 2 - - uid: 355 +- proto: CableTerminal + entities: + - uid: 677 components: - type: Transform - pos: -2.5,-1.5 + rot: -1.5707963267948966 rad + pos: -2.5,2.5 parent: 2 - - uid: 356 +- proto: CarpetBlack + entities: + - uid: 800 components: - type: Transform - pos: -1.5,-1.5 + rot: 1.5707963267948966 rad + pos: -0.5,-2.5 parent: 2 - - uid: 357 + - uid: 801 components: - type: Transform - pos: -3.5,-4.5 + rot: 1.5707963267948966 rad + pos: -2.5,-2.5 parent: 2 - - uid: 358 + - uid: 802 components: - type: Transform - pos: -3.5,-5.5 + rot: 1.5707963267948966 rad + pos: -1.5,-2.5 parent: 2 - - uid: 359 +- proto: Catwalk + entities: + - uid: 15 components: - type: Transform - pos: -4.5,-5.5 + pos: 4.5,1.5 parent: 2 - - uid: 360 + - uid: 16 components: - type: Transform - pos: 0.5,2.5 + pos: 3.5,1.5 parent: 2 - - uid: 361 + - uid: 32 components: - type: Transform - pos: -0.5,2.5 - parent: 2 - - uid: 362 - components: - - type: Transform - pos: -0.5,1.5 - parent: 2 - - uid: 363 - components: - - type: Transform - pos: -0.5,0.5 - parent: 2 - - uid: 364 - components: - - type: Transform - pos: -0.5,-0.5 - parent: 2 -- proto: CableTerminal - entities: - - uid: 99 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,-6.5 - parent: 2 -- proto: CarpetBlack - entities: - - uid: 218 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,0.5 - parent: 2 - - uid: 238 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,1.5 - parent: 2 - - uid: 303 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,-0.5 - parent: 2 - - uid: 486 - components: - - type: Transform - pos: -1.5,2.5 - parent: 2 -- proto: Catwalk - entities: - - uid: 15 - components: - - type: Transform - pos: 4.5,1.5 - parent: 2 - - uid: 16 - components: - - type: Transform - pos: 3.5,1.5 - parent: 2 - - uid: 32 - components: - - type: Transform - pos: 2.5,-3.5 + pos: 2.5,-3.5 parent: 2 - uid: 33 components: @@ -2448,6 +2445,11 @@ entities: - type: Transform pos: 4.5,-3.5 parent: 2 + - uid: 41 + components: + - type: Transform + pos: -2.5,1.5 + parent: 2 - uid: 197 components: - type: Transform @@ -2519,6 +2521,21 @@ entities: rot: -1.5707963267948966 rad pos: 12.5,-9.5 parent: 2 + - uid: 363 + components: + - type: Transform + pos: -1.5,0.5 + parent: 2 + - uid: 415 + components: + - type: Transform + pos: -3.5,1.5 + parent: 2 + - uid: 443 + components: + - type: Transform + pos: -2.5,0.5 + parent: 2 - uid: 552 components: - type: Transform @@ -2648,15 +2665,15 @@ entities: - type: Transform pos: 10.471153,-1.6616642 parent: 2 -- proto: ComputerTabletopAnalysisConsole +- proto: ComputerPowerMonitoring entities: - - uid: 283 + - uid: 111 components: - type: Transform rot: -1.5707963267948966 rad - pos: 10.5,-3.5 + pos: -0.5,0.5 parent: 2 -- proto: ComputerTabletopRadar +- proto: ComputerRadar entities: - uid: 20 components: @@ -2664,41 +2681,51 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,-5.5 parent: 2 -- proto: ComputerTabletopResearchAndDevelopment +- proto: ComputerShuttle entities: - - uid: 219 + - uid: 107 components: - type: Transform - rot: 3.141592653589793 rad - pos: 11.5,-2.5 + pos: -1.5,-4.5 parent: 2 -- proto: ComputerTabletopShuttle +- proto: ComputerSolarControl entities: - - uid: 163 + - uid: 28 components: - type: Transform - pos: -1.5,-4.5 + rot: -1.5707963267948966 rad + pos: -0.5,1.5 parent: 2 -- proto: ComputerTabletopSolarControl +- proto: ComputerStationRecords entities: - - uid: 403 + - uid: 37 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,-6.5 parent: 2 -- proto: ComputerTabletopStationRecords +- proto: ComputerTabletopAnalysisConsole entities: - - uid: 161 + - uid: 283 components: - type: Transform - pos: -0.5,-4.5 + rot: -1.5707963267948966 rad + pos: 10.5,-3.5 + parent: 2 +- proto: ComputerTabletopResearchAndDevelopment + entities: + - uid: 219 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,-2.5 parent: 2 - proto: ComputerWallmountWithdrawBankATM entities: - - uid: 23 + - uid: 247 components: - type: Transform + rot: 1.5707963267948966 rad pos: 0.5,0.5 parent: 2 - type: Physics @@ -2821,19 +2848,17 @@ entities: - 18 - proto: CrateArtifactContainer entities: - - uid: 98 + - uid: 368 components: - type: Transform - pos: 5.5,-0.5 + pos: 7.5,-0.5 parent: 2 - uid: 671 components: - type: Transform pos: 11.5,0.5 parent: 2 -- proto: CrateMaterialPlasma - entities: - - uid: 325 + - uid: 687 components: - type: Transform pos: 2.5,-0.5 @@ -2847,23 +2872,37 @@ entities: parent: 2 - proto: DefibrillatorCabinetFilled entities: - - uid: 495 + - uid: 733 components: - type: Transform rot: 1.5707963267948966 rad - pos: -5.5,-1.5 + pos: 0.5,-0.5 parent: 2 -- proto: DrinkGlass +- proto: EmergencyLight entities: - - uid: 107 + - uid: 370 components: - type: Transform - pos: -2.845461,2.488087 + rot: 3.141592653589793 rad + pos: -0.5,-6.5 parent: 2 - - uid: 108 + - uid: 702 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,1.5 + parent: 2 + - uid: 704 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,0.5 + parent: 2 + - uid: 705 components: - type: Transform - pos: -2.720461,2.331837 + rot: -1.5707963267948966 rad + pos: 11.5,-1.5 parent: 2 - proto: ExtinguisherCabinetFilled entities: @@ -2872,6 +2911,12 @@ entities: - type: Transform pos: 12.5,-1.5 parent: 2 + - uid: 784 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-3.5 + parent: 2 - proto: FaxMachineShip entities: - uid: 703 @@ -2899,6 +2944,9 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,-1.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 251 - proto: FirelockEdge entities: - uid: 76 @@ -2928,6 +2976,14 @@ entities: - type: DeviceNetwork deviceLists: - 251 +- proto: FirelockGlass + entities: + - uid: 112 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 2 - proto: FolderSpawner entities: - uid: 230 @@ -2936,331 +2992,500 @@ entities: rot: -1.5707963267948966 rad pos: 9.1202755,-3.003404 parent: 2 +- proto: GasMixerOnFlipped + entities: + - uid: 414 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,0.5 + parent: 2 + - type: GasMixer + inletTwoConcentration: 0.79 + inletOneConcentration: 0.21 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPassiveVent entities: - - uid: 178 + - uid: 272 components: - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-4.5 + pos: -1.5,4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#990000FF' - uid: 492 components: - type: Transform rot: 3.141592653589793 rad pos: 8.5,-6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasPipeBend entities: - - uid: 41 + - uid: 103 components: - type: Transform - pos: -1.5,0.5 + pos: -3.5,1.5 parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 250 + color: '#0055CCFF' + - uid: 207 components: - type: Transform rot: -1.5707963267948966 rad - pos: 7.5,-1.5 + pos: 1.5,-1.5 parent: 2 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 288 + color: '#990000FF' + - uid: 229 components: - type: Transform rot: 3.141592653589793 rad - pos: -1.5,-6.5 + pos: -3.5,-4.5 parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 326 + color: '#0055CCFF' + - uid: 241 components: - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,-5.5 + pos: 3.5,2.5 parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' -- proto: GasPipeStraight - entities: - - uid: 8 + color: '#0055CCFF' + - uid: 293 components: - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-3.5 + rot: 1.5707963267948966 rad + pos: 1.5,-0.5 parent: 2 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9 + color: '#990000FF' + - uid: 329 components: - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-2.5 + pos: 11.5,-1.5 parent: 2 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 124 + color: '#990000FF' + - uid: 334 components: - type: Transform - pos: 8.5,-5.5 + pos: 5.5,-0.5 parent: 2 - - uid: 228 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 361 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-0.5 + rot: 3.141592653589793 rad + pos: 5.5,-1.5 parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 229 + color: '#990000FF' + - uid: 471 components: - type: Transform rot: -1.5707963267948966 rad - pos: 5.5,-0.5 + pos: -0.5,0.5 parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 236 + color: '#990000FF' + - uid: 491 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-0.5 + rot: 3.141592653589793 rad + pos: 2.5,2.5 parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 239 + color: '#0055CCFF' +- proto: GasPipeFourway + entities: + - uid: 302 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-1.5 + pos: 4.5,-0.5 parent: 2 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 240 + color: '#990000FF' + - uid: 326 components: - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-2.5 + pos: -1.5,-1.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 241 +- proto: GasPipeStraight + entities: + - uid: 9 components: - type: Transform rot: 3.141592653589793 rad - pos: -2.5,-2.5 + pos: -2.5,-0.5 parent: 2 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 242 + color: '#0055CCFF' + - uid: 21 components: - type: Transform - pos: -2.5,-5.5 + rot: -1.5707963267948966 rad + pos: 7.5,-1.5 parent: 2 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 243 + color: '#990000FF' + - uid: 90 components: - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,-3.5 + rot: 1.5707963267948966 rad + pos: 9.5,-2.5 parent: 2 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 244 + color: '#0055CCFF' + - uid: 91 components: - type: Transform rot: 1.5707963267948966 rad - pos: 0.5,-1.5 + pos: 8.5,-2.5 parent: 2 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 245 + color: '#0055CCFF' + - uid: 96 components: - type: Transform rot: 1.5707963267948966 rad - pos: 1.5,-1.5 + pos: 3.5,-0.5 parent: 2 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 247 + color: '#990000FF' + - uid: 100 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 4.5,-1.5 + pos: -1.5,-2.5 parent: 2 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 248 + color: '#990000FF' + - uid: 108 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,-1.5 + rot: 3.141592653589793 rad + pos: -1.5,2.5 parent: 2 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 249 + color: '#990000FF' + - uid: 109 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,-1.5 + rot: 3.141592653589793 rad + pos: -1.5,3.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 254 + - uid: 124 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-0.5 + pos: 8.5,-5.5 + parent: 2 + - uid: 161 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-0.5 parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 272 + color: '#990000FF' + - uid: 218 components: - type: Transform rot: -1.5707963267948966 rad - pos: -0.5,-0.5 + pos: -2.5,-1.5 parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 290 + color: '#990000FF' + - uid: 228 components: - type: Transform - pos: -1.5,-4.5 + pos: -3.5,-3.5 parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 291 + color: '#0055CCFF' + - uid: 235 components: - type: Transform - pos: -1.5,-3.5 + rot: -1.5707963267948966 rad + pos: -3.5,-1.5 parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 292 + color: '#990000FF' + - uid: 236 components: - type: Transform - pos: -1.5,-2.5 + rot: 1.5707963267948966 rad + pos: 7.5,-2.5 parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 293 + color: '#0055CCFF' + - uid: 242 components: - type: Transform - pos: -1.5,-1.5 + rot: 3.141592653589793 rad + pos: 4.5,0.5 parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 295 + color: '#990000FF' + - uid: 244 components: - type: Transform rot: 3.141592653589793 rad - pos: 7.5,-0.5 + pos: 4.5,2.5 parent: 2 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 299 + color: '#990000FF' + - uid: 250 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 270 components: - type: Transform rot: -1.5707963267948966 rad - pos: 1.5,-0.5 + pos: 8.5,-1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 273 + components: + - type: Transform + pos: -2.5,-1.5 parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' + - uid: 287 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 288 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 290 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 294 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 299 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 300 components: - type: Transform rot: -1.5707963267948966 rad - pos: -0.5,-1.5 + pos: 10.5,-1.5 parent: 2 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#990000FF' - uid: 301 components: - type: Transform rot: -1.5707963267948966 rad + pos: 9.5,-1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 303 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 323 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 327 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 331 + components: + - type: Transform + rot: 1.5707963267948966 rad pos: 2.5,-0.5 parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 302 + color: '#990000FF' + - uid: 332 components: - type: Transform rot: 3.141592653589793 rad - pos: -2.5,-4.5 + pos: -2.5,1.5 parent: 2 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 464 + color: '#0055CCFF' + - uid: 343 components: - type: Transform - pos: 4.5,-1.5 + rot: 1.5707963267948966 rad + pos: 6.5,-2.5 parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 493 + color: '#0055CCFF' + - uid: 355 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 360 components: - type: Transform rot: 1.5707963267948966 rad - pos: -2.5,-5.5 + pos: -0.5,-2.5 parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' -- proto: GasPipeTJunction - entities: - - uid: 234 + color: '#0055CCFF' + - uid: 377 components: - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 378 + components: + - type: Transform + rot: 3.141592653589793 rad pos: 3.5,-1.5 parent: 2 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 235 + color: '#0055CCFF' + - uid: 470 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-1.5 + rot: 3.141592653589793 rad + pos: -0.5,1.5 parent: 2 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 246 + color: '#990000FF' + - uid: 489 components: - type: Transform - pos: 2.5,-1.5 + rot: 3.141592653589793 rad + pos: 3.5,1.5 parent: 2 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 253 + color: '#0055CCFF' + - uid: 493 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 518 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 551 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPipeTJunction + entities: + - uid: 8 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 97 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 105 components: - type: Transform rot: 1.5707963267948966 rad - pos: -1.5,-0.5 + pos: -1.5,0.5 parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 281 + color: '#990000FF' + - uid: 243 components: - type: Transform rot: -1.5707963267948966 rad - pos: -1.5,-5.5 + pos: -2.5,0.5 parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 297 + - uid: 253 components: - type: Transform - pos: 4.5,-0.5 + pos: -3.5,-2.5 parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' + - uid: 298 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPort entities: - uid: 278 @@ -3268,150 +3493,164 @@ entities: - type: Transform pos: 8.5,-3.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - - uid: 494 + - uid: 467 components: - type: Transform - pos: -4.5,-4.5 + rot: 1.5707963267948966 rad + pos: -4.5,1.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor - color: '#0335FCFF' -- proto: GasPressurePump - entities: - - uid: 111 + color: '#0055CCFF' + - uid: 479 components: - - type: MetaData - name: distro pump - type: Transform rot: 1.5707963267948966 rad - pos: -3.5,-5.5 + pos: -4.5,0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' +- proto: GasPressurePump + entities: - uid: 279 components: - type: Transform pos: 8.5,-4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 -- proto: GasVentPump +- proto: GasPressurePumpOnMax entities: - - uid: 274 + - uid: 104 components: - type: Transform rot: 3.141592653589793 rad - pos: 4.5,-2.5 + pos: -1.5,1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasVentPump + entities: + - uid: 88 + components: + - type: Transform + pos: 2.5,-1.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 98 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-2.5 parent: 2 - type: DeviceNetwork deviceLists: - 251 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 289 + color: '#0055CCFF' + - uid: 210 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-6.5 + rot: 1.5707963267948966 rad + pos: -4.5,-2.5 parent: 2 - type: DeviceNetwork deviceLists: - - 252 - - type: AtmosDevice - joinedGrid: 2 + - 494 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 294 + color: '#0055CCFF' + - uid: 354 components: - type: Transform rot: -1.5707963267948966 rad - pos: 7.5,-0.5 + pos: -2.5,-4.5 parent: 2 - type: DeviceNetwork deviceLists: - - 251 - - type: AtmosDevice - joinedGrid: 2 + - 494 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 298 + color: '#0055CCFF' + - uid: 357 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,0.5 + pos: -2.5,2.5 parent: 2 - type: DeviceNetwork deviceLists: - - 252 - - type: AtmosDevice - joinedGrid: 2 + - 466 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 403 + components: + - type: Transform + pos: 2.5,4.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - proto: GasVentScrubber entities: - - uid: 237 + - uid: 19 components: - type: Transform rot: 3.141592653589793 rad - pos: -2.5,-6.5 + pos: 4.5,-1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 191 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-1.5 parent: 2 - type: DeviceNetwork deviceLists: - - 252 - - type: AtmosDevice - joinedGrid: 2 + - 494 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 273 + color: '#990000FF' + - uid: 196 components: - type: Transform rot: 3.141592653589793 rad - pos: 2.5,-2.5 + pos: 11.5,-2.5 parent: 2 - type: DeviceNetwork deviceLists: - - 252 - - type: AtmosDevice - joinedGrid: 2 + - 251 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 280 + color: '#990000FF' + - uid: 345 components: - type: Transform - pos: 7.5,0.5 + rot: 3.141592653589793 rad + pos: -1.5,-4.5 parent: 2 - type: DeviceNetwork deviceLists: - - 251 - - type: AtmosDevice - joinedGrid: 2 + - 494 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 304 + color: '#990000FF' + - uid: 469 components: - type: Transform - pos: -2.5,-0.5 + pos: -0.5,2.5 parent: 2 - type: DeviceNetwork deviceLists: - - 252 - - type: AtmosDevice - joinedGrid: 2 + - 466 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#990000FF' + - uid: 532 + components: + - type: Transform + pos: 4.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - proto: GravityGeneratorMini entities: - - uid: 471 + - uid: 274 components: - type: Transform - pos: -0.5,-6.5 + pos: -0.5,2.5 parent: 2 - proto: Grille entities: @@ -3451,11 +3690,6 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,3.5 parent: 2 - - uid: 112 - components: - - type: Transform - pos: 0.5,-0.5 - parent: 2 - uid: 113 components: - type: Transform @@ -3540,16 +3774,22 @@ entities: - type: Transform pos: 12.5,-0.5 parent: 2 - - uid: 329 + - uid: 419 components: - type: Transform - pos: -5.5,-0.5 + pos: -5.5,-1.5 parent: 2 - uid: 420 components: - type: Transform pos: -2.5,-3.5 parent: 2 + - uid: 423 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-0.5 + parent: 2 - uid: 459 components: - type: Transform @@ -3577,10 +3817,10 @@ entities: parent: 2 - proto: Gyroscope entities: - - uid: 207 + - uid: 252 components: - type: Transform - pos: 6.5,-4.5 + pos: -4.5,-6.5 parent: 2 - proto: IntercomScience entities: @@ -3590,27 +3830,19 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,0.5 parent: 2 -- proto: Lamp +- proto: LockerPilot entities: - - uid: 105 + - uid: 537 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -3.3664355,-0.08267355 + pos: -4.5,-5.5 parent: 2 - proto: LockerResearchDirectorFilled entities: - uid: 422 components: - type: Transform - pos: 7.5,-0.5 - parent: 2 -- proto: LockerSalvageSpecialistFilled - entities: - - uid: 210 - components: - - type: Transform - pos: -1.5,-2.5 + pos: 7.5,0.5 parent: 2 - proto: MachineArtifactAnalyzer entities: @@ -3627,111 +3859,119 @@ entities: - type: Transform pos: 10.5,-2.5 parent: 2 -- proto: OreProcessor +- proto: NitrogenCanister entities: - - uid: 470 + - uid: 39 components: - type: Transform - pos: 1.5,-2.5 + anchored: True + pos: -4.5,1.5 parent: 2 -- proto: PaperOffice + - type: Physics + bodyType: Static +- proto: OxygenCanister entities: - - uid: 704 + - uid: 678 components: - type: Transform - pos: -2.514917,-4.8300157 + anchored: True + pos: -4.5,0.5 parent: 2 -- proto: PlasticFlapsAirtightClear + - type: Physics + bodyType: Static +- proto: PaperBin10 entities: - - uid: 455 + - uid: 226 components: - type: Transform - pos: 1.5,6.5 + pos: -0.5,-4.5 parent: 2 - - uid: 456 +- proto: PlasticFlapsAirtightClear + entities: + - uid: 375 components: - type: Transform - pos: 5.5,6.5 + pos: 1.5,3.5 parent: 2 - - uid: 684 + - uid: 376 components: - type: Transform - rot: 3.141592653589793 rad pos: 5.5,3.5 parent: 2 - - uid: 685 + - uid: 455 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,3.5 + pos: 1.5,6.5 + parent: 2 + - uid: 456 + components: + - type: Transform + pos: 5.5,6.5 parent: 2 - proto: PortableGeneratorPacmanShuttle entities: - - uid: 323 + - uid: 23 components: - type: Transform - pos: -2.5,-6.5 + pos: -2.5,2.5 parent: 2 - type: FuelGenerator on: False - type: Physics bodyType: Static - - uid: 331 + - uid: 519 components: - type: Transform - pos: -3.5,-6.5 + pos: -1.5,2.5 parent: 2 - type: FuelGenerator on: False - type: Physics bodyType: Static +- proto: PottedPlantRandom + entities: + - uid: 281 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 2 - proto: PowerCellRecharger entities: - - uid: 104 + - uid: 682 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,2.5 + rot: 1.5707963267948966 rad + pos: -4.5,-1.5 parent: 2 - proto: Poweredlight entities: - uid: 14 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,5.5 parent: 2 - - uid: 47 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - pos: -1.5,-4.5 - parent: 2 - uid: 53 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 7.5,0.5 parent: 2 - - uid: 90 + - uid: 173 components: - - type: MetaData - flags: PvsPriority - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,0.5 + rot: 3.141592653589793 rad + pos: 9.5,-8.5 parent: 2 - - uid: 173 + - uid: 410 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad - pos: 9.5,-8.5 + pos: -4.5,-6.5 + parent: 2 + - uid: 695 + components: + - type: Transform + pos: -3.5,-1.5 parent: 2 - proto: PoweredSmallLight entities: @@ -3752,6 +3992,12 @@ entities: - type: Transform pos: 11.5,2.5 parent: 2 + - uid: 404 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,0.5 + parent: 2 - uid: 699 components: - type: Transform @@ -3783,26 +4029,14 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: 4.5,-4.5 - parent: 2 -- proto: RandomDrinkGlass - entities: - - uid: 19 - components: - - type: Transform - pos: -2.5,1.5 + pos: 5.5,-4.5 parent: 2 - proto: RandomPosterLegit entities: - - uid: 474 - components: - - type: Transform - pos: -5.5,0.5 - parent: 2 - - uid: 475 + - uid: 40 components: - type: Transform - pos: -5.5,1.5 + pos: -4.5,-0.5 parent: 2 - uid: 477 components: @@ -3853,11 +4087,6 @@ entities: - type: Transform pos: 0.5,4.5 parent: 2 - - uid: 21 - components: - - type: Transform - pos: 0.5,-0.5 - parent: 2 - uid: 25 components: - type: Transform @@ -3948,25 +4177,32 @@ entities: - type: Transform pos: -1.5,-3.5 parent: 2 - - uid: 487 + - uid: 202 components: - type: Transform - pos: 12.5,-0.5 + pos: -5.5,-1.5 parent: 2 - - uid: 489 + - uid: 238 components: - type: Transform - pos: -5.5,-0.5 + rot: 3.141592653589793 rad + pos: -2.5,-3.5 parent: 2 - - uid: 686 + - uid: 421 components: - type: Transform - pos: 3.5,3.5 + rot: 3.141592653589793 rad + pos: -2.5,-0.5 parent: 2 - - uid: 784 + - uid: 487 components: - type: Transform - pos: -2.5,-3.5 + pos: 12.5,-0.5 + parent: 2 + - uid: 686 + components: + - type: Transform + pos: 3.5,3.5 parent: 2 - proto: ResearchAndDevelopmentServer entities: @@ -3975,153 +4211,221 @@ entities: - type: Transform pos: 11.5,2.5 parent: 2 +- proto: SheetPlasma + entities: + - uid: 248 + components: + - type: Transform + pos: -2.506072,2.4242704 + parent: 2 + - type: Stack + count: 15 +- proto: SheetPlasma1 + entities: + - uid: 485 + components: + - type: Transform + pos: -1.552947,2.4867704 + parent: 2 + - type: Stack + count: 15 - proto: ShuttersNormalOpen entities: - - uid: 200 + - uid: 788 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-6.5 + rot: 1.5707963267948966 rad + pos: 0.5,-5.5 parent: 2 - type: DeviceLinkSink links: - - 199 - - uid: 201 + - 787 + - uid: 789 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-5.5 + rot: 1.5707963267948966 rad + pos: 0.5,-6.5 parent: 2 - type: DeviceLinkSink links: - - 199 - - uid: 202 + - 787 + - uid: 790 components: - type: Transform - pos: -3.5,-7.5 + pos: -1.5,-7.5 parent: 2 - type: DeviceLinkSink links: - - 199 - - uid: 203 + - 787 + - uid: 791 components: - type: Transform pos: -2.5,-7.5 parent: 2 - type: DeviceLinkSink links: - - 199 - - uid: 204 + - 787 + - uid: 792 components: - type: Transform - pos: -1.5,-7.5 + pos: -3.5,-7.5 parent: 2 - type: DeviceLinkSink links: - - 199 - - uid: 205 + - 787 + - uid: 794 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-6.5 + pos: -2.5,-3.5 parent: 2 - type: DeviceLinkSink links: - - 199 - - uid: 206 + - 787 + - uid: 795 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-5.5 + pos: -1.5,-3.5 + parent: 2 + - type: DeviceLinkSink + links: + - 787 + - uid: 796 + components: + - type: Transform + pos: 2.5,6.5 + parent: 2 + - type: DeviceLinkSink + links: + - 786 + - uid: 797 + components: + - type: Transform + pos: 4.5,6.5 + parent: 2 + - type: DeviceLinkSink + links: + - 786 + - uid: 798 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-6.5 + parent: 2 + - type: DeviceLinkSink + links: + - 787 + - uid: 799 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-5.5 parent: 2 - type: DeviceLinkSink links: - - 199 + - 787 - proto: SignalButton entities: - - uid: 199 + - uid: 205 components: - - type: MetaData - name: shutters button - type: Transform - pos: -4.5,-3.5 + rot: 1.5707963267948966 rad + pos: 0.5,1.5 parent: 2 - type: DeviceLinkSource linkedPorts: - 201: - - Pressed: Toggle - 200: + 291: - Pressed: Toggle - 202: + 289: - Pressed: Toggle - 203: + 245: - Pressed: Toggle - 204: + 178: - Pressed: Toggle - 205: - - Pressed: Toggle - 206: - - Pressed: Toggle - - uid: 702 + - uid: 787 components: - - type: MetaData - name: blast door button - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,-3.5 + rot: 3.141592653589793 rad + pos: -0.5,-6.5 parent: 2 - type: DeviceLinkSource linkedPorts: - 423: + 788: + - Pressed: Toggle + 789: + - Pressed: Toggle + 790: + - Pressed: Toggle + 791: + - Pressed: Toggle + 792: + - Pressed: Toggle + 799: + - Pressed: Toggle + 798: + - Pressed: Toggle + 794: + - Pressed: Toggle + 795: - Pressed: Toggle - proto: SignalButtonDirectional entities: - - uid: 469 + - uid: 246 components: - - type: MetaData - name: blast doors button - type: Transform rot: 3.141592653589793 rad pos: 5.5,-3.5 parent: 2 - type: DeviceLinkSource linkedPorts: - 91: + 193: - Pressed: Toggle - 467: + 47: - Pressed: Toggle - 88: + 51: - Pressed: Toggle - - uid: 479 + - uid: 475 components: - - type: MetaData - name: conveyor doors button - type: Transform - pos: 3.5,6.5 + rot: 1.5707963267948966 rad + pos: 7.5,-3.5 parent: 2 - type: DeviceLinkSource linkedPorts: - 689: - - Pressed: Toggle - 688: + 54: - Pressed: Toggle - 687: + - uid: 786 + components: + - type: Transform + pos: 3.5,6.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 796: - Pressed: Toggle - 690: + 797: - Pressed: Toggle -- proto: SignBar +- proto: SignElectricalMed entities: - - uid: 257 + - uid: 480 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-2.5 + rot: 3.141592653589793 rad + pos: -3.5,3.5 + parent: 2 +- proto: SignEngine + entities: + - uid: 38 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-0.5 parent: 2 -- proto: SignMinerDock +- proto: SignEVA entities: - - uid: 480 + - uid: 483 components: - type: Transform + rot: 3.141592653589793 rad pos: 1.5,-3.5 parent: 2 - proto: SignRND @@ -4144,20 +4448,12 @@ entities: - type: Transform pos: 6.5,6.5 parent: 2 -- proto: Sink - entities: - - uid: 106 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,1.5 - parent: 2 - proto: SMESBasic entities: - - uid: 287 + - uid: 676 components: - type: Transform - pos: -4.5,-6.5 + pos: -3.5,2.5 parent: 2 - proto: SolarPanel entities: @@ -4508,66 +4804,46 @@ entities: - type: Transform pos: 0.5,-8.5 parent: 2 -- proto: SpawnPointLatejoin +- proto: SpawnDungeonLootFood entities: - - uid: 694 + - uid: 411 components: - type: Transform - pos: 3.5,-2.5 + pos: 7.483635,-2.4760072 parent: 2 -- proto: StoolBar +- proto: SpawnDungeonLootPowerCell entities: - - uid: 100 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-0.5 - parent: 2 - - uid: 101 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,0.5 - parent: 2 - - uid: 102 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,1.5 - parent: 2 - - uid: 103 + - uid: 683 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,2.5 + pos: -4.5039463,-2.0913606 parent: 2 -- proto: SubstationBasic +- proto: SpawnPointLatejoin entities: - - uid: 270 + - uid: 353 components: - type: Transform - pos: -4.5,-5.5 + pos: -2.5,-2.5 parent: 2 -- proto: SuitStorageRD +- proto: SubstationBasic entities: - - uid: 305 + - uid: 369 components: - type: Transform - pos: 7.5,0.5 + pos: -4.5,2.5 parent: 2 -- proto: SuitStorageSalv +- proto: SuitStoragePilot entities: - - uid: 421 + - uid: 547 components: - type: Transform - pos: -0.5,-2.5 + pos: -4.5,-4.5 parent: 2 -- proto: Table +- proto: SuitStorageRD entities: - - uid: 223 + - uid: 484 components: - type: Transform - rot: 1.5707963267948966 rad pos: 9.5,2.5 parent: 2 - proto: TableReinforced @@ -4577,21 +4853,11 @@ entities: - type: Transform pos: -0.5,-4.5 parent: 2 - - uid: 28 - components: - - type: Transform - pos: -0.5,-5.5 - parent: 2 - uid: 29 components: - type: Transform pos: -2.5,-4.5 parent: 2 - - uid: 37 - components: - - type: Transform - pos: -1.5,-4.5 - parent: 2 - uid: 114 components: - type: Transform @@ -4608,63 +4874,34 @@ entities: - type: Transform pos: 11.5,-2.5 parent: 2 - - uid: 327 - components: - - type: Transform - pos: -1.5,-6.5 - parent: 2 - uid: 330 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-2.5 parent: 2 -- proto: TableWoodReinforced - entities: - - uid: 38 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,-0.5 - parent: 2 - - uid: 39 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,1.5 - parent: 2 - - uid: 40 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,0.5 - parent: 2 - - uid: 54 + - uid: 364 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,2.5 + rot: 3.141592653589793 rad + pos: -0.5,-6.5 parent: 2 - - uid: 443 +- proto: TableWoodReinforced + entities: + - uid: 681 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-0.5 + rot: 1.5707963267948966 rad + pos: -4.5,-1.5 parent: 2 - - uid: 483 + - uid: 684 components: - type: Transform rot: -1.5707963267948966 rad - pos: -4.5,2.5 + pos: -4.5,-2.5 parent: 2 - proto: Thruster entities: - - uid: 179 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,-4.5 - parent: 2 - uid: 180 components: - type: Transform @@ -4727,6 +4964,12 @@ entities: - type: Transform pos: -4.5,4.5 parent: 2 + - uid: 371 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-4.5 + parent: 2 - proto: TwoWayLever entities: - uid: 18 @@ -4786,349 +5029,237 @@ entities: - Left: Forward - Right: Reverse - Middle: Off -- proto: VendingMachineBooze - entities: - - uid: 705 - components: - - type: Transform - pos: -3.5,2.5 - parent: 2 -- proto: VendingMachineCargoDrobe - entities: - - uid: 196 - components: - - type: Transform - pos: -0.5,2.5 - parent: 2 -- proto: VendingMachineSalvage - entities: - - uid: 419 - components: - - type: Transform - pos: -4.5,-2.5 - parent: 2 - proto: WallReinforced entities: - uid: 13 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,6.5 parent: 2 - uid: 30 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,-3.5 parent: 2 - uid: 31 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,-3.5 parent: 2 - uid: 35 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,-3.5 parent: 2 - uid: 36 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,-3.5 parent: 2 - uid: 49 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -5.5,-3.5 parent: 2 - uid: 50 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -5.5,-2.5 parent: 2 - - uid: 51 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-1.5 - parent: 2 - uid: 57 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,3.5 parent: 2 - uid: 58 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -3.5,3.5 parent: 2 - uid: 59 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,3.5 parent: 2 - uid: 60 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,3.5 parent: 2 - uid: 61 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,2.5 parent: 2 - uid: 62 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,1.5 parent: 2 - uid: 69 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,3.5 parent: 2 - uid: 70 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 10.5,3.5 parent: 2 - uid: 71 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 11.5,3.5 parent: 2 - uid: 73 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 11.5,-3.5 parent: 2 - uid: 77 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 12.5,-3.5 parent: 2 - uid: 78 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 12.5,-2.5 parent: 2 - uid: 79 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 12.5,-1.5 parent: 2 - uid: 81 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 12.5,0.5 parent: 2 - uid: 82 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 12.5,1.5 parent: 2 - uid: 83 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 12.5,2.5 parent: 2 - uid: 84 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 12.5,3.5 parent: 2 - uid: 95 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -5.5,0.5 parent: 2 - uid: 116 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 7.5,-5.5 parent: 2 - uid: 117 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 11.5,-5.5 parent: 2 - uid: 118 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 11.5,-6.5 parent: 2 - uid: 120 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 11.5,-8.5 parent: 2 - uid: 121 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 7.5,-6.5 parent: 2 - uid: 123 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 7.5,-8.5 parent: 2 - uid: 126 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,-4.5 parent: 2 - uid: 129 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,-7.5 parent: 2 - uid: 130 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,-7.5 parent: 2 - uid: 134 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -0.5,-7.5 parent: 2 - uid: 135 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,-7.5 parent: 2 - uid: 138 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,-4.5 parent: 2 - uid: 157 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-9.5 parent: 2 - uid: 158 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 8.5,-9.5 parent: 2 - uid: 159 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 10.5,-9.5 parent: 2 - uid: 160 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 11.5,-9.5 parent: 2 + - uid: 194 + components: + - type: Transform + pos: -5.5,-0.5 + parent: 2 - uid: 225 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 7.5,-3.5 parent: 2 - uid: 231 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,6.5 parent: 2 - uid: 446 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 3.5,6.5 @@ -5137,82 +5268,98 @@ entities: entities: - uid: 44 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,1.5 parent: 2 - uid: 45 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,0.5 parent: 2 - uid: 46 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,1.5 parent: 2 - uid: 48 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,0.5 parent: 2 - uid: 55 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,2.5 parent: 2 - uid: 56 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,2.5 parent: 2 - uid: 80 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -0.5,-3.5 parent: 2 - uid: 115 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,-2.5 parent: 2 + - uid: 170 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-0.5 + parent: 2 - uid: 212 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,-2.5 parent: 2 - uid: 217 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,-3.5 parent: 2 + - uid: 239 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-0.5 + parent: 2 + - uid: 365 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-0.5 + parent: 2 - uid: 540 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 10.5,2.5 parent: 2 + - uid: 674 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-0.5 + parent: 2 +- proto: WarningN2 + entities: + - uid: 474 + components: + - type: Transform + pos: -5.5,1.5 + parent: 2 +- proto: WarningO2 + entities: + - uid: 464 + components: + - type: Transform + pos: -5.5,0.5 + parent: 2 - proto: WarpPointShip entities: - uid: 328 @@ -5222,12 +5369,6 @@ entities: parent: 2 - proto: WindoorSecure entities: - - uid: 96 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,-0.5 - parent: 2 - uid: 214 components: - type: Transform @@ -5236,12 +5377,6 @@ entities: parent: 2 - proto: WindowReinforcedDirectional entities: - - uid: 97 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,-0.5 - parent: 2 - uid: 213 components: - type: Transform diff --git a/Resources/Prototypes/_NF/Guidebook/shipyard.yml b/Resources/Prototypes/_NF/Guidebook/shipyard.yml index 24f913b2d67..067c5b0ba4c 100644 --- a/Resources/Prototypes/_NF/Guidebook/shipyard.yml +++ b/Resources/Prototypes/_NF/Guidebook/shipyard.yml @@ -22,6 +22,7 @@ - ShipyardGasbender - ShipyardHammer - ShipyardHarbormaster + - ShipyardInvestigator - ShipyardKestrel - ShipyardKilderkin - ShipyardLantern @@ -120,6 +121,11 @@ name: guide-entry-shipyard-hammer text: "/ServerInfo/_NF/Guidebook/Shipyard/Hammer.xml" +- type: guideEntry + id: ShipyardInvestigator + name: guide-entry-shipyard-investigator + text: "/ServerInfo/_NF/Guidebook/Shipyard/Investigator.xml" + - type: guideEntry id: ShipyardKestrel name: guide-entry-shipyard-kestrel diff --git a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml index 98d0eb6f02b..827b47c6354 100644 --- a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml +++ b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml @@ -154,6 +154,18 @@ state: harbormaster scale: 1.2, 1.2 +- type: entity + parent: PosterBase + id: ShuttleMapInvestigator + name: "NR Investigator" + description: "Detailed map of a Investigator shuttle." + noSpawn: true + components: + - type: Sprite + sprite: _NF/Guidebook/shuttle_maps/128x96.rsi + state: investigator + scale: 1.2, 1.2 + - type: entity parent: PosterBase id: ShuttleMapKestrel diff --git a/Resources/Prototypes/_NF/Shipyard/investigator.yml b/Resources/Prototypes/_NF/Shipyard/investigator.yml index d91cedfda1f..42cee4094aa 100644 --- a/Resources/Prototypes/_NF/Shipyard/investigator.yml +++ b/Resources/Prototypes/_NF/Shipyard/investigator.yml @@ -1,9 +1,19 @@ +# Author Info +# GitHub: UbaserB (https://github.com/UbaserB) +# Discord: ??? + +# Maintainer Info +# GitHub: ??? +# Discord: ??? + +# Shuttle Notes: +# - type: vessel id: Investigator name: NR Investigator - description: A small salvage shuttle designed for researching artifacts, fitted with a small bar for long-distance travel. - price: 46000 - category: Small + description: A medium research shuttle designed for xenoarcheological studies. + price: 42100 # ~36540$ on mapinit + ~5480$ from 15% markup + category: Medium group: Civilian shuttlePath: /Maps/_NF/Shuttles/investigator.yml diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Investigator.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Investigator.xml new file mode 100644 index 00000000000..a1085dce5b4 --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Investigator.xml @@ -0,0 +1,107 @@ + + # INVESTIGATOR-CLASS RESEARCH SHUTTLE + + + + + + + + + + + [color=#a4885c]Ship Size:[/color] Medium + + [color=#a4885c]Recommended Crew:[/color] 2-3 + + [color=#a4885c]Power Gen Type:[/color] Solar/Plasma + + [color=#a4885c]Expeditions:[/color] None + + [color=#a4885c]IFF Console:[/color] None + + "A medium research shuttle designed for xenoarcheological studies." + + # PREFLIGHT CHECKLIST + + ## 1. Power supply + + ## 1.1. Battery units + + + + + + + - Check that the SMES unit is anchored to the floor. + - Check that the substation unit is anchored to the floor. + - Check that the APC unit's Main Breaker is toggled on. + - Check the APC unit's current Load* (W). + + ## 1.2. P.A.C.M.A.N. generator units + + + + + + - Check that the P.A.C.M.A.N. generator units are anchored to the floor. + - Check that the P.A.C.M.A.N. generator units have fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight. + - Check that the P.A.C.M.A.N. generator units are set to HV output. + - Set Target Power for 15-20** [bold]kW[/bold]. + - Ensure that P.A.C.M.A.N. generator units are enabled. + + ## 1.3. Solar panels + + + + + + - Inspect solar control computer (located at shuttle cockpit). + - Adjust panel angular velocity. + - Adjust panel angle. + + ## 2. Atmospherics + + ## 2.1. Distribution Loop + + + + + + + + + - Check that the O2 canister is anchored to connector port. + - Check that the N2 canister is anchored to connector port. + - Check that the gas mixer is set to the correct mixing ratio (21% Oxygen, 79% Nitrogen). + - Check that the gas mixer is set to 101kPa. + - Ensure that the gas mixer is enabled. + + ## 2.2. Waste Loop + + + + + + - Ensure that the waste loop pump is enabled. + - Disable Auto Mode on the Air Alarm in the Engine Room. + - Set the Air Alarm in the Engine Room to Filtering (Wide). + + ## 3. Other checks + + + + + + + - Check that the gyroscope is anchored, powered, and enabled. + - Check that the mini gravity generator is anchored, powered, and enabled. + - Check that the blast doors are closed. + + ## Sidenotes + + * - Investigator-class research ships are equipped with two APC units that can be used to appraise the ship's total power consumption. An unmodified Investigator-class ship requires 39.6 kW of power to remain operational. + + ** - Investigator-class research ships have higher power demand than standard P.A.C.M.A.N. generator unit can provide at optimal settings, however the ship comes equipped with additional P.A.C.M.A.N. generator unit and 67 solar panels that can provide up to 33.5 kW of power under ideal circumstances. Assuming that the solar array will provide a third of its maximum output power, recommended target power output for each P.A.C.M.A.N. generator unit is 15 kW. + + diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/investigator.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/investigator.png new file mode 100644 index 0000000000000000000000000000000000000000..02bbf408c9a07bd232353b429cec79ffe290582b GIT binary patch literal 1737 zcmV;)1~&PLP)Px*gGod|RCt{2oy}`qMHIl#3kisjtX#DU8bph66N+v`$i_vp(gcL^Vlj|~P&b0m zn1o77trq$x2nB5r3yrRlMK)PvV~e;k`rI@NjekH2LFghbeD}UH$2oIn=FWY0=FRzS z-km#NXFl$kGavUp06`E0K@bE%5HjNof!(?=#kDRRmyRjCO@2+F%g>ZIC%a32rn;hG zIR7dc>9v)dTtZwToWDsRn|Mw_*T7Yds&drHlloV=>&mWU%(XBkYzorpbUHq1g$B!E zBWGQCXqxyb?sPgGoeZ1?;AAwFiDQgLG!>vKj7gxv-E_m+g5?;7oHWf&9~b{B8BJy4 z7{?KHk&295I!O`MlrD!$em=OSPs4|jPxtieo?x4Nnyxcpgo#EayW-m0n<%G?J)^TJ zOq$ZiABQo;FZ@z%d#}c9v#_D9diu*<+x(7&F05dOu2am;&Kkq}Soym6*k%}alv@ad z&g$x2nznw|dYyQbXdA&2a z&1BRLq5(2TIzZ-l4FRUb5FZYEwpR0iOYa`S?vMImplz_qHxarXH*S39ys#u1AakNK z0&R%($xji{0GT5lAakh=2y?JJ(u+RQNx4eF-e_pY`r|x{Fei+dJnUmx+Fh;7L z{8;f)AE8&U@ZLUEi>}~3e*kp@$cOWfClvQV?|QBD@Mh4=1^rQUUt}dva7H>n<_xU^ ztZ%Nu`lkLEm+&8L)KL^hpmL6{=D0|wgjc8QO#^9q^R-fokD(3$UwmHAz#Dbis2{Nb zGG}OSrkFliLO<$IKtI|*k8&5#qu?CeM<6Jsl|_v0!4K{npzdQ6!~V33Xn@R-4v;xf z%mOffpRASFAD$4;-+yLe4dR@ex~2Gh^Yvfl_3b;$U<3Ym1bxx-qwjwjIJhI?1iXo* zu5`A4L|imL=12#~9O(d=6NL?+eAwv$H_m&c1ppIMcuM8-Hm*j9_o+pXd3kYQ1mgIo zd#<^=fj5*6dUl&ZN;y2wJT}!vW7xx0Ad`SOv$WGK-xCN$Q*BfZ0X~00QddC1jV9Vi z`^S+wRYAjqMBT6%d<~RWm#gZgig9rz?1l?IE5IEOyEnh3XaGD!T|;HvxM81fQ*AWP zMZouTJ<0Sdgr})CD%SyUZ=yX(*RyDN8zaz0eXVb*ZaGIdpoumb=R8er+Xkm_Ve!YJ ziy=UckgGJ+Mv4Z|WoU92*FK%03g0Kc?%T3e>EZK>_^cnE>YeT_!V+|Ye-p5YHd1B* z*n?V(I(OXy32rpeMzRzv42O_w1SzaH_{uo!vMK8TLL4;R9?1{iDRkHrWCRc!AbX?( zWKOatf>On1+J;y4xVb#H@<;EDBq@xqCK<7xZgIyZJooF03;_{v)(4>ewz_Lv=>QSX z>4V+F(sE)0M1bz;cOA!@*pG>p)NO#6s67PW@r!fo?$di`h`KVxj>)L2^5^Q?RL>@Y z*Z@_#Qo8$vx}sy>sH-qKjkEEmVRiNGYeNL-0Cene8H-E>9c8$Ed!3usrLMkdJ=)g) zP&I%}Iw9mq0a{ Date: Mon, 22 Jul 2024 02:15:01 +0000 Subject: [PATCH 005/123] Automatic Changelog (#1671) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 5d04940ff7a..1a409685a4e 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -5780,3 +5780,9 @@ Entries: message: Updated Prospector. Exterior light now works. id: 5132 time: '2024-07-22T02:12:38.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Tweak + message: Updated NR Investigator. + id: 5133 + time: '2024-07-22T02:14:06.0000000+00:00' From 72fd6d26e93e0afa6787e8c6b03a02ceab6be434 Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Mon, 22 Jul 2024 19:49:28 -0400 Subject: [PATCH 006/123] Add FuelVend vendor. (#1601) * FuelVend, rough draft * FuelVend fixes * FuelVend pt 2 * Infinite vending supplies * Infinite tank dispenser inventory * syntax fix * Revert EngiVend, gas dispensor, youtool, fuel pack * FuelVend costs for plasma, uranium, AME jars * Add welding fuel to the FuelVend, revalue uranium * fix VendPrice field * FuelVend cleanup * meta whitespace, remove CostType enum * Fix FuelVend license * rewrite VendingMachineSystem infinite comment * Plasma, uranium values, override if vend present * Fix vend order (prefer staticprice vs. stackprice) * Cleanup * Update frontier.yml * Update flatpackvend.yml * Update vending_machines.yml --------- Co-authored-by: Dvir Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../UI/VendingMachineMenu.xaml.cs | 31 ++- Content.Server/Cargo/Systems/PricingSystem.cs | 20 +- .../VendingMachines/VendingMachineSystem.cs | 14 +- .../Cargo/Components/StackPriceComponent.cs | 5 + .../SharedVendingMachineSystem.cs | 9 + .../_NF/advertisements/vending/fuelvend.ftl | 20 ++ Resources/Maps/_NF/Outpost/frontier.yml | 219 ++++++++---------- .../Catalog/Cargo/cargo_engines.yml | 6 +- .../VendingMachines/Inventories/medical.yml | 2 +- .../Objects/Materials/Sheets/other.yml | 9 + .../Entities/Objects/Power/antimatter_jar.yml | 4 + .../Objects/Specific/chemical-containers.yml | 5 + .../Advertisements/fuelvend.yml | 11 + .../Inventories/expeditionaryflatpackvend.yml | 10 +- .../Inventories/flatpackvend.yml | 49 ++-- .../VendingMachines/Inventories/fuelvend.yml | 10 + .../Structures/Machines/vending_machines.yml | 29 +++ .../VendingMachines/fuelvend.rsi/broken.png | Bin 0 -> 1061 bytes .../fuelvend.rsi/deny-unshaded.png | Bin 0 -> 528 bytes .../fuelvend.rsi/eject-unshaded.png | Bin 0 -> 750 bytes .../VendingMachines/fuelvend.rsi/meta.json | 66 ++++++ .../fuelvend.rsi/normal-unshaded.png | Bin 0 -> 511 bytes .../VendingMachines/fuelvend.rsi/off.png | Bin 0 -> 737 bytes .../VendingMachines/fuelvend.rsi/panel.png | Bin 0 -> 189 bytes 24 files changed, 355 insertions(+), 164 deletions(-) create mode 100644 Resources/Locale/en-US/_NF/advertisements/vending/fuelvend.ftl create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/fuelvend.yml create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/fuelvend.yml create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/fuelvend.rsi/broken.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/fuelvend.rsi/deny-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/fuelvend.rsi/eject-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/fuelvend.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/fuelvend.rsi/normal-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/fuelvend.rsi/off.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/fuelvend.rsi/panel.png diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs index 977d4abe3e6..d612248ab7e 100644 --- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs +++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs @@ -148,15 +148,34 @@ public void Populate(List inventory, float priceMo } } - // This block exists to allow the VendPrice flag to set a vending machine item price. - if (prototype != null && prototype.TryGetComponent(out var vendPriceComponent) && vendPriceComponent.VendPrice != 0 && cost <= (float) vendPriceComponent.VendPrice) + // Frontier: calculate vending price (this duplicates Content.Server.PricingSystem.GetVendPrice - this should be moved to Content.Shared if possible) + if (prototype != null) { - var price = (float) vendPriceComponent.VendPrice; - cost = (int) price; + var price = 0.0; + + if (prototype.TryGetComponent(out var staticComp) && staticComp.VendPrice > 0.0) + { + price += staticComp.VendPrice; + } + else if (prototype.TryGetComponent(out var stackComp) && stackComp.VendPrice > 0.0) + { + price += stackComp.VendPrice; + } + + // If there is anything that explicitly sets vending price - higher OR lower, override the base. + if (price > 0.0) { + cost = (int) price; + } } - // This block exists to allow the VendPrice flag to set a vending machine item price. + // End Frontier - vendingItem.Text = $"[${cost}] {itemName} [{entry.Amount}]"; + // New Frontiers - Unlimited vending - support items with unlimited vending stock. + // This code is licensed under AGPLv3. See AGPLv3.txt + if (entry.Amount != uint.MaxValue) + vendingItem.Text = $"[${cost}] {itemName} [{entry.Amount}]"; + else + vendingItem.Text = $"[${cost}] {itemName}"; + // End of modified code vendingItem.Icon = icon; filteredInventory.Add(i); } diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs index 7d93fa7fa01..9aa3bdf284b 100644 --- a/Content.Server/Cargo/Systems/PricingSystem.cs +++ b/Content.Server/Cargo/Systems/PricingSystem.cs @@ -17,7 +17,8 @@ using Robust.Shared.Map.Components; using Robust.Shared.Prototypes; using Robust.Shared.Utility; -using Content.Server.Materials.Components; // Frontier +using Content.Server.Materials.Components; +using System.Security.AccessControl; // Frontier namespace Content.Server.Cargo.Systems; @@ -380,18 +381,29 @@ private double GetStaticPrice(EntityPrototype prototype) return price; } + // New Frontiers - Stack Vendor Prices - Gets overwrite values for vendor prices. + // This code is licensed under AGPLv3. See AGPLv3.txt private double GetVendPrice(EntityPrototype prototype) { var price = 0.0; - if (prototype.Components.TryGetValue(_factory.GetComponentName(typeof(StaticPriceComponent)), out var vendProto)) + // Prefer static price to stack price component, take the first positive value read. + if (prototype.Components.TryGetValue(_factory.GetComponentName(typeof(StaticPriceComponent)), out var staticProto)) + { + var staticComp = (StaticPriceComponent) staticProto.Component; + if (staticComp.VendPrice > 0.0) + price += staticComp.VendPrice; + } + if (price == 0.0 && prototype.Components.TryGetValue(_factory.GetComponentName(typeof(StackPriceComponent)), out var stackProto)) { - var vendPrice = (StaticPriceComponent) vendProto.Component; - price += vendPrice.VendPrice; + var stackComp = (StackPriceComponent) stackProto.Component; + if (stackComp.VendPrice > 0.0) + price += stackComp.VendPrice; } return price; } + // End of modified code /// /// Appraises a grid, this is mainly meant to be used by yarrs. diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index 1ee7cca8e1c..f53fa7d7f21 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -357,7 +357,13 @@ public bool TryEjectVendorItem(EntityUid uid, InventoryType type, string itemId, if (TryComp(uid, out SpeakOnUIClosedComponent? speakComponent)) _speakOnUIClosed.TrySetFlag((uid, speakComponent)); - entry.Amount--; + // New Frontiers - Unlimited vending - support items with unlimited vending stock. + // This code is licensed under AGPLv3. See AGPLv3.txt + + // Infinite supplies must stay infinite. + if (entry.Amount != uint.MaxValue) + entry.Amount--; + // End of modified code UpdateVendingMachineInterfaceState(uid, vendComponent, balance); TryUpdateVisualState(uid, vendComponent); Audio.PlayPvs(vendComponent.SoundVend, uid); @@ -394,11 +400,11 @@ public void AuthorizedVend(EntityUid uid, EntityUid sender, InventoryType type, var totalPrice = (int) price; - // This block exists to allow the VendPrice flag to set a vending machine item price. + // Frontier: if any price has a vendor price, explicitly use its value - higher OR lower, over others. var priceVend = _pricing.GetEstimatedVendPrice(proto); - if (priceVend != null && totalPrice <= (int) priceVend) + if (priceVend > 0.0) // if vending price exists, overwrite it. totalPrice = (int) priceVend; - // This block exists to allow the VendPrice flag to set a vending machine item price. + // End Frontier if (IsAuthorized(uid, sender, component)) { diff --git a/Content.Shared/Cargo/Components/StackPriceComponent.cs b/Content.Shared/Cargo/Components/StackPriceComponent.cs index aa0dc839a66..4f36bafdf8c 100644 --- a/Content.Shared/Cargo/Components/StackPriceComponent.cs +++ b/Content.Shared/Cargo/Components/StackPriceComponent.cs @@ -11,4 +11,9 @@ public sealed partial class StackPriceComponent : Component /// [DataField("price", required: true)] public double Price; + /// + /// The price a full stack of this object sells for from a vendor. + /// + [DataField] + public double VendPrice; } diff --git a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs index 59f8489ac62..b72c291d360 100644 --- a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs +++ b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs @@ -118,7 +118,14 @@ private void AddInventoryFromPrototype(EntityUid uid, Dictionary? restock = (uint) Math.Floor(amount * result / chanceOfMissingStock); } + // New Frontiers - Unlimited vending - support items with unlimited vending stock. + // This code is licensed under AGPLv3. See AGPLv3.txt if (inventory.TryGetValue(id, out var entry)) + { + // Frontier: Max value is reserved for unlimited items, this should not be restocked. + if (entry.Amount == uint.MaxValue) + continue; + // Prevent a machine's stock from going over three times // the prototype's normal amount. This is an arbitrary // number and meant to be a convenience for someone @@ -126,8 +133,10 @@ private void AddInventoryFromPrototype(EntityUid uid, Dictionary? // all the items just to restock one empty slot without // losing the rest of the restock. entry.Amount = Math.Min(entry.Amount + amount, 3 * restock); + } else inventory.Add(id, new VendingMachineInventoryEntry(type, id, restock)); + // End of modified code } } } diff --git a/Resources/Locale/en-US/_NF/advertisements/vending/fuelvend.ftl b/Resources/Locale/en-US/_NF/advertisements/vending/fuelvend.ftl new file mode 100644 index 00000000000..64ff70dd3ba --- /dev/null +++ b/Resources/Locale/en-US/_NF/advertisements/vending/fuelvend.ftl @@ -0,0 +1,20 @@ +advertisement-fuelvend-1 = LOAD THE SPACESHIP WITH THE ROCKET FUEL! +advertisement-fuelvend-2 = In a rush? Get some fuel! +advertisement-fuelvend-3 = We've got rates you won't believe are legal! +advertisement-fuelvend-4 = Checked the pumps lately? +advertisement-fuelvend-5 = Headed out? Fuel up! +advertisement-fuelvend-6 = Fuel up! Coal-free since 2520. +advertisement-fuelvend-7 = GAS, GAS, GAS! +advertisement-fuelvend-8 = Plasma? Uranium? AME? Got you covered. +advertisement-fuelvend-9 = Need energy? No time? Buy some fuel! +advertisement-fuelvend-10 = Locally sourced? Ha. Get some fuel. +advertisement-fuelvend-11 = Is your generator running? Better go and fuel it! +advertisement-fuelvend-12 = What's the anti-matter? No fuel? + +goodbye-fuelvend-1 = Another dissatisfied customer. +goodbye-fuelvend-2 = You'll be back. +goodbye-fuelvend-3 = Hit the road, you're taking up my time. +goodbye-fuelvend-4 = Don't let the airlock hit you on the way out. +goodbye-fuelvend-5 = Best of luck out there, chump. +goodbye-fuelvend-6 = Yeah, yeah, get lost. +goodbye-fuelvend-7 = You're still here? Huh. diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml index dc097232da7..3b1042c70b8 100644 --- a/Resources/Maps/_NF/Outpost/frontier.yml +++ b/Resources/Maps/_NF/Outpost/frontier.yml @@ -77,7 +77,7 @@ entities: version: 6 -3,0: ind: -3,0 - tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbwAAAAABfQAAAAAAXAAAAAACXAAAAAADXAAAAAACXAAAAAACXAAAAAABXAAAAAABXAAAAAAAXAAAAAADXAAAAAABXAAAAAACXAAAAAAAXAAAAAABXAAAAAABXAAAAAACbwAAAAABawAAAAAAXAAAAAACXAAAAAAAXAAAAAACXAAAAAAAXAAAAAAAXAAAAAACXAAAAAADXAAAAAABXAAAAAACXAAAAAACXAAAAAABXAAAAAAAXAAAAAAAXAAAAAABbwAAAAAAawAAAAAAXAAAAAAAXAAAAAADXAAAAAACXAAAAAACXAAAAAADXAAAAAACXAAAAAADXAAAAAABXAAAAAAAXAAAAAADXAAAAAACXAAAAAABXAAAAAABXAAAAAADbwAAAAACawAAAAAAXAAAAAAAXAAAAAABXAAAAAADXAAAAAACXAAAAAAAXAAAAAABXAAAAAACXAAAAAADXAAAAAAAXAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAXAAAAAADbwAAAAAAfQAAAAAAXAAAAAADXAAAAAAAXAAAAAAAXAAAAAABXAAAAAABXAAAAAADXAAAAAABXAAAAAABXAAAAAAAXAAAAAABXAAAAAABXAAAAAAAXAAAAAAAXAAAAAACbwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAawAAAAAAawAAAAAAXAAAAAADXAAAAAAAfQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAbwAAAAAAawAAAAAAbwAAAAAAbwAAAAADfQAAAAAAfQAAAAAAfQAAAAAAawAAAAAAawAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbwAAAAACawAAAAAAIgAAAAABIgAAAAADIgAAAAADfQAAAAAAawAAAAAAXAAAAAABXAAAAAACawAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIgAAAAAAIgAAAAAAIgAAAAADfQAAAAAAawAAAAAAXAAAAAADXAAAAAABawAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAIgAAAAADIgAAAAADIgAAAAACfQAAAAAAfQAAAAAAawAAAAAAawAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAIgAAAAABIgAAAAADIgAAAAABfQAAAAAAXAAAAAADXAAAAAADXAAAAAAAXAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAawAAAAAAfQAAAAAAfQAAAAAAXAAAAAAAXAAAAAAAXAAAAAABXAAAAAABXAAAAAABXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAHgAAAAAAfQAAAAAAYwAAAAAAYwAAAAAAYwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAawAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbwAAAAAAawAAAAAAYwAAAAAAYwAAAAAAYwAAAAAAYwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbwAAAAABfQAAAAAAYwAAAAAAYwAAAAAAYwAAAAAAYwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA + tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbwAAAAABfQAAAAAAXAAAAAACXAAAAAADXAAAAAACXAAAAAACXAAAAAABXAAAAAABXAAAAAAAXAAAAAADXAAAAAABXAAAAAACXAAAAAAAXAAAAAABXAAAAAABXAAAAAACbwAAAAABawAAAAAAXAAAAAACXAAAAAAAXAAAAAACXAAAAAAAXAAAAAAAXAAAAAACXAAAAAADXAAAAAABXAAAAAACXAAAAAACXAAAAAABXAAAAAAAXAAAAAAAXAAAAAABbwAAAAAAawAAAAAAXAAAAAAAXAAAAAADXAAAAAACXAAAAAACXAAAAAADXAAAAAACXAAAAAADXAAAAAABXAAAAAAAXAAAAAADXAAAAAACXAAAAAABXAAAAAABXAAAAAADbwAAAAACawAAAAAAXAAAAAAAXAAAAAABXAAAAAADXAAAAAACXAAAAAAAXAAAAAABXAAAAAACXAAAAAADXAAAAAAAXAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAXAAAAAADbwAAAAAAfQAAAAAAXAAAAAADXAAAAAAAXAAAAAAAXAAAAAABXAAAAAABXAAAAAADXAAAAAABXAAAAAABXAAAAAAAXAAAAAABXAAAAAABXAAAAAAAXAAAAAAAXAAAAAACbwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAawAAAAAAawAAAAAAXAAAAAADXAAAAAAAfQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAbwAAAAAAawAAAAAAbwAAAAAAbwAAAAADfQAAAAAAfQAAAAAAfQAAAAAAawAAAAAAawAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbwAAAAACawAAAAAAIgAAAAABIgAAAAADIgAAAAADfQAAAAAAawAAAAAAXAAAAAABXAAAAAACawAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIgAAAAAAIgAAAAAAIgAAAAADfQAAAAAAawAAAAAAXAAAAAADXAAAAAABawAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAIgAAAAADIgAAAAADIgAAAAACfQAAAAAAfQAAAAAAawAAAAAAawAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAIgAAAAABIgAAAAADIgAAAAABfQAAAAAAXAAAAAADXAAAAAADXAAAAAAAXAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAawAAAAAAfQAAAAAAfQAAAAAAXAAAAAAAXAAAAAAAXAAAAAABXAAAAAABXAAAAAABXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAHgAAAAAAfQAAAAAAYwAAAAAAYwAAAAAAYwAAAAAAfQAAAAAAfQAAAAAAawAAAAAAawAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbwAAAAAAawAAAAAAYwAAAAAAYwAAAAAAYwAAAAAAYwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbwAAAAABfQAAAAAAYwAAAAAAYwAAAAAAYwAAAAAAYwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA version: 6 -4,0: ind: -4,0 @@ -4340,18 +4340,21 @@ entities: parent: 2173 - proto: AirlockFrontierCommandEngineeringGlassLocked entities: - - uid: 998 + - uid: 723 components: - type: Transform - rot: 3.141592653589793 rad pos: -40.5,13.5 parent: 2173 - - uid: 1918 + - uid: 747 components: - type: Transform - rot: 1.5707963267948966 rad pos: -39.5,13.5 parent: 2173 + - uid: 748 + components: + - type: Transform + pos: -40.5,10.5 + parent: 2173 - uid: 1950 components: - type: Transform @@ -4363,11 +4366,6 @@ entities: - type: Transform pos: -25.5,12.5 parent: 2173 - - uid: 4081 - components: - - type: Transform - pos: -40.5,10.5 - parent: 2173 - proto: AirlockFrontierCommandEngineeringLocked entities: - uid: 712 @@ -14647,13 +14645,6 @@ entities: - type: DeviceLinkSink links: - 6145 -- proto: CrateSpaceCleaner - entities: - - uid: 748 - components: - - type: Transform - pos: -5.5,27.5 - parent: 2173 - proto: CrateTrashCart entities: - uid: 1990 @@ -14661,27 +14652,6 @@ entities: - type: Transform pos: 48.5,15.5 parent: 2173 -- proto: CrateVendingMachineRestockEngineeringFilled - entities: - - uid: 749 - components: - - type: Transform - pos: -4.5,28.5 - parent: 2173 -- proto: CrateVendingMachineRestockMedicalFilled - entities: - - uid: 723 - components: - - type: Transform - pos: -3.5,27.5 - parent: 2173 -- proto: CrateVendingMachineRestockVendomatFilled - entities: - - uid: 747 - components: - - type: Transform - pos: -5.5,28.5 - parent: 2173 - proto: CrewMonitoringServer entities: - uid: 3055 @@ -19062,14 +19032,6 @@ entities: parent: 2173 - type: AtmosPipeColor color: '#990000FF' - - uid: 925 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -33.5,9.5 - parent: 2173 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 961 components: - type: Transform @@ -19208,14 +19170,6 @@ entities: parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 1146 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -33.5,11.5 - parent: 2173 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 1155 components: - type: Transform @@ -19401,6 +19355,11 @@ entities: parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 2037 + components: + - type: Transform + pos: -33.5,10.5 + parent: 2173 - uid: 2152 components: - type: Transform @@ -24086,6 +24045,12 @@ entities: parent: 2173 - type: AtmosPipeColor color: '#990000FF' + - uid: 1918 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -33.5,9.5 + parent: 2173 - uid: 1938 components: - type: Transform @@ -24101,6 +24066,11 @@ entities: parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 2015 + components: + - type: Transform + pos: -33.5,11.5 + parent: 2173 - uid: 2516 components: - type: Transform @@ -27975,13 +27945,6 @@ entities: - type: Transform pos: -36.5,15.5 parent: 2173 -- proto: NonLethalVendingMachine - entities: - - uid: 2015 - components: - - type: Transform - pos: 6.5,6.5 - parent: 2173 - proto: NoticeBoardNF entities: - uid: 1029 @@ -29044,6 +29007,30 @@ entities: parent: 2173 - proto: Rack entities: + - uid: 749 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,28.5 + parent: 2173 + - uid: 925 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,27.5 + parent: 2173 + - uid: 998 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,27.5 + parent: 2173 + - uid: 1146 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,28.5 + parent: 2173 - uid: 1716 components: - type: Transform @@ -31407,6 +31394,47 @@ entities: parent: 2173 - proto: SignDirectionalCryo entities: + - uid: 2029 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -27.501318,5.932657 + parent: 2173 + - uid: 2030 + components: + - type: Transform + pos: 1.4989707,19.709929 + parent: 2173 + - uid: 2031 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.4997387,7.93929 + parent: 2173 + - uid: 2032 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.502116,7.9334483 + parent: 2173 + - uid: 2033 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 26.500662,5.9277573 + parent: 2173 + - uid: 2035 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 50.500927,4.9328446 + parent: 2173 + - uid: 2036 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -46.502876,5.935037 + parent: 2173 - uid: 5696 components: - type: Transform @@ -31466,6 +31494,12 @@ entities: - type: Transform pos: 4.502248,29.284199 parent: 2173 + - uid: 2034 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 26.531145,26.61362 + parent: 2173 - uid: 5612 components: - type: Transform @@ -31484,62 +31518,6 @@ entities: rot: 3.141592653589793 rad pos: 1.4990518,19.281113 parent: 2173 -- proto: SignDirectionalSupply - entities: - - uid: 2604 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -27.500845,5.936363 - parent: 2173 - - uid: 5603 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -6.499854,7.939665 - parent: 2173 - - uid: 5608 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.501395,7.9372363 - parent: 2173 - - uid: 5609 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 26.500668,5.93005 - parent: 2173 - - uid: 5618 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.499052,19.719688 - parent: 2173 - - uid: 5619 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 54.498882,23.283236 - parent: 2173 - - uid: 6156 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 50.501198,4.927295 - parent: 2173 - - uid: 6161 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -46.498417,5.9381766 - parent: 2173 - - uid: 6164 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 26.527615,26.622704 - parent: 2173 - proto: SignEngineering entities: - uid: 5698 @@ -33209,6 +33187,13 @@ entities: - type: Transform pos: -11.5,6.5 parent: 2173 +- proto: VendingMachineFuelVend + entities: + - uid: 2028 + components: + - type: Transform + pos: 6.5,6.5 + parent: 2173 - proto: VendingMachineGames entities: - uid: 1974 diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml index 73338525805..e25a81e9364 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml @@ -4,7 +4,7 @@ sprite: Objects/Power/AME/ame_jar.rsi state: jar product: CrateEngineeringAMEShielding - cost: 10000 + cost: 15000 # Frontier - Up the price category: Engineering group: market @@ -14,7 +14,7 @@ sprite: Objects/Power/AME/ame_jar.rsi state: jar product: CrateEngineeringAMEJar - cost: 2000 + cost: 10000 # Frontier - Up the price category: cargoproduct-category-name-engineering group: market @@ -24,7 +24,7 @@ sprite: Structures/Power/Generation/ame.rsi state: control product: CrateEngineeringAMEControl - cost: 4000 + cost: 6000 # Frontier - Up the price category: cargoproduct-category-name-engineering group: market diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml index ad8c9790f05..45fee417b7b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml @@ -10,7 +10,7 @@ BodyBagFolded: 12 ClothingEyesHudMedical: 2 ClothingEyesEyepatchHudMedical: 2 - MedicalTrackingImplanter: 20 # Frontier SadTromboneImplanter: 10 # Frontier BikeHornImplanter: 10 # Frontier LightImplanter: 10 # Frontier + MedicalTrackingImplanter: 4294967295 # Frontier - infinite \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml index ea3c1fd2583..503f3573e26 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml @@ -73,6 +73,8 @@ - type: Stack count: 1 +# New Frontiers - FuelVend - Expensive plasma sheets +# This code is licensed under AGPLv3. See LICENSE - type: entity parent: SheetOtherBase id: SheetPlasma @@ -112,6 +114,8 @@ - Sheet - type: StackPrice price: 10 + vendPrice: 1200 # Frontier: FuelVend price +# End of modified code - type: entity parent: SheetPlasma @@ -187,6 +191,8 @@ - type: Stack count: 1 +# New Frontiers - FuelVend - Expensive uranium sheets +# This code is licensed under AGPLv3. See LICENSE - type: entity parent: [SheetOtherBase, FoodBase] id: SheetUranium @@ -226,6 +232,9 @@ - ReagentId: Radium Quantity: 2 canReact: false + - type: StaticPrice # Frontier: FuelVend price (use inheritance from FoodBase) + vendPrice: 2500 # Frontier: FuelVend price +# End of modified code - type: entity parent: SheetUranium diff --git a/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml b/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml index 28573c5e638..2aa4d2e178a 100644 --- a/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml +++ b/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml @@ -1,3 +1,5 @@ +# New Frontiers - FuelVend - Expensive AME jars +# This code is licensed under AGPLv3. See LICENSE - type: entity parent: BaseItem id: AmeJar @@ -13,5 +15,7 @@ - type: AmeFuelContainer - type: StaticPrice price: 400 + vendPrice: 4000 # Frontier: FuelVend price - type: GuideHelp guides: [ AME, Power ] +# End of modified code diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml index 4a740ef6852..ec90ff277f4 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml @@ -453,6 +453,8 @@ - ReagentId: PlantBGone Quantity: 200 +# New Frontiers - FuelVend - Expensive welding fuel +# This code is licensed under AGPLv3. See LICENSE - type: entity parent: Jug name: jug @@ -468,3 +470,6 @@ reagents: - ReagentId: WeldingFuel Quantity: 200 + - type: StaticPrice # Frontier + vendPrice: 500 # Frontier +# End of modified code diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/fuelvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/fuelvend.yml new file mode 100644 index 00000000000..9e60485a050 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/fuelvend.yml @@ -0,0 +1,11 @@ +- type: localizedDataset + id: FuelVendAds + values: + prefix: advertisement-fuelvend- + count: 12 + +- type: localizedDataset + id: FuelVendGoodbyes + values: + prefix: goodbye-fuelvend- + count: 7 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/expeditionaryflatpackvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/expeditionaryflatpackvend.yml index 01494e6bc10..b9283607ef6 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/expeditionaryflatpackvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/expeditionaryflatpackvend.yml @@ -1,9 +1,9 @@ - type: vendingMachineInventory id: ExpeditionaryFlatpackVendInventory startingInventory: - ComputerCrewMonitoringFlatpack: 12 - TelecomServerFlatpack: 12 - PowerCellRechargerFlatpack: 16 - WeaponCapacitorRechargerFlatpack: 16 - BorgChargerFlatpack: 16 + ComputerCrewMonitoringFlatpack: 4294967295 # Infinite + TelecomServerFlatpack: 4294967295 # Infinite + PowerCellRechargerFlatpack: 4294967295 # Infinite + WeaponCapacitorRechargerFlatpack: 4294967295 # Infinite + BorgChargerFlatpack: 4294967295 # Infinite ComputerIFFFlatpack: 1 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml index a2430466621..ed27a431dbb 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml @@ -1,27 +1,28 @@ - type: vendingMachineInventory id: FlatpackVendInventory startingInventory: - ShuttleGunKineticFlatpack: 12 - OreProcessorFlatpack: 10 - AutolatheFlatpack: 6 - HydroponicsTrayEmptyFlatpack: 16 - ExosuitFabricatorFlatpack: 4 - ProtolatheFlatpack: 6 - CircuitImprinterFlatpack: 6 - ResearchAndDevelopmentServerFlatpack: 6 - ScienceTechFabFlatpack: 4 - EngineeringTechFabFlatpack: 4 - SalvageTechfabNFFlatpack: 4 - ServiceTechFabFlatpack: 4 - MedicalTechFabFlatpack: 4 - MaterialReclaimerFlatpack: 4 - UniformPrinterFlatpack: 6 - TilePrinterNFFlatpack: 8 - PowerCellRechargerFlatpack: 8 - WeaponCapacitorRechargerFlatpack: 8 - BorgChargerFlatpack: 8 - MachineFlatpackerFlatpack: 8 - AirlockFlatpack: 20 - AirlockGlassFlatpack: 20 - AirlockShuttleFlatpack: 20 - AirlockGlassShuttleFlatpack: 20 + ShuttleGunKineticFlatpack: 4294967295 # Infinite + OreProcessorFlatpack: 4294967295 # Infinite + AutolatheFlatpack: 4294967295 # Infinite +# HydroponicsTrayEmptyFlatpack: 16 # Get a food ship, or an atmost ship + ExosuitFabricatorFlatpack: 4294967295 # Infinite + ProtolatheFlatpack: 4294967295 # Infinite + CircuitImprinterFlatpack: 4294967295 # Infinite + ResearchAndDevelopmentServerFlatpack: 4294967295 # Infinite + ComputerResearchAndDevelopmentFlatpack: 4294967295 # Infinite + ScienceTechFabFlatpack: 4294967295 # Infinite + EngineeringTechFabFlatpack: 4294967295 # Infinite + SalvageTechfabNFFlatpack: 4294967295 # Infinite + ServiceTechFabFlatpack: 4294967295 # Infinite +# MedicalTechFabFlatpack: 4294967295 # Infinite + MaterialReclaimerFlatpack: 4294967295 # Infinite +# UniformPrinterFlatpack: 6 # Loadouts are a thing + TilePrinterNFFlatpack: 4294967295 # Infinite + PowerCellRechargerFlatpack: 4294967295 # Infinite + WeaponCapacitorRechargerFlatpack: 4294967295 # Infinite + BorgChargerFlatpack: 4294967295 # Infinite + MachineFlatpackerFlatpack: 4294967295 # Infinite + AirlockFlatpack: 4294967295 # Infinite + AirlockGlassFlatpack: 4294967295 # Infinite + AirlockShuttleFlatpack: 4294967295 # Infinite + AirlockGlassShuttleFlatpack: 4294967295 # Infinite diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/fuelvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/fuelvend.yml new file mode 100644 index 00000000000..c96aed7c304 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/fuelvend.yml @@ -0,0 +1,10 @@ +# New Frontiers - This file is licensed under AGPLv3 +# Copyright (c) 2024 New Frontiers Contributors +# See AGPLv3.txt for details. +- type: vendingMachineInventory + id: VendingMachineFuelVendInventory + startingInventory: + SheetPlasma: 4294967295 # Infinite + SheetUranium: 4294967295 # Infinite + AmeJar: 4294967295 # Infinite + JugWeldingFuel: 4294967295 # Infinite diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index 2b164036534..9301f074536 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -570,3 +570,32 @@ radius: 1.1 energy: 1.2 color: "#4b93ad" + +- type: entity + parent: [BaseStructureDisableToolUse, BaseStructureIndestructible, VendingMachine] + id: VendingMachineFuelVend + name: FuelVend + description: A vendor selling fuel for ship engines. Smells like ozone. + components: + - type: VendingMachine + pack: VendingMachineFuelVendInventory + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + denyState: deny-unshaded + ejectDelay: 2.1 + - type: Advertise + pack: FuelVendAds + - type: SpeakOnUIClosed + pack: FuelVendGoodbyes + - type: Sprite + sprite: _NF/Structures/Machines/VendingMachines/fuelvend.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/fuelvend.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/fuelvend.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..bf0055e673bc982ba4b96f31d24db656f70ac197 GIT binary patch literal 1061 zcmV+=1ls$FP)5pVVo73-y>Ac}Y>NCiE3@~B`CFCvN> z@L~@=c$Ru8Rs=)wB!rS}AjCA=o!y<8oqunQhsm4FpEudvUi`u`Z{K_KzTe;X{obFM zA%XLsUOr$-INLpDA8#nzf}TgEQB}6x{Ahg!K+86~dFdjKJ(x;FZ>I}DV|gi8pRJp% z&-2rd*W&*VO~q7z#_|&Ve@vyQamYE4MNxDr-2L+o3#S%S!lo0@2d{18IW|knC)wKA zWTCal((*|V#}9P+*)wcyY~t@Y$G$T=szJX<0C3{5hjIQMu(h!n*L8O~0MVcY=UZ&a0nJBG6%RD3(R?D^o*iRuVF|0B&W)6S&b=%0ZB-*wXfH?`fi?BBDWFsEIYP53baE%6Ck4s4}}=DDkD+6A14#ia$ErBW{tQ!wE#&9 zU=M8UL4I?RQ;@~&&%OoV#ZRtq=bK*u@O_tHxW{uJzMbl;Ov0>{_4#^^SkAe2m;*^v zYAq_Y764DZ^D<9A^CZD=PZ{Lc<2VcHL{?N1x^Bc}=|H8{Qi@19;0Ff``om)d)aUER zlAET3Wwx=*Hm2#&ym&6$fk5o{2oJv{Ao@Phn(7bOoPhg#_a2zM5MBs( f9jNAA{NM2(opaILW7PxH00000NkvXXu0mjfkqiL3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/fuelvend.rsi/deny-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/fuelvend.rsi/deny-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..c412a3604e73fe678edade3c5b5279e7b1d46875 GIT binary patch literal 528 zcmV+r0`L8aP)RGfIKeI*ggSJv|3Jt71?|w?c5&(~+#nR(I=PhY9ooO3qx}PPaIoOe zrGX0^2X=D04rkQMndW{pC&K%H;Q7MKOY)M-_X!XLLF|~4%JB5^9i(-3cXO=tr{Yj$ zs8s7|ePu!!fbTH?!0CzJ$>*1W0K^Q~HN6x5V;}%A1N=zu#P{ z9k`M205F+_ZLTj%|F;e09N^9fjczL(Ie^*27;xFLZQ5=V1h8!v)XVDu&TH#)BF`?+ z=D@Z!mvh2+4#;Z`M1M1y16IEkTXP_q6aMWuZNK^eL=McKIRL=k(ni=Sv&{YP!AVH( zf+VA>R1E}>bzc(%K@h~=p}mx*!N{f5G};S^kY;}|p-ZXBOR3dw0aywXiAFcH85bta zP7U?md0d*6OPCJaT*4%gIF$wIrcf1)@T=kOBn&Sc~=9#5aU$A-iC6&E=dh zUZ9ZIT+RujIdJu;FVnp(%XC?CKwGR%Q>rymtls%aNbiD=9HYw>Kv92K5X3K0ctC&- SGS4vp0000R~Q(WDm`5sLn`LHjgIYaHsHCP z;r{dg{vQiuFUd{gKid1?U5;X0jA)XmkokuS0T#zQ%;)`=e4Ks4ewu&FPqAm;t!w5A zC|RuN`nWZ$^ZxsSyMcX^1sa?6muA#x);272uxV;uzm=ckV*!f>zx#v7@w=ERTC!)f zD}VTSOv*uN#um0mf)+olCTwRr)o|!LyY4==D;!q$<3)}BOSP|H5IJ~o{bP>3nh!ZH zn5)V#p7O7}u6(oT$?I#gW}VlSTh0EZ>*(?0+G0^7z_4W~M!rjdj)R zQ%br&q#d1{d-n|IrnR$!8*N^v`Aq=wxKpCHOJ*}{%A038Aq&hk|IB2(X7*Q+72+Qv z%v;RaE9Nn!EWSMDf~aDW-&)3f9M=u<;}Y&97%FWs+nst(rort+fWv$C6myd^jKxw? zM*hG+5x9Q%`Frt+^51@U-Y7oLVq~A#%v8L+;J!d9ZlZXN?oGgyDM z+1bTyJOA@Ii^lDTyXqz}6(&2eu3!-T!Oit#+w+I-**BRRZ~(*eQI*d7f4ipTt^H>6 z$$G)d`>{43tRJXki*3()`RvLX&duFH%b6-&HANRNg*0#lG~Qp}u+Fyp3iD2BkvsCh z*id-KZycNU_)|&dG@qLW-pg_V7_}Tg_AFpB4|wpY>cOL~jvvQ=Fz#sd_?^8XeiJZd OGI+ZBxvXIuw7nbD`d7zmI8>eTFy7E7pXUW#QP@RI_q zo&drCa?mkUaH2rcZ=<;Gs2d|4PFJxE1j-7?aC3*{LdQ5!AX;o53zQ2^6_|}OoeS8L z0xFvuZ5_)%z@~s4bbwX+cyfUDe;IThuq!~Tr+p9Ta{knI+lTe&7hEBur5dl&I}4F(TkHh$0GtRM3l;9u=(KL=Uow1la064cuFf2Kec zM~07~sRagx4gz@Wc2F;drWP6#$ma@tT3usPE4H1i9prO05_J{$@Nj{cBoU3qh{e2J zB&pA}ZQJs+31M*Y>FuV;{gVq2*wl)|B#EOV!%YL#L+;mxYtKK=zz&`&o4qv?7!x3{ zf1saeG}d-S-QnBI z_rUHMVV2f8b^p4jZ%>!NIi%vrH1T8_fa5pLapL3%W@)|tm}Y@Gg)Apr+fg8%OxGph zQ9zg#w$xHr$rVLMQ?h7E7DdrHJUQx7U`s6_%-S{#r3M`N0X7ytvO$XqIPm{u+J!79 z+-2}9;D<*6%dVj7qO0VZW}qoq*DfrrdKA!gfn|rZ1dej)smrb}dH(e7yTO=HYCu_9 zL6#Hv%UKA61DD3aCm_oS?%ll>@IQI>I^YY10KmKD<(B$+2$;HrQ8KZt&I-}81SNeN zAq>8J&Ia0rFo={)Y`Xyg2W8vl=l35-QeV?MA=C=bvIOO7|rwWOwv9G4KL&AzH{ zN7Q0^qF2n_tJt9{XPZs5DTHaafMCJOl_vutA~?2BZaI0lMkCyyy$+Wqq%l0#ul$J`qyUuNBVQG2su$7O&bK@1_paupnDiRUHx3vIVCg!0LMH=J^%m! literal 0 HcmV?d00001 From 4d5538471a071030d42f13bd1a2668cdb0eecf57 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 22 Jul 2024 23:49:55 +0000 Subject: [PATCH 007/123] Automatic Changelog (#1601) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1a409685a4e..ab0456d3060 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -5786,3 +5786,11 @@ Entries: message: Updated NR Investigator. id: 5133 time: '2024-07-22T02:14:06.0000000+00:00' +- author: whatston3 + changes: + - type: Add + message: A FuelVend machine has been added to Frontier Outpost. + - type: Tweak + message: Tools and flatpacks now have unlimited inventory. + id: 5134 + time: '2024-07-22T23:49:28.0000000+00:00' From 646e63795c3d6fb4d0af00e9ee2dbb4f99dacdb8 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Tue, 23 Jul 2024 19:02:47 +0300 Subject: [PATCH 008/123] Added FuelVend to The Lodge and Grifty's (#1722) --- .../_NF/navmap-beacons/station-beacons.ftl | 14 +- Resources/Maps/_NF/POI/grifty.yml | 91 +++++----- Resources/Maps/_NF/POI/lodge.yml | 168 ++++++++++-------- .../Objects/Devices/station_beacon.yml | 93 +++++++++- 4 files changed, 247 insertions(+), 119 deletions(-) diff --git a/Resources/Locale/en-US/_NF/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/_NF/navmap-beacons/station-beacons.ftl index a16e78272f9..a87278102c8 100644 --- a/Resources/Locale/en-US/_NF/navmap-beacons/station-beacons.ftl +++ b/Resources/Locale/en-US/_NF/navmap-beacons/station-beacons.ftl @@ -14,4 +14,16 @@ station-beacon-dock = Dock station-beacon-nfsd = NFSD station-beacon-nfsd-brig = Brig station-beacon-cafe = Cafe -station-beacon-conference = Conference \ No newline at end of file +station-beacon-conference = Conference +station-beacon-office-mercenary = Office +station-beacon-shooting-range-mercenary = Shooting Range + +station-beacon-dock-one = Dock 1 +station-beacon-dock-two = Dock 2 +station-beacon-dock-three = Dock 3 +station-beacon-dock-four = Dock 4 +station-beacon-dock-five = Dock 5 +station-beacon-dock-six = Dock 6 +station-beacon-dock-six-a = Dock 6a +station-beacon-dock-six-b = Dock 6b +station-beacon-dock-six-c = Dock 6c \ No newline at end of file diff --git a/Resources/Maps/_NF/POI/grifty.yml b/Resources/Maps/_NF/POI/grifty.yml index a87573a7893..a42cc2b31f2 100644 --- a/Resources/Maps/_NF/POI/grifty.yml +++ b/Resources/Maps/_NF/POI/grifty.yml @@ -1563,11 +1563,6 @@ entities: enabled: False - proto: BookshelfFilled entities: - - uid: 672 - components: - - type: Transform - pos: 9.5,4.5 - parent: 1 - uid: 674 components: - type: Transform @@ -4343,7 +4338,7 @@ entities: pos: -8.5,7.5 parent: 1 - type: Door - secondsUntilStateChange: -5460.6416 + secondsUntilStateChange: -5908.0503 state: Opening - proto: Lamp entities: @@ -4471,8 +4466,8 @@ entities: immutable: False temperature: 293.1497 moles: - - 1.8856695 - - 7.0937095 + - 1.8968438 + - 7.1357465 - 0 - 0 - 0 @@ -4489,13 +4484,13 @@ entities: showEnts: False occludes: True ents: - - 519 - - 518 - - 517 - - 516 - - 515 - - 514 - 513 + - 514 + - 515 + - 516 + - 517 + - 518 + - 519 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -4744,7 +4739,7 @@ entities: parent: 1 - proto: PosterLegitSMFires entities: - - uid: 562 + - uid: 6 components: - type: Transform pos: -5.5,7.5 @@ -5509,15 +5504,16 @@ entities: parent: 1 - proto: SpawnMobArgocyteSmall entities: - - uid: 682 + - uid: 507 components: - type: Transform - pos: 6.5,4.5 + rot: 3.141592653589793 rad + pos: -0.5,3.5 parent: 1 - - uid: 683 + - uid: 682 components: - type: Transform - pos: -0.5,3.5 + pos: 6.5,4.5 parent: 1 - uid: 684 components: @@ -5666,6 +5662,13 @@ entities: - type: Transform pos: -1.5,3.5 parent: 1 +- proto: VendingMachineFuelVend + entities: + - uid: 5 + components: + - type: Transform + pos: 9.5,4.5 + parent: 1 - proto: VendingMachineRestockBooze entities: - uid: 624 @@ -6036,6 +6039,31 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,-6.5 parent: 1 +- proto: WallReinforcedDiagonal + entities: + - uid: 508 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,0.5 + parent: 1 + - uid: 562 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,7.5 + parent: 1 + - uid: 605 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,0.5 + parent: 1 + - uid: 634 + components: + - type: Transform + pos: -10.5,7.5 + parent: 1 - proto: WallSolid entities: - uid: 67 @@ -6135,31 +6163,6 @@ entities: - type: Transform pos: -7.5,5.5 parent: 1 -- proto: WallSolidDiagonal - entities: - - uid: 5 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 10.5,0.5 - parent: 1 - - uid: 6 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,7.5 - parent: 1 - - uid: 791 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,0.5 - parent: 1 - - uid: 792 - components: - - type: Transform - pos: -10.5,7.5 - parent: 1 - proto: WarningAir entities: - uid: 211 diff --git a/Resources/Maps/_NF/POI/lodge.yml b/Resources/Maps/_NF/POI/lodge.yml index 25c822a90cd..c1b36a23cfd 100644 --- a/Resources/Maps/_NF/POI/lodge.yml +++ b/Resources/Maps/_NF/POI/lodge.yml @@ -493,6 +493,7 @@ entities: 689: 14,6 1680: 7,17 1682: 14,11 + 2019: 16,11 - node: cleanable: True color: '#A4610696' @@ -2122,6 +2123,7 @@ entities: decals: 681: 17,10 682: 11,10 + 2020: 16,10 - node: angle: 1.5707963267948966 rad color: '#B8B873FF' @@ -7705,7 +7707,7 @@ entities: ents: [] - proto: ComputerPowerMonitoring entities: - - uid: 1873 + - uid: 263 components: - type: Transform rot: -1.5707963267948966 rad @@ -7723,14 +7725,6 @@ entities: - type: Transform pos: -12.5,23.5 parent: 1 -- proto: ComputerTabletopCrewMonitoring - entities: - - uid: 1040 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -12.5,7.5 - parent: 1 - proto: ComputerTabletopRadar entities: - uid: 1039 @@ -7785,6 +7779,14 @@ entities: showEnts: False occludes: True ents: [] +- proto: ComputerTabletopStationRecords + entities: + - uid: 264 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,7.5 + parent: 1 - proto: ComputerWallmountWithdrawBankATM entities: - uid: 2517 @@ -7968,100 +7970,130 @@ entities: - type: DeviceLinkSink links: - 2104 -- proto: DefaultStationBeaconArmory +- proto: DefaultStationBeaconBar entities: - - uid: 2190 + - uid: 2189 components: - type: Transform - pos: 10.5,15.5 + pos: 0.5,7.5 parent: 1 - - type: NavMapBeacon - text: Practice Range -- proto: DefaultStationBeaconBar +- proto: DefaultStationBeaconCryosleep entities: - - uid: 265 + - uid: 2547 components: - type: Transform - pos: 0.5,7.5 + pos: -10.5,13.5 parent: 1 - - type: NavMapBeacon - text: Lodge - proto: DefaultStationBeaconEngineering entities: - uid: 365 components: - type: Transform - pos: 0.5,15.5 + pos: 2.5,14.5 parent: 1 -- proto: DefaultStationBeaconFrontierDock +- proto: DefaultStationBeaconFrontierATM entities: - - uid: 2184 + - uid: 2544 components: - type: Transform - pos: -20.5,22.5 + pos: 3.5,12.5 parent: 1 - - type: NavMapBeacon - text: Dock 1 - - uid: 2185 + - uid: 2545 components: - type: Transform - pos: 0.5,25.5 + pos: -2.5,12.5 parent: 1 - - type: NavMapBeacon - text: Dock 2 - - uid: 2186 +- proto: DefaultStationBeaconFrontierDockFive + entities: + - uid: 1875 components: - type: Transform - pos: 21.5,22.5 + pos: 0.5,-2.5 parent: 1 - - type: NavMapBeacon - text: Dock 3 - - uid: 2187 +- proto: DefaultStationBeaconFrontierDockFour + entities: + - uid: 265 components: - type: Transform pos: 31.5,0.5 parent: 1 - - type: NavMapBeacon - text: Dock 4 - - uid: 2188 +- proto: DefaultStationBeaconFrontierDockOne + entities: + - uid: 1040 components: - type: Transform - pos: 0.5,-2.5 + pos: -20.5,22.5 parent: 1 - - type: NavMapBeacon - text: Dock 5 - - uid: 2189 +- proto: DefaultStationBeaconFrontierDockSix + entities: + - uid: 2184 components: - type: Transform pos: -30.5,0.5 parent: 1 - - type: NavMapBeacon - text: Dock 6 +- proto: DefaultStationBeaconFrontierDockThree + entities: + - uid: 1873 + components: + - type: Transform + pos: 21.5,22.5 + parent: 1 +- proto: DefaultStationBeaconFrontierDockTwo + entities: + - uid: 1048 + components: + - type: Transform + pos: 0.5,25.5 + parent: 1 +- proto: DefaultStationBeaconFrontierOfficeMercenary + entities: + - uid: 1992 + components: + - type: Transform + pos: -11.5,8.5 + parent: 1 +- proto: DefaultStationBeaconFrontierShipyard + entities: + - uid: 2543 + components: + - type: Transform + pos: 14.5,11.5 + parent: 1 +- proto: DefaultStationBeaconFrontierShootingRangeMercenary + entities: + - uid: 2186 + components: + - type: Transform + pos: 15.5,15.5 + parent: 1 +- proto: DefaultStationBeaconFrontierVend + entities: + - uid: 2542 + components: + - type: Transform + pos: -11.5,4.5 + parent: 1 - proto: DefaultStationBeaconJanitorsCloset entities: - uid: 915 components: - type: Transform - pos: -7.5,17.5 + pos: -6.5,15.5 parent: 1 - proto: DefaultStationBeaconMedbay entities: - - uid: 263 + - uid: 2546 components: - type: Transform - pos: -10.5,14.5 + pos: -10.5,17.5 parent: 1 - - type: NavMapBeacon - text: Medbay - proto: DefaultStationBeaconSupply entities: - - uid: 264 + - uid: 2185 components: - type: Transform - pos: 14.5,8.5 + pos: 14.5,7.5 parent: 1 - - type: NavMapBeacon - text: Cargo - proto: DefibrillatorCabinetFilled entities: - uid: 2194 @@ -14376,11 +14408,6 @@ entities: - type: Transform pos: -1.5,20.5 parent: 1 - - uid: 2542 - components: - - type: Transform - pos: 16.5,11.5 - parent: 1 - proto: PowerCellRecharger entities: - uid: 2191 @@ -16477,15 +16504,15 @@ entities: parent: 1 - proto: VendingMachineAstroVend entities: - - uid: 1992 + - uid: 2052 components: - type: Transform - pos: -5.5,23.5 + pos: -10.5,4.5 parent: 1 - - uid: 2052 + - uid: 2188 components: - type: Transform - pos: -10.5,4.5 + pos: -5.5,23.5 parent: 1 - proto: VendingMachineBooze entities: @@ -16520,6 +16547,13 @@ entities: - type: Transform pos: -5.5,19.5 parent: 1 +- proto: VendingMachineFuelVend + entities: + - uid: 2187 + components: + - type: Transform + pos: 16.5,11.5 + parent: 1 - proto: VendingMachineMedical entities: - uid: 2032 @@ -17990,12 +18024,6 @@ entities: rot: 3.141592653589793 rad pos: 10.5,16.5 parent: 1 - - uid: 1048 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 16.5,11.5 - parent: 1 - uid: 1050 components: - type: Transform @@ -18008,12 +18036,6 @@ entities: rot: 1.5707963267948966 rad pos: -17.5,2.5 parent: 1 - - uid: 1875 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 12.5,11.5 - parent: 1 - uid: 1892 components: - type: Transform diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/station_beacon.yml index 47557a72bfb..4848065cc3c 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/station_beacon.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/station_beacon.yml @@ -128,4 +128,95 @@ suffix: Conference Room components: - type: NavMapBeacon - defaultText: station-beacon-conference \ No newline at end of file + defaultText: station-beacon-conference + +- type: entity + parent: DefaultStationBeacon + id: DefaultStationBeaconFrontierOfficeMercenary + suffix: Office, Mercenary + components: + - type: NavMapBeacon + defaultText: station-beacon-office-mercenary + color: "#b8b873" + +- type: entity + parent: DefaultStationBeacon + id: DefaultStationBeaconFrontierShootingRangeMercenary + suffix: Shooting range, Mercenary + components: + - type: NavMapBeacon + defaultText: station-beacon-shooting-range-mercenary + color: "#b8b873" + +# Docks +- type: entity + parent: DefaultStationBeacon + id: DefaultStationBeaconFrontierDockOne + suffix: Dock 1 + components: + - type: NavMapBeacon + defaultText: station-beacon-dock-one + +- type: entity + parent: DefaultStationBeacon + id: DefaultStationBeaconFrontierDockTwo + suffix: Dock 2 + components: + - type: NavMapBeacon + defaultText: station-beacon-dock-two + +- type: entity + parent: DefaultStationBeacon + id: DefaultStationBeaconFrontierDockThree + suffix: Dock 3 + components: + - type: NavMapBeacon + defaultText: station-beacon-dock-three + +- type: entity + parent: DefaultStationBeacon + id: DefaultStationBeaconFrontierDockFour + suffix: Dock 4 + components: + - type: NavMapBeacon + defaultText: station-beacon-dock-four + +- type: entity + parent: DefaultStationBeacon + id: DefaultStationBeaconFrontierDockFive + suffix: Dock 5 + components: + - type: NavMapBeacon + defaultText: station-beacon-dock-five + +- type: entity + parent: DefaultStationBeacon + id: DefaultStationBeaconFrontierDockSix + suffix: Dock 6 + components: + - type: NavMapBeacon + defaultText: station-beacon-dock-six + +- type: entity + parent: DefaultStationBeacon + id: DefaultStationBeaconFrontierDockSixA + suffix: Dock 6a + components: + - type: NavMapBeacon + defaultText: station-beacon-dock-six-a + +- type: entity + parent: DefaultStationBeacon + id: DefaultStationBeaconFrontierDockSixB + suffix: Dock 6b + components: + - type: NavMapBeacon + defaultText: station-beacon-dock-six-b + +- type: entity + parent: DefaultStationBeacon + id: DefaultStationBeaconFrontierDockSixC + suffix: Dock 6c + components: + - type: NavMapBeacon + defaultText: station-beacon-dock-six-c From 4ca556ebd0f41a5a749cbd1855e8f4178b1a09eb Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Tue, 23 Jul 2024 16:03:14 +0000 Subject: [PATCH 009/123] Automatic Changelog (#1722) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ab0456d3060..f8c046e71c8 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -5794,3 +5794,11 @@ Entries: message: Tools and flatpacks now have unlimited inventory. id: 5134 time: '2024-07-22T23:49:28.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Add + message: Added FuelVend to the Lodge and Grifty's. + - type: Fix + message: Fixed map beacons at the Lodge. + id: 5135 + time: '2024-07-23T16:02:47.0000000+00:00' From afe328e2e7f467ecc2cad58876fd767d7a52f795 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Thu, 25 Jul 2024 00:09:13 +0300 Subject: [PATCH 010/123] SR paperwork templates (#1727) * papers, please * forms_sr.yml: paperwork revisions * SR Form rewrite, new contraband amnesty form * Fix pipes colors --------- Co-authored-by: Whatstone Co-authored-by: Dvir --- Resources/Maps/_NF/Outpost/frontier.yml | 24 +- .../_NF/Catalog/Fills/Paper/forms_sr.yml | 288 ++++++++++++++++++ 2 files changed, 310 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Paper/forms_sr.yml diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml index 3b1042c70b8..8868dbfa36e 100644 --- a/Resources/Maps/_NF/Outpost/frontier.yml +++ b/Resources/Maps/_NF/Outpost/frontier.yml @@ -6317,6 +6317,14 @@ entities: - type: Transform pos: 12.810785,16.716284 parent: 2173 +- proto: BoxFolderSr + entities: + - uid: 2039 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.009785,21.581205 + parent: 2173 - proto: BoxFolderWhite entities: - uid: 2232 @@ -19360,6 +19368,8 @@ entities: - type: Transform pos: -33.5,10.5 parent: 2173 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 2152 components: - type: Transform @@ -24051,6 +24061,8 @@ entities: rot: 3.141592653589793 rad pos: -33.5,9.5 parent: 2173 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 1938 components: - type: Transform @@ -24071,6 +24083,8 @@ entities: - type: Transform pos: -33.5,11.5 parent: 2173 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 2516 components: - type: Transform @@ -27986,11 +28000,17 @@ entities: parent: 2173 - proto: Paper entities: - - uid: 4974 + - uid: 2038 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.43772,21.63533 + parent: 2173 + - uid: 2040 components: - type: Transform rot: 3.141592653589793 rad - pos: 7.9261327,21.56176 + pos: 7.534942,21.551996 parent: 2173 - proto: PaperBin10 entities: diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Paper/forms_sr.yml b/Resources/Prototypes/_NF/Catalog/Fills/Paper/forms_sr.yml new file mode 100644 index 00000000000..db0ea8af1bc --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/Fills/Paper/forms_sr.yml @@ -0,0 +1,288 @@ +# Station Representative Forms +# Sources: https://discord.com/channels/1123826877245694004/1182366744266932224/1182366744266932224 +# https://docs.google.com/document/d/1jDX9numj-VHKBJ2FiiEo1GIlHESffOUIHIIXaqhEnls/edit?pli=1#heading=h.ru93r8n0fb7m +# These forms should be kept up-to-date with changes to Space Law. + +# Filled Folder +- type: entity + id: BoxFolderSr + parent: BoxFolderBase + name: SR folder + description: A folder filled with paperwork templates. + suffix: Forms + components: + - type: Sprite + layers: + - state: folder-colormap + color: "#1f6626ff" + - state: folder-base + - type: StorageFill + contents: + - id: PaperWrittenFrontierFormEmployment + - id: PaperWrittenFrontierFormEmployeePayHistory + - id: PaperWrittenFrontierFormFundRequisition + - id: PaperWrittenFrontierFormShuttleTitleChange + - id: PaperWrittenFrontierFormAuthorization + - id: PaperWrittenFrontierFormShuttleDerelict + - id: PaperWrittenFrontierFormContrabandAmnesty + - id: PaperWrittenFrontierFormContrabandTurnover + - id: PaperWrittenFrontierFormContrabandPermit + - id: Paper + prob: 0.5 + - id: Paper + prob: 0.5 + +# Forms +- type: entity # Based on form made by Willzile1 (Jon-Gah) + id: PaperWrittenFrontierFormEmployment + name: Employment Contract + suffix: MappedPaper + parent: Paper + components: + - type: Paper + content: |2 + [color=#2e9935ff]◥[bold]N[/bold]◣ [bold]Frontier Outpost Command[/bold][/color] + [color=#2e9935ff]‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾[/color] + [head=2]Employment Contract[/head] + + [bold]Name:[/bold] + [bold]Species:[/bold] + [bold]Position Title:[/bold] + [bold]Position Responsibilities:[/bold] + [bullet/] + [bullet/] + [bullet/] + + [bold]Hourly Wage:[/bold] + + [bold]Shift Time:[/bold] + + + + [color=#AAAAAA]This Form is void without the signatures of both Parties and a stamp of Frontier Command (Sheriff or Station Representative)[/color] + +- type: entity + id: PaperWrittenFrontierFormEmployeePayHistory + name: Employee Pay History + suffix: MappedPaper + parent: Paper + components: + - type: Paper + content: |2 + [color=#2e9935ff]◥[bold]N[/bold]◣ [bold]Frontier Outpost Command[/bold][/color] + [color=#2e9935ff]‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾[/color] + [head=2]Employee Pay History[/head] + + [bold]Name:[/bold] + [bold]Position Title:[/bold] + [bold]Hourly Wage:[/bold] + [bold]Pay history (Shift time / Wage recieved):[/bold] + [bullet/] + [bullet/] + [bullet/] + [bullet/] + [bullet/] + [bullet/] + + + + [color=#AAAAAA]This Form is void without the signature and stamp of Frontier Command (Sheriff or Station Representative)[/color] + +- type: entity # Based on form made by Willzile1 (Jon-Gah) + id: PaperWrittenFrontierFormFundRequisition + name: Fund Requisition + suffix: MappedPaper + parent: Paper + components: + - type: Paper + content: |2 + [color=#2e9935ff]◥[bold]N[/bold]◣ [bold]Frontier Outpost Command[/bold][/color] + [color=#2e9935ff]‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾[/color] + [head=2]Fund Requisition[/head] + + [bold]Name:[/bold] + [bold]Amount:[/bold] + [bold]Reason:[/bold] + [bold]Shift Time:[/bold] + + + + [color=#AAAAAA]This Form is void without the signature and stamp of Frontier Command (Sheriff or Station Representative)[/color] + +- type: entity # Based on form made by Starly (Shaw Clifflower) + id: PaperWrittenFrontierFormAuthorization + name: Authorization for Bluespace Threats + suffix: MappedPaper + parent: Paper + components: + - type: Paper + content: |2 + [color=#2e9935ff]◥[bold]N[/bold]◣ [bold]Frontier Outpost Command[/bold][/color] + [color=#2e9935ff]‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾[/color] + [head=2]Authorization for Bluespace Threats[/head] + + [bold]Vessel Captain:[/bold] + [bold]Vessel IFF:[/bold] + [bold]Shift Time:[/bold] + + [bold]Issuing Frontier Command:[/bold] + [bullet]XXXXXXXX, Station Representative + [bullet]XXXXXXXX, Sheriff + + This document authorizes the above vessel and its captain to assist and cooperate with the NFSD and Frontier authorities in neutralizing hostile bluespace threats to Frontier. These include, but are not limited to: + [bullet] Cultist vessels + [bullet] Syndicate vessels + [bullet] Wizard Federation vessels + [bullet] Arcadia Industries vessels + + This document does NOT deputize the authorized party. The authorized party is not granted special privileges to arrest, detain, and prosecute individuals associated with Nanotrasen. + + [bold]Any contraband seized during operations aboard hostile vessels must be surrendered, either to the NFSD or the Station Representative, for a cash bounty. Failure to surrender contraband will lead to the forfeiture of this agreement, and the authorized party may be liable for criminal charges.[/bold] + + The authorized party is to keep a copy of this document for inspection. The authorized party is expected to maintain contact with NFSD command and/or the Station Representative to minimize casualties. + + Before engaging with hostile vessels, the authorized party is expected to follow any instructions given by the NFSD for staging or other preparation prior to boarding. + + + + [color=#AAAAAA]This Form is void without the signatures of both Parties and a stamp of Frontier Command (Sheriff or Station Representative)[/color] + +- type: entity # Based on form made by Willzile1 (Jon-Gah) + id: PaperWrittenFrontierFormShuttleTitleChange + name: Shuttle Title Change + suffix: MappedPaper + parent: Paper + components: + - type: Paper + content: |2 + [color=#2e9935ff]◥[bold]N[/bold]◣ [bold]Frontier Outpost Command[/bold][/color] + [color=#2e9935ff]‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾[/color] + [head=2]Shuttle Title Change[/head] + + [bold]Name of Captain:[/bold] + [bold]Old Ship Title:[/bold] + [bold]New Ship Title:[/bold] + [bold]Shift Time:[/bold] + + + + [color=#AAAAAA]This Form is void without the signatures of both Parties and a stamp of Frontier Command (Sheriff or Station Representative)[/color] + +- type: entity # Based on form made by Blumbee (Aki Suboshi) + id: PaperWrittenFrontierFormShuttleDerelict + name: Declaration of Salvage + suffix: MappedPaper + parent: Paper + components: + - type: Paper + content: |2 + [color=#2e9935ff]◥[bold]N[/bold]◣ [bold]Frontier Outpost Command[/bold][/color] + [color=#2e9935ff]‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾[/color] + [head=2]Declaration of Salvage[/head] + + [bold]Vessel IFF:[/bold] [color=#2200BD][/color] + [bold]Time of First Hail:[/bold] [color=#2200BD][/color] + [bold]Shift Time:[/bold] [color=#2200BD][/color] + + This is a formal declaration from Frontier's Station Traffic Controller, hereby declaring the above vessel to be abandoned by its captain, and recognized as salvage. This vessel has been unresponsive on both radio and fax for over twenty (20) minutes. + + Pursuant to Space Law §9.3, this vessel will be moved out to three hundred (300) meters from Frontier Station by an agent representing Frontier Station or the NFSD, and will be salvageable by any other vessel operating within the sector. + + Neither Frontier Station nor the Nanotrasen Corporation will reimburse any party affiliated with this vessel for losses incurred. + + + + [color=#AAAAAA]This Form is void without the signatures of both Parties and a stamp of Frontier Command (Sheriff or Station Representative)[/color] + +- type: entity # Based on form made by Blumbee (Aki Suboshi) + id: PaperWrittenFrontierFormContrabandAmnesty + name: Contraband Amnesty Agreement + suffix: MappedPaper + parent: Paper + components: + - type: Paper + content: |2 + [color=#2e9935ff]◥[bold]N[/bold]◣ [bold]Frontier Outpost Command[/bold][/color] + [color=#2e9935ff]‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾[/color] + [head=2]Contraband Amnesty Agreement[/head] + + [head=3]Contraband Holder[/head] + [bold]Name:[/bold] + [bold]Species:[/bold] + [bold]Vessel IFF:[/bold] + + [bold]Payout per F.U.C.:[/bold] [color=#ff0000]2 000 spesos[/color] + [bold]Shift Time:[/bold] + + This document is a contract between the above Contraband Holder and Frontier Command. + + Any crimes of contraband possession for the Contraband Holder will be waived so long as all Class 3 contraband items, and any Class 2 contraband items not subject to a Class 2 Contraband Permit are turned in within reasonable time (subject to the clause below), and not used for malicious purposes. Noncompliance with this document results in voiding any standing Class 2 Contraband Permits. + + If the Contraband Holder is not paid in full at the above rate for any contraband turned in, they may remain in possession of the contraband without penalty at their discretion. + + + + [color=#AAAAAA]This Form is void without the signatures of both Parties and the stamp of the Sheriff[/color] + + +- type: entity # Based on form made by Blumbee (Aki Suboshi) + id: PaperWrittenFrontierFormContrabandTurnover + name: Contraband Turnover Receipt + suffix: MappedPaper + parent: Paper + components: + - type: Paper + content: |2 + [color=#2e9935ff]◥[bold]N[/bold]◣ [bold]Frontier Outpost Command[/bold][/color] + [color=#2e9935ff]‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾[/color] + [head=2]Contraband Turnover Receipt[/head] + + [bold]Contraband Holder:[/bold] + [bold]Contraband F.U.C. Value:[/bold] + [bold]Payout per F.U.C.:[/bold] [color=#ff0000]2 000 spesos[/color] + [bold]Payout Total:[/bold] + + [bold]C2 Contraband:[/bold] + [bullet/] + [bullet/] + [bullet/] + + [bold]C3 Contraband:[/bold] + [bullet/] + [bullet/] + [bullet/] + + [bold]Shift Time:[/bold] + + + + [color=#AAAAAA]This Form is void without the signatures of both Parties and a stamp of Frontier Command (Sheriff or Station Representative)[/color] + +- type: entity # Based on form made by Blumbee (Aki Suboshi) + id: PaperWrittenFrontierFormContrabandPermit + name: Class 2 Contraband Permit + suffix: MappedPaper + parent: Paper + components: + - type: Paper + content: |2 + [color=#2e9935ff]◥[bold]N[/bold]◣ [bold]Frontier Outpost Command[/bold][/color] + [color=#2e9935ff]‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾[/color] + [head=2]Class 2 Contraband Permit[/head] + + [bold]Permit Holder:[/bold] + [bold]Holder Crew: + [bullet/] + [bullet/] + [bullet/] + + [bold]Shift Time:[/bold] + + + This Permit allows the Holder and crew, as listed above, to possess and use Class 2 contraband. + Non-compliance with a Contraband Amnesty agreement void this Permit. + Refer to §6.1.4 of Space Law for a full definition of Class 2 contraband. + + + + [color=#AAAAAA]This Permit is void without the signature of the Holder and the signature and stamp of the Sheriff[/color] From 7dbdf08977fe606030097b77d0af236d79604b7f Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Wed, 24 Jul 2024 21:09:39 +0000 Subject: [PATCH 011/123] Automatic Changelog (#1727) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f8c046e71c8..827c2001a4e 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -5802,3 +5802,9 @@ Entries: message: Fixed map beacons at the Lodge. id: 5135 time: '2024-07-23T16:02:47.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Add + message: Added a folder with paperwork templates to SR's office. + id: 5136 + time: '2024-07-24T21:09:14.0000000+00:00' From 1a7f7533d25a433d611819b7fd0e550ca0d2d7be Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Wed, 24 Jul 2024 17:13:20 -0400 Subject: [PATCH 012/123] Computer YAML cleanup (#1723) * Computer YAML cleanup * ATMs: inheritance order * computers.yml: cargo order computer has no board --- .../Machines/Computers/computers.yml | 30 ++------ .../Machines/Computers/computers.yml | 71 +------------------ .../Machines/Computers/computers_shipyard.yml | 41 +---------- .../_NF/Entities/Structures/atm.yml | 66 ++++------------- 4 files changed, 22 insertions(+), 186 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index bd1855123f5..dffa9e70ebe 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -751,25 +751,11 @@ - type: entity id: ComputerCargoOrders - parent: [BaseStructureDisableToolUse, BaseStructureIndestructible, BaseStructureComputer] # Frontier + parent: [BaseStructureDisableToolUse, BaseStructureIndestructible, BaseComputer] # Frontier: add BaseStructureDisableToolUse, BaseStructureIndestructible name: cargo request computer description: Used to order supplies and approve requests. - placement: - mode: SnapgridCenter components: - - type: MeleeSound - soundGroups: - Brute: - collection: MetalGlassBreak - - type: Computer - - type: ApcPowerReceiver - powerLoad: 200 - - type: ExtensionCableReceiver - - type: ActivatableUIRequiresPower - type: Sprite - netsync: false - noRot: true - sprite: Structures/Machines/computers.rsi layers: - map: ["computerLayerBody"] state: computer @@ -789,23 +775,19 @@ interfaces: enum.CargoConsoleUiKey.Orders: type: CargoOrderConsoleBoundUserInterface - - type: LitOnPowered + - type: Computer + board: Null # Frontier: CargoRequestComputerCircuitboard Date: Wed, 24 Jul 2024 16:17:26 -0500 Subject: [PATCH 013/123] STC Hat and free laceup shoes (#1721) * Adds loadout options and a new hat * Hamster stc cap, stc loadout order, hamster wear --------- Co-authored-by: Whatstone --- .../_NF/Entities/Clothing/Head/hats.yml | 16 +++ .../Prototypes/_NF/Loadouts/Jobs/Stc/head.yml | 9 ++ .../_NF/Loadouts/Jobs/Stc/shoes.yml | 9 ++ .../Prototypes/_NF/Loadouts/role_loadouts.yml | 3 +- .../_NF/Loadouts/stc_loadout_groups.yml | 134 ++++++++++++++++++ .../stc_cap.rsi/equipped-HELMET-hamster.png | Bin 0 -> 558 bytes .../Head/Hats/stc_cap.rsi/equipped-HELMET.png | Bin 0 -> 3349 bytes .../Clothing/Head/Hats/stc_cap.rsi/icon.png | Bin 0 -> 3086 bytes .../Head/Hats/stc_cap.rsi/inhand-left.png | Bin 0 -> 3327 bytes .../Head/Hats/stc_cap.rsi/inhand-right.png | Bin 0 -> 3290 bytes .../Clothing/Head/Hats/stc_cap.rsi/meta.json | 30 ++++ 11 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Stc/head.yml create mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Stc/shoes.yml create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/stc_cap.rsi/equipped-HELMET-hamster.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/stc_cap.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/stc_cap.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/stc_cap.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/stc_cap.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/stc_cap.rsi/meta.json diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml index 5013a36140a..cac35fda87f 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml @@ -306,3 +306,19 @@ - ClothMade - WhitelistChameleon - CatWearable # Frontier + +- type: entity + parent: ClothingHeadHatHopcap + id: ClothingHeadHatStcCap + name: station traffic controller's cap + description: A cap issued to Frontier Outpost's station traffic controller. Try not to lose it. + components: + - type: Sprite + sprite: _NF/Clothing/Head/Hats/stc_cap.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hats/stc_cap.rsi + - type: Tag + tags: + - ClothMade + - WhitelistChameleon + - HamsterWearable diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Stc/head.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Stc/head.yml new file mode 100644 index 00000000000..aaed89e2078 --- /dev/null +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Stc/head.yml @@ -0,0 +1,9 @@ +- type: loadout + id: StcClothingHeadHatStcCap + equipment: StcClothingHeadHatStcCap + price: 0 + +- type: startingGear + id: StcClothingHeadHatStcCap + equipment: + head: ClothingHeadHatStcCap diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Stc/shoes.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Stc/shoes.yml new file mode 100644 index 00000000000..8cef31cd6ff --- /dev/null +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Stc/shoes.yml @@ -0,0 +1,9 @@ +- type: loadout + id: StcClothingShoesBootsLaceup + equipment: StcClothingShoesBootsLaceup + price: 0 + +- type: startingGear + id: StcClothingShoesBootsLaceup + equipment: + shoes: ClothingShoesBootsLaceup diff --git a/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml b/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml index 7a14973d88a..7769599fddb 100644 --- a/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml @@ -104,12 +104,13 @@ - type: roleLoadout id: JobStationTrafficController groups: + - StcHead - ContractorNeck - StcJumpsuit - ContractorGloves - ContractorBackpack - ContractorOuterClothing - - ContractorShoes + - StcShoes - ContractorFace - ContractorGlasses - ContractorBelt diff --git a/Resources/Prototypes/_NF/Loadouts/stc_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/stc_loadout_groups.yml index f68c3d51609..684dc3639ec 100644 --- a/Resources/Prototypes/_NF/Loadouts/stc_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/stc_loadout_groups.yml @@ -6,3 +6,137 @@ - StcClothingUniformJumpskirtDetectiveGrey fallbacks: - StcClothingUniformJumpsuitDetectiveGrey + +- type: loadoutGroup + id: StcHead + name: loadout-group-contractor-head + minLimit: 0 + loadouts: + - StcClothingHeadHatStcCap + - ContractorClothingHeadHelmetEVALarge + - ContractorClothingHeadBandBlack + - ContractorClothingHeadBandBlue + - ContractorClothingHeadBandGreen + - ContractorClothingHeadBandRed + - ContractorClothingHeadBandSkull + - ContractorClothingHeadHatGreysoft + - ContractorClothingHeadHatBluesoft + - ContractorClothingHeadHatYellowsoft + - ContractorClothingHeadHatGreensoft + - ContractorClothingHeadHatOrangesoft + - ContractorClothingHeadHatRedsoft + - ContractorClothingHeadHatBlacksoft + - ContractorClothingHeadHatPurplesoft + - ContractorClothingHeadHatCorpsoft + - ContractorClothingHeadBandGrey + - ContractorClothingHeadHatUshanka + - ContractorClothingHeadHatHardhatYellow + - ContractorClothingHeadHatChef + - ContractorClothingHeadHatCargosoft + - ContractorClothingHeadBandBotany + - ContractorClothingHeadHatHoodBioScientist + - ContractorClothingHeadRastaHat + - ContractorClothingHeadHatSombrero + - ContractorClothingHeadFishCap + - ContractorClothingHeadHatTrucker + - ContractorClothingHeadHatCasa + - ContractorClothingHeadHatBowlerHat + - ContractorClothingHeadHatGreyFlatcap + - ContractorClothingHeadHatBrownFlatcap + - ContractorClothingHeadHatCapcap + - ContractorClothingHeadHatParamedicsoft + - ContractorClothingHeadNurseHat + - ContractorClothingHeadHatBeretMedic + - ContractorClothingHeadHatSurgcapGreen + - ContractorClothingHeadHatSurgcapBlue + - ContractorClothingHeadHatSurgcapPurple + - ContractorClothingHeadTinfoil + - ContractorClothingHeadHatBeretRND + - ContractorClothingHeadHatBeretEngineering + - ContractorClothingHeadHatBeretSeniorPhysician + - ContractorClothingHeadHatBeretCmo + - ContractorClothingHeadHatBeretQM + - ContractorClothingHeadHatQMsoft + - ContractorClothingHeadHatCardinal + - ContractorClothingHeadHatHoodNunHood + - ContractorClothingHeadSafari + - ContractorClothingHeadHatJester + - ContractorClothingHeadHatJesterAlt + - ContractorClothingHeadHatBeret + - ContractorClothingHeadHatBeretFrench + - ContractorClothingHeadHatMimesoft + - ContractorClothingHeadHatPilgrim + - ContractorClothingHeadHatStrawHat + - ContractorClothingHeadHatCowboyBlack + - ContractorClothingHeadHatCowboyBrown + - ContractorClothingHeadHatCowboyGrey + - ContractorClothingHeadHatCowboyBountyHunter + - ContractorClothingHeadHatBH + - ContractorClothingHeadHatCowboyRed + - ContractorClothingHeadHatCowboyWhite + - ContractorClothingHeadHatWideBrimmed + - ContractorClothingHeadBandGold + - ContractorClothingHeadHatTophat + fallbacks: + - StcClothingHeadHatStcCap + +- type: loadoutGroup + id: StcShoes + name: loadout-group-contractor-shoes + minLimit: 0 + loadouts: + - StcClothingShoesBootsLaceup + - ContractorClothingShoesColorBlack + - ContractorClothingShoesClothwarp + - ContractorClothingShoesTourist + - ContractorClothingShoesBootsSalvage + - ContractorClothingShoesChef + - ContractorClothingShoesColorBlue + - ContractorClothingShoesColorOrange + - ContractorClothingShoesColorPurple + - ContractorClothingShoesColorRed + - ContractorClothingShoesColorBrown + - ContractorClothingShoesColorGreen + - ContractorClothingShoesColorYellow + - ContractorClothingShoesColorWhite + - ContractorClothingShoesBootsMag + - ContractorClothingShoesBootsWinter + - ContractorClothingShoesBootsWinterAtmos + - ContractorClothingShoesBootsWinterHydro + - ContractorClothingShoesBootsWinterCap + - ContractorClothingShoesBootsWinterCargo + - ContractorClothingShoesBootsWinterChef + - ContractorClothingShoesBootsWinterChem + - ContractorClothingShoesBootsWinterEngi + - ContractorClothingShoesBootsWinterGenetics + - ContractorClothingShoesBootsWinterMiner + - ContractorClothingShoesBootsWinterParamedic + - ContractorClothingShoesBootsWinterRobo + - ContractorClothingShoesBootsWinterSci + - ContractorClothingShoesBootsWinterViro + - ContractorClothingShoesBootsJack + - ContractorClothingShoesLeather + - ContractorClothingShoesSlippers + - ContractorClothingShoeSlippersDuck + - ContractorClothingShoesFlippers + - ContractorClothingShoesBootsPunkRandomized # Punkish (Randomized visuals) + - ContractorClothingShoesDameDane + - ContractorClothingShoesBootsWork + - ContractorClothingShoesBootsCowboyBlack + - ContractorClothingShoesBootsCowboyBrown + - ContractorClothingShoesBootsCowboyWhite + - ContractorClothingShoesSnakeskinBoots + - ContractorClothingShoesHighheelBoots + - ContractorClothingShoesBootsCowboyFancy + - ContractorClothingShoesBootsWinterChiefEngineer + - ContractorClothingShoesBootsWinterCMO + - ContractorClothingShoesBootsWinterQM + - ContractorClothingShoesBootsWinterRD + - ContractorClothingShoesBootsWinterClown + - ContractorClothingShoesBootsWinterMime + - ContractorClothingShoesClown + - ContractorClothingShoesJester + - ContractorClothingShoesBootsPerformer + - ContractorClothingShoesSkates + - ContractorClothingShoesClownLarge + - ContractorClothingShoesBling \ No newline at end of file diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/stc_cap.rsi/equipped-HELMET-hamster.png b/Resources/Textures/_NF/Clothing/Head/Hats/stc_cap.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..dc2dae2a1671e1b24db4ad9fe95b3c22b2495fd6 GIT binary patch literal 558 zcmV+}0@3}6P)11V`pz5Rw*p~J1i|yS;XGX#v)k7=4{eL z4djFisNliw47Vc*j78XS?@Zw=Oho*C)iFD>Z|1$*Y92sDMD*Y4gf3VbtT-hlgb;qr z7=u!4d>(xae&64YAGBa~b9T0`&fse0dCx5__92A8-iw>K_xKpb7@VApF`0b5 zluzKI!%CIK{{#RazjNK$4?mD3T|Z`Rh2-`%e1HF~)9J*`L7FO;Bwa|A`7vDUAGa<*b6+8X8YI$Gx%uXVx)MSNZ0;;$Z#{GiVK#S`XW|0qg-}wW)Ed@SF65d# z=x>vz%4fLl53shH=@p3GB+;yLGq$yrpA#(s^BVww^g$POuK)lP!wE*uKSfEx;K?o5 wjB{3;V*0w8nR6LkDnvv?L_|bHL`46vpY6NF$OI$O6#xJL07*qoM6N<$f<5#9-v9sr literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/stc_cap.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hats/stc_cap.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..bd420267a0031a8c37b57f66612477d930ff130d GIT binary patch literal 3349 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 P+!-*`Gt;exx;*|Lpt3Mu literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/stc_cap.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hats/stc_cap.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..047df2d1240ea247710fb299f3ef6c25e7838454 GIT binary patch literal 3086 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/stc_cap.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Hats/stc_cap.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..14af94c3ff64b5ba217dc749aae0cdd22b876672 GIT binary patch literal 3327 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 HF6@5*yZj^b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/stc_cap.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Hats/stc_cap.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..edf4c5f0f01e71f2be3fe98a82d3946695ab99bb GIT binary patch literal 3290 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 WZ{*qUIyPOD1sLmF=wV>)N&g363kEs> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/stc_cap.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hats/stc_cap.rsi/meta.json new file mode 100644 index 00000000000..95cb87b2264 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Head/Hats/stc_cap.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by belay5 (Discord), recolored by MagnusCrowe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From df926f85932000c7eb016d9dcead31ff6d6256af Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Wed, 24 Jul 2024 21:18:56 +0000 Subject: [PATCH 014/123] Automatic Changelog (#1721) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 827c2001a4e..1c2dc7a7161 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -5808,3 +5808,11 @@ Entries: message: Added a folder with paperwork templates to SR's office. id: 5136 time: '2024-07-24T21:09:14.0000000+00:00' +- author: MagnusCrowe + changes: + - type: Add + message: Added a new hat for STC! + - type: Tweak + message: STC now gets free laceup shoes! + id: 5137 + time: '2024-07-24T21:17:27.0000000+00:00' From b468f2535507a3ddf3b3ea5e6a11c9f620249565 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Wed, 24 Jul 2024 18:10:33 -0400 Subject: [PATCH 015/123] Pirate Bounties (#1513) * Pirate Bounties The start of a probably long PR for the pirate bounty system. Not at all complete. * Changed Components to ID's Awaiting further checkiessssssssssss * added additional bounties Added gold ore/ingots and Vending Machines * Fixed ID names Everything was Captain, NO LONGER * ID Whitelist, move pirate bounties to _NF folders * Balance Pass Balanced a couple thing Leander Suggested. * Pirate bounty components & systems, ROUGH DRAFT. * Pirate bounty/pallet console UI (ROUGH DRAFT * Pirate UI (WIP, quarter-baked at best) * Pirate UI cleanup, first pass * Booty Crate Sprites Thanks Schbingus * Crate fix dumb * Pirate vessels inherit from pirate vessel class * Pirate bounty consoles and pad YEEEEEEEEEEEEEEEEEEEEEEEEE * FIX AAAAAAAAA * Should work -- Console FTL's Pls work * Sector service POC, pirate bounty service * Pirate bounty system: use sector service * SectorServicePrototype: fix namespace includes * SectorServicePrototype: yet more namespace include * namespace includes, pt 3 * CargoSystem: fix obsolete code * Add pirate bounty and redemption WIP computers * Pirate bounties: fix whitelist, add blacklist * SectorServicePrototype: add serializable attribute * SectorServicePrototype: default name * SectorServicePrototype to shared * YAML linter fixes, no service serialization * ProtoIdWhitelist: use List, adjust bounty values * PirateBounty: use existing Bounty name ID group * global service: station component, bounty system * Redundant functions, generics * SectorServiceSystem: interface woes * PirateBounty component work * PirateBounty: more sector service fixes * yet more pirate bounty & sector service system * SectorService: revert to GetServiceEntity for now * CargoSystem.PirateBounty.cs: restore entity UIDs * partial problems require partial components * Remove Cargo UI key, add a few debug prints * pirate bounty console and pallet FTL * Pirate bounty console UI * PirateBounty: compilation fixes * PirateBounty * Summon chest WIP * More pirate bounty stuff * PirateBountyEntry: access button rewrite * cancel vs. skip, spawning fixes * Undupe pirate-pallet strings * 30 minute cancel * pirate bounty chest and reminder descriptions * Rough pirate contraband console * Pirate contraband exchange * Add pirate appraisal tool * "black market" * Half of a bounty redemption algo * Pirate bounty redemption, part 2 * Pirate bounty redemption: first rough version? * closer to compilation * Compilation fixes * Bounty redemption UI * Pirate bounty redemption fixes * Set up label on pirate bounty, fix whitelist check * Id whitelist * ID whitelist fixes * Fix crate IDs used for lookup * fix bounty whitelisting, bounty chests, prices * Fix up bounties, fluent entries for bounties * Bah * Update cove.yml * pirate bounty consoles, unshaded pad, cove pads * piratebounty.png: fix one bad pixel * Revert the mark of the beast * humility * Pirate Bounty cleanup * cleanup contraband.png pixels * fix pirate logo * Polish: noises, UI updates & strings * Pirate Bounty: redemption text * Fix spawn chest sound * Update cove.yml * Update cove.yml * Update pirate.yml --------- Co-authored-by: Whatstone Co-authored-by: Whatstone Co-authored-by: Dvir Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- Content.Client/Stylesheets/StyleNano.cs | 4 + ...ntrabandPalletConsoleBoundUserInterface.cs | 11 +- .../Contraband/UI/ContrabandPalletMenu.xaml | 4 +- .../UI/ContrabandPalletMenu.xaml.cs | 21 +- .../PirateBountyConsoleBoundUserInterface.cs | 57 ++ ...untyRedemptionConsoleBoundUserInterface.cs | 54 ++ .../_NF/Pirate/Systems/PirateSystem.cs | 14 + .../_NF/Pirate/UI/PirateBountyEntry.xaml | 37 ++ .../_NF/Pirate/UI/PirateBountyEntry.xaml.cs | 85 +++ .../_NF/Pirate/UI/PirateBountyMenu.xaml | 37 ++ .../_NF/Pirate/UI/PirateBountyMenu.xaml.cs | 36 + .../Pirate/UI/PirateBountyRedemptionMenu.xaml | 11 + .../UI/PirateBoutyRedemptionMenu.xaml.cs | 24 + Content.Server/Cargo/Systems/CargoSystem.cs | 9 +- .../_NF/Cargo/CargoSystem.PirateBounty.cs | 629 ++++++++++++++++++ .../ContrabandPalletConsoleComponent.cs | 13 - .../Contraband/Systems/ContrabandSystem.cs | 2 +- .../Components/PirateBountyLabelComponent.cs | 22 + .../SectorPirateBountyDatabaseComponent.cs | 47 ++ .../_NF/SectorServices/SectorServiceSystem.cs | 140 ++++ .../StationSectorServiceHostComponent.cs | 9 + .../Components/ContrabandPriceGunComponent.cs | 8 +- .../_NF/Security/ContrabandPriceGunSystem.cs | 12 +- .../Components/ContrabandPalletComponent.cs | 18 + ...teBountyRedemptionConsoleInterfaceState.cs | 23 + .../PirateBountyConsoleComponent.cs | 94 +++ .../PirateBountyRedemptionConsoleComponent.cs | 28 + .../Events/PirateBountyRedemptionMessage.cs | 14 + Content.Shared/_NF/Pirate/PirateBountyData.cs | 45 ++ .../Prototypes/PirateBountyPrototype.cs | 82 +++ .../_NF/Pirate/SharedPirateSystem.cs | 33 + .../Prototypes/SectorServicePrototypes.cs | 26 + .../_NF/Whitelist/EntProtoIdWhitelist.cs | 32 + .../Whitelist/EntProtoIdWhitelistSystem.cs | 166 +++++ .../en-US/_NF/cargo/pirate-bounties.ftl | 35 + .../en-US/_NF/cargo/pirate-bounty-console.ftl | 26 + ...te-bounty-redemption-console-component.ftl | 12 + .../en-US/_NF/cargo/price-gun-component.ftl | 5 + .../contraband-exchange-console.ftl | 12 +- Resources/Maps/_NF/POI/cove.yml | 320 ++++----- .../Prototypes/Catalog/Bounties/bounties.yml | 1 - .../_NF/Catalog/Bounties/pirate_bounties.yml | 409 ++++++++++++ .../_NF/Catalog/Fills/Crates/pirate.yml | 1 - .../_NF/Entities/Objects/Misc/paper.yml | 31 + .../Objects/Tools/contrabandappraisal.yml | 26 + .../Machines/Computers/computers.yml | 99 ++- .../Machines/Computers/computers_tabletop.yml | 60 ++ .../Structures/Machines/contraband_pallet.yml | 17 +- .../Structures/Storage/Crates/crates.yml | 14 +- .../_NF/SectorServices/piratebounties.yml | 4 + .../_NF/Shipyard/BlackMarket/barnacle.yml | 2 +- .../_NF/Shipyard/BlackMarket/bocakillo.yml | 2 +- .../_NF/Shipyard/BlackMarket/falcon.yml | 2 +- .../_NF/Shipyard/BlackMarket/menace.yml | 2 +- .../_NF/Shipyard/BlackMarket/schooner.yml | 2 +- Resources/Prototypes/_NF/Shipyard/base.yml | 9 + .../_NF/Interface/Pirate/piratelogo.png | Bin 0 -> 185 bytes .../Machines/computers.rsi/contraband.png | Bin 1364 -> 793 bytes .../Machines/computers.rsi/meta.json | 52 +- .../Machines/computers.rsi/piratebounty.png | Bin 0 -> 684 bytes .../computers.rsi/piratebounty_pad.png | Bin 0 -> 754 bytes .../Machines/piratebounty_pallet.rsi/base.png | Bin 0 -> 525 bytes .../piratebounty_pallet.rsi/meta.json | 26 + .../piratebounty_pallet.rsi/unshaded.png | Bin 0 -> 512 bytes .../Crates/pirate_bounty.rsi/crate.png | Bin 0 -> 442 bytes .../Crates/pirate_bounty.rsi/crate_door.png | Bin 0 -> 504 bytes .../Crates/pirate_bounty.rsi/crate_icon.png | Bin 0 -> 586 bytes .../Crates/pirate_bounty.rsi/crate_open.png | Bin 0 -> 293 bytes .../Crates/pirate_bounty.rsi/meta.json | 40 ++ .../Crates/pirate_bounty.rsi/sparking.png | Bin 0 -> 206 bytes .../Crates/pirate_bounty.rsi/welded.png | Bin 0 -> 17749 bytes 71 files changed, 2863 insertions(+), 193 deletions(-) create mode 100644 Content.Client/_NF/Pirate/BUI/PirateBountyConsoleBoundUserInterface.cs create mode 100644 Content.Client/_NF/Pirate/BUI/PirateBountyRedemptionConsoleBoundUserInterface.cs create mode 100644 Content.Client/_NF/Pirate/Systems/PirateSystem.cs create mode 100644 Content.Client/_NF/Pirate/UI/PirateBountyEntry.xaml create mode 100644 Content.Client/_NF/Pirate/UI/PirateBountyEntry.xaml.cs create mode 100644 Content.Client/_NF/Pirate/UI/PirateBountyMenu.xaml create mode 100644 Content.Client/_NF/Pirate/UI/PirateBountyMenu.xaml.cs create mode 100644 Content.Client/_NF/Pirate/UI/PirateBountyRedemptionMenu.xaml create mode 100644 Content.Client/_NF/Pirate/UI/PirateBoutyRedemptionMenu.xaml.cs create mode 100644 Content.Server/_NF/Cargo/CargoSystem.PirateBounty.cs delete mode 100644 Content.Server/_NF/Contraband/Components/ContrabandPalletConsoleComponent.cs create mode 100644 Content.Server/_NF/Pirate/Components/PirateBountyLabelComponent.cs create mode 100644 Content.Server/_NF/Pirate/Components/SectorPirateBountyDatabaseComponent.cs create mode 100644 Content.Server/_NF/SectorServices/SectorServiceSystem.cs create mode 100644 Content.Server/_NF/SectorServices/StationSectorServiceHostComponent.cs create mode 100644 Content.Shared/_NF/Contraband/Components/ContrabandPalletComponent.cs create mode 100644 Content.Shared/_NF/Pirate/BUI/PirateBountyRedemptionConsoleInterfaceState.cs create mode 100644 Content.Shared/_NF/Pirate/Components/PirateBountyConsoleComponent.cs create mode 100644 Content.Shared/_NF/Pirate/Components/PirateBountyRedemptionConsoleComponent.cs create mode 100644 Content.Shared/_NF/Pirate/Events/PirateBountyRedemptionMessage.cs create mode 100644 Content.Shared/_NF/Pirate/PirateBountyData.cs create mode 100644 Content.Shared/_NF/Pirate/Prototypes/PirateBountyPrototype.cs create mode 100644 Content.Shared/_NF/Pirate/SharedPirateSystem.cs create mode 100644 Content.Shared/_NF/SectorServices/Prototypes/SectorServicePrototypes.cs create mode 100644 Content.Shared/_NF/Whitelist/EntProtoIdWhitelist.cs create mode 100644 Content.Shared/_NF/Whitelist/EntProtoIdWhitelistSystem.cs create mode 100644 Resources/Locale/en-US/_NF/cargo/pirate-bounties.ftl create mode 100644 Resources/Locale/en-US/_NF/cargo/pirate-bounty-console.ftl create mode 100644 Resources/Locale/en-US/_NF/cargo/pirate-bounty-redemption-console-component.ftl create mode 100644 Resources/Prototypes/_NF/Catalog/Bounties/pirate_bounties.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Misc/paper.yml create mode 100644 Resources/Prototypes/_NF/SectorServices/piratebounties.yml create mode 100644 Resources/Textures/_NF/Interface/Pirate/piratelogo.png create mode 100644 Resources/Textures/_NF/Structures/Machines/computers.rsi/piratebounty.png create mode 100644 Resources/Textures/_NF/Structures/Machines/computers.rsi/piratebounty_pad.png create mode 100644 Resources/Textures/_NF/Structures/Machines/piratebounty_pallet.rsi/base.png create mode 100644 Resources/Textures/_NF/Structures/Machines/piratebounty_pallet.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/piratebounty_pallet.rsi/unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/pirate_bounty.rsi/crate.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/pirate_bounty.rsi/crate_door.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/pirate_bounty.rsi/crate_icon.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/pirate_bounty.rsi/crate_open.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/pirate_bounty.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/pirate_bounty.rsi/sparking.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/pirate_bounty.rsi/welded.png diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs index c7d667e2b3b..500aa7264b7 100644 --- a/Content.Client/Stylesheets/StyleNano.cs +++ b/Content.Client/Stylesheets/StyleNano.cs @@ -1423,6 +1423,10 @@ public StyleNano(IResourceCache resCache) : base(resCache) .Prop(TextureRect.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Nano/ntlogo.svg.png")) .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#757575")), + Element().Class("PirateLogoDark") // Frontier + .Prop(TextureRect.StylePropertyTexture, resCache.GetTexture("/Textures/_NF/Interface/Pirate/piratelogo.png")) // Frontier + .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#757575")), // Frontier + Element