From 5c66dde61291aaa97fb89544fc533b681d6481be Mon Sep 17 00:00:00 2001 From: Bomjojuk Date: Sat, 28 Dec 2024 19:24:11 +0300 Subject: [PATCH] This cannot continue --- .../SS220/Shuttles/lostSoul/lost_cargo.yml | 186 +++++++++--------- .../Prototypes/GameRules/unknown_shuttles.yml | 29 +++ .../SS220/GameRules/unknown_shuttles.yml | 29 --- 3 files changed, 126 insertions(+), 118 deletions(-) diff --git a/Resources/Maps/SS220/Shuttles/lostSoul/lost_cargo.yml b/Resources/Maps/SS220/Shuttles/lostSoul/lost_cargo.yml index ee77e3dea656..4605f0bcc5f8 100644 --- a/Resources/Maps/SS220/Shuttles/lostSoul/lost_cargo.yml +++ b/Resources/Maps/SS220/Shuttles/lostSoul/lost_cargo.yml @@ -919,32 +919,32 @@ entities: parent: 2 - proto: HolopadCargoShuttle entities: - - uid: 207 + - uid: 119 components: - type: Transform pos: -2.5,3.5 parent: 2 - proto: PlasticFlapsAirtightClear entities: - - uid: 119 + - uid: 120 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,0.5 parent: 2 - - uid: 120 + - uid: 121 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,4.5 parent: 2 - - uid: 121 + - uid: 122 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,0.5 parent: 2 - - uid: 122 + - uid: 123 components: - type: Transform rot: 1.5707963267948966 rad @@ -952,7 +952,7 @@ entities: parent: 2 - proto: Poweredlight entities: - - uid: 123 + - uid: 124 components: - type: Transform rot: -1.5707963267948966 rad @@ -960,7 +960,7 @@ entities: parent: 2 - type: ApcPowerReceiver powerLoad: 0 - - uid: 124 + - uid: 125 components: - type: Transform rot: 1.5707963267948966 rad @@ -968,7 +968,7 @@ entities: parent: 2 - type: ApcPowerReceiver powerLoad: 0 - - uid: 125 + - uid: 126 components: - type: Transform rot: 1.5707963267948966 rad @@ -976,7 +976,7 @@ entities: parent: 2 - type: ApcPowerReceiver powerLoad: 0 - - uid: 126 + - uid: 127 components: - type: Transform rot: -1.5707963267948966 rad @@ -986,112 +986,112 @@ entities: powerLoad: 0 - proto: RandomPosterAny entities: - - uid: 127 + - uid: 128 components: - type: Transform pos: -4.5,6.5 parent: 2 - proto: RandomSpawner100 entities: - - uid: 128 + - uid: 129 components: - type: Transform pos: -1.5,-0.5 parent: 2 - - uid: 129 + - uid: 130 components: - type: Transform pos: -0.5,0.5 parent: 2 - - uid: 130 + - uid: 131 components: - type: Transform pos: -4.5,1.5 parent: 2 - - uid: 131 + - uid: 132 components: - type: Transform pos: -4.5,3.5 parent: 2 - - uid: 132 + - uid: 133 components: - type: Transform pos: -0.5,3.5 parent: 2 - - uid: 133 + - uid: 134 components: - type: Transform pos: -2.5,5.5 parent: 2 - proto: SalvageLootSpawner entities: - - uid: 134 + - uid: 135 components: - type: Transform pos: -1.5,2.5 parent: 2 - proto: SalvageMaterialCrateSpawner entities: - - uid: 135 + - uid: 136 components: - type: Transform pos: -3.5,-0.5 parent: 2 - - uid: 136 + - uid: 137 components: - type: Transform pos: -4.5,-0.5 parent: 2 - - uid: 137 + - uid: 138 components: - type: Transform pos: -3.5,5.5 parent: 2 - proto: ShuttleWindow entities: - - uid: 138 + - uid: 139 components: - type: Transform pos: -1.5,8.5 parent: 2 - - uid: 139 + - uid: 140 components: - type: Transform pos: -2.5,9.5 parent: 2 - - uid: 140 + - uid: 141 components: - type: Transform pos: -3.5,8.5 parent: 2 - proto: ShuttleWindowDiagonal entities: - - uid: 141 + - uid: 142 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,9.5 parent: 2 - - uid: 142 + - uid: 143 components: - type: Transform pos: -3.5,9.5 parent: 2 - proto: SignalButtonDirectional entities: - - uid: 143 + - uid: 144 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-0.5 parent: 2 - - uid: 144 + - uid: 145 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,-0.5 parent: 2 - - uid: 145 + - uid: 146 components: - type: Transform rot: -1.5707963267948966 rad @@ -1107,7 +1107,7 @@ entities: - Pressed: Toggle 15: - Pressed: Toggle - - uid: 146 + - uid: 147 components: - type: Transform rot: 1.5707963267948966 rad @@ -1115,72 +1115,80 @@ entities: parent: 2 - proto: SubstationWallBasic entities: - - uid: 147 + - uid: 148 components: - type: Transform pos: -3.5,-1.5 parent: 2 - proto: TableReinforced entities: - - uid: 148 + - uid: 149 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,2.5 parent: 2 - - uid: 149 + - uid: 150 components: - type: Transform pos: -3.5,7.5 parent: 2 - - uid: 150 + - uid: 151 components: - type: Transform pos: -1.5,7.5 parent: 2 +- proto: TapeRecorder + entities: + - uid: 208 + components: + - type: Transform + rot: 0.29670597283903605 rad + pos: -1.5057731,2.5984643 + parent: 2 - proto: Thruster entities: - - uid: 151 + - uid: 152 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,7.5 parent: 2 - - uid: 152 + - uid: 153 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,7.5 parent: 2 - - uid: 153 + - uid: 154 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,-2.5 parent: 2 - - uid: 154 + - uid: 155 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-2.5 parent: 2 - - uid: 155 + - uid: 156 components: - type: Transform pos: -4.5,9.5 parent: 2 - - uid: 156 + - uid: 157 components: - type: Transform pos: -0.5,9.5 parent: 2 - - uid: 157 + - uid: 158 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-4.5 parent: 2 - - uid: 158 + - uid: 159 components: - type: Transform rot: 3.141592653589793 rad @@ -1188,14 +1196,14 @@ entities: parent: 2 - proto: TrashPile entities: - - uid: 159 + - uid: 160 components: - type: Transform pos: -2.5,-1.5 parent: 2 - proto: TwoWayLever entities: - - uid: 160 + - uid: 161 components: - type: Transform pos: -3.5,1.5 @@ -1214,7 +1222,7 @@ entities: - Left: Forward - Right: Reverse - Middle: Off - - uid: 161 + - uid: 162 components: - type: Transform pos: -1.5,1.5 @@ -1233,7 +1241,7 @@ entities: - Left: Forward - Right: Reverse - Middle: Off - - uid: 162 + - uid: 163 components: - type: Transform pos: -1.5,3.5 @@ -1252,7 +1260,7 @@ entities: - Left: Forward - Right: Reverse - Middle: Off - - uid: 163 + - uid: 164 components: - type: Transform pos: -3.5,3.5 @@ -1273,61 +1281,61 @@ entities: - Middle: Off - proto: VisitorCargoTechnicianSpawner entities: - - uid: 164 + - uid: 165 components: - type: Transform pos: -0.5,2.5 parent: 2 - - uid: 165 + - uid: 166 components: - type: Transform pos: -2.5,7.5 parent: 2 - proto: WallShuttleDark entities: - - uid: 166 + - uid: 167 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,8.5 parent: 2 - - uid: 167 + - uid: 168 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,8.5 parent: 2 - - uid: 168 + - uid: 169 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,8.5 parent: 2 - - uid: 169 + - uid: 170 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,8.5 parent: 2 - - uid: 170 + - uid: 171 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,7.5 parent: 2 - - uid: 171 + - uid: 172 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,6.5 parent: 2 - - uid: 172 + - uid: 173 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,7.5 parent: 2 - - uid: 173 + - uid: 174 components: - type: Transform rot: 1.5707963267948966 rad @@ -1335,74 +1343,74 @@ entities: parent: 2 - proto: WallShuttleDarkDiagonal entities: - - uid: 174 + - uid: 175 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,9.5 parent: 2 - - uid: 175 + - uid: 176 components: - type: Transform pos: -5.5,9.5 parent: 2 - proto: WallShuttleOrange entities: - - uid: 176 + - uid: 177 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-1.5 parent: 2 - - uid: 177 + - uid: 178 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,-1.5 parent: 2 - - uid: 178 + - uid: 179 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,6.5 parent: 2 - - uid: 179 + - uid: 180 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,6.5 parent: 2 - - uid: 180 + - uid: 181 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,-0.5 parent: 2 - - uid: 181 + - uid: 182 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,5.5 parent: 2 - - uid: 182 + - uid: 183 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,5.5 parent: 2 - - uid: 183 + - uid: 184 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-0.5 parent: 2 - - uid: 184 + - uid: 185 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,2.5 parent: 2 - - uid: 185 + - uid: 186 components: - type: Transform rot: 1.5707963267948966 rad @@ -1410,90 +1418,90 @@ entities: parent: 2 - proto: WallShuttleRed entities: - - uid: 186 + - uid: 187 components: - type: Transform pos: -0.5,-3.5 parent: 2 - - uid: 187 + - uid: 188 components: - type: Transform pos: -4.5,-3.5 parent: 2 - - uid: 188 + - uid: 189 components: - type: Transform pos: -3.5,-4.5 parent: 2 - - uid: 189 + - uid: 190 components: - type: Transform pos: -2.5,-4.5 parent: 2 - - uid: 190 + - uid: 191 components: - type: Transform pos: -1.5,-4.5 parent: 2 - - uid: 191 + - uid: 192 components: - type: Transform pos: -3.5,-3.5 parent: 2 - - uid: 192 + - uid: 193 components: - type: Transform pos: -1.5,-3.5 parent: 2 - - uid: 193 + - uid: 194 components: - type: Transform pos: -5.5,-3.5 parent: 2 - - uid: 194 + - uid: 195 components: - type: Transform pos: 0.5,-3.5 parent: 2 - - uid: 195 + - uid: 196 components: - type: Transform pos: -4.5,-2.5 parent: 2 - - uid: 196 + - uid: 197 components: - type: Transform pos: -0.5,-2.5 parent: 2 - - uid: 197 + - uid: 198 components: - type: Transform pos: -3.5,-1.5 parent: 2 - - uid: 198 + - uid: 199 components: - type: Transform pos: -4.5,-1.5 parent: 2 - - uid: 199 + - uid: 200 components: - type: Transform pos: -1.5,-1.5 parent: 2 - - uid: 200 + - uid: 201 components: - type: Transform pos: -0.5,-1.5 parent: 2 - proto: WallShuttleRedDiagonal entities: - - uid: 201 + - uid: 202 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,-4.5 parent: 2 - - uid: 202 + - uid: 203 components: - type: Transform rot: 3.141592653589793 rad @@ -1501,14 +1509,14 @@ entities: parent: 2 - proto: WindoorCargoLocked entities: - - uid: 203 + - uid: 204 components: - type: Transform pos: -2.5,7.5 parent: 2 - proto: WindoorSecurePlasma entities: - - uid: 204 + - uid: 205 components: - type: Transform rot: 3.141592653589793 rad @@ -1516,12 +1524,12 @@ entities: parent: 2 - proto: WindowReinforcedDirectional entities: - - uid: 205 + - uid: 206 components: - type: Transform pos: -1.5,7.5 parent: 2 - - uid: 206 + - uid: 207 components: - type: Transform pos: -3.5,7.5 diff --git a/Resources/Prototypes/GameRules/unknown_shuttles.yml b/Resources/Prototypes/GameRules/unknown_shuttles.yml index b1756f25ae2c..a3e5b5daa2ed 100644 --- a/Resources/Prototypes/GameRules/unknown_shuttles.yml +++ b/Resources/Prototypes/GameRules/unknown_shuttles.yml @@ -55,6 +55,35 @@ - type: RuleGrids - type: LoadMapRule +- type: entity + parent: BaseUnknownShuttleRule + id: UnknownShuttleCargoLost + components: + - type: StationEvent + maxOccurrences: 2 # should be the same as [copies] in shuttle_incoming_event.yml + - type: LoadMapRule + preloadedGrid: ShuttleCargoLost + +- type: entity + parent: BaseUnknownShuttleRule + id: UnknownShuttleTravelingCuisine + components: + - type: StationEvent + startAnnouncement: station-event-unknown-shuttle-incoming + maxOccurrences: 2 # should be the same as [copies] in shuttle_incoming_event.yml + - type: LoadMapRule + preloadedGrid: TravelingCuisine + +- type: entity + parent: BaseUnknownShuttleRule + id: UnknownShuttleDisasterEvacPod + components: + - type: StationEvent + startAnnouncement: station-event-unknown-shuttle-incoming + maxOccurrences: 3 # should be the same as [copies] in shuttle_incoming_event.yml + - type: LoadMapRule + preloadedGrid: DisasterEvacPod + # The power of 3 clowns proved too strong for the players and may need to be 1984'ed. Replace this with a more engaging clown shuttle. - type: entity parent: BaseUnknownShuttleRule diff --git a/Resources/Prototypes/SS220/GameRules/unknown_shuttles.yml b/Resources/Prototypes/SS220/GameRules/unknown_shuttles.yml index f028f10471d9..1e913086318a 100644 --- a/Resources/Prototypes/SS220/GameRules/unknown_shuttles.yml +++ b/Resources/Prototypes/SS220/GameRules/unknown_shuttles.yml @@ -7,32 +7,3 @@ weight: 2 - type: LoadMapRule preloadedGrid: Civil - -- type: entity - parent: BaseUnknownShuttleRule - id: UnknownShuttleCargoLost - components: - - type: StationEvent - maxOccurrences: 2 # should be the same as [copies] in shuttle_incoming_event.yml - - type: LoadMapRule - preloadedGrid: ShuttleCargoLost - -- type: entity - parent: BaseUnknownShuttleRule - id: UnknownShuttleTravelingCuisine - components: - - type: StationEvent - startAnnouncement: station-event-unknown-shuttle-incoming - maxOccurrences: 2 # should be the same as [copies] in shuttle_incoming_event.yml - - type: LoadMapRule - preloadedGrid: TravelingCuisine - -- type: entity - parent: BaseUnknownShuttleRule - id: UnknownShuttleDisasterEvacPod - components: - - type: StationEvent - startAnnouncement: station-event-unknown-shuttle-incoming - maxOccurrences: 3 # should be the same as [copies] in shuttle_incoming_event.yml - - type: LoadMapRule - preloadedGrid: DisasterEvacPod