From 67088742843f97decee76caaf1ae5c679cfaf518 Mon Sep 17 00:00:00 2001 From: Ko4ergaNext Date: Tue, 21 Jan 2025 17:38:10 +0300 Subject: [PATCH 1/4] cute --- Resources/Maps/Next/next_cute.yml | 188 +++++++++++------- .../Prototypes/Corvax/Maps/Next/cute.yml | 20 +- 2 files changed, 122 insertions(+), 86 deletions(-) diff --git a/Resources/Maps/Next/next_cute.yml b/Resources/Maps/Next/next_cute.yml index 45498f04443..b3a45fa6701 100644 --- a/Resources/Maps/Next/next_cute.yml +++ b/Resources/Maps/Next/next_cute.yml @@ -3673,11 +3673,6 @@ entities: 6880: 364,404 6881: 363,404 6882: 362,404 - - node: - zIndex: 1 - color: '#3535358E' - id: QuarterTileOverlayGreyscale - decals: 7010: 416,365 7011: 416,364 7012: 416,363 @@ -4216,11 +4211,6 @@ entities: 6876: 363,402 6877: 360,402 6878: 359,402 - - node: - zIndex: 1 - color: '#3535358E' - id: QuarterTileOverlayGreyscale180 - decals: 7007: 414,363 7008: 414,364 7009: 414,365 @@ -5060,11 +5050,6 @@ entities: 6793: 381,402 6794: 382,402 6795: 363,402 - - node: - zIndex: 1 - color: '#D3D3D32D' - id: QuarterTileOverlayGreyscale270 - decals: 7015: 416,363 7016: 416,364 7017: 416,365 @@ -5607,11 +5592,6 @@ entities: 1040: 356,404 1041: 355,404 1042: 354,404 - - node: - zIndex: 1 - color: '#D3D3D32D' - id: QuarterTileOverlayGreyscale90 - decals: 7019: 414,365 7020: 414,364 7021: 414,363 @@ -7204,7 +7184,9 @@ entities: 1: 2235 0: 8192 82,111: - 0: 245 + 0: 17653 + 82,112: + 0: 25708 83,108: 1: 50944 83,109: @@ -7212,17 +7194,35 @@ entities: 83,110: 1: 4095 83,111: - 0: 242 + 1: 61166 + 83,112: + 1: 60142 84,108: 1: 65280 84,109: 1: 61661 84,110: - 1: 4095 + 1: 20479 84,111: - 0: 241 + 1: 65535 80,112: 0: 8 + 82,113: + 0: 17996 + 82,114: + 0: 12 + 83,114: + 0: 47 + 83,113: + 1: 238 + 0: 16384 + 84,112: + 1: 65535 + 84,113: + 1: 255 + 0: 16384 + 84,114: + 0: 47 84,89: 0: 8936 84,88: @@ -7374,7 +7374,8 @@ entities: 1: 255 0: 61440 87,107: - 1: 32624 + 5: 30576 + 1: 2048 88,104: 1: 39150 0: 8192 @@ -7391,11 +7392,19 @@ entities: 85,110: 1: 1911 85,111: - 0: 49 + 1: 13107 + 0: 128 + 85,112: + 1: 51 + 0: 16512 86,108: 1: 56576 86,109: 1: 12281 + 86,111: + 0: 12560 + 86,112: + 0: 4881 87,109: 1: 10098 87,108: @@ -7445,7 +7454,7 @@ entities: 90,99: 1: 30454 90,100: - 1: 63342 + 1: 65390 91,97: 1: 61182 91,98: @@ -7473,7 +7482,7 @@ entities: 89,104: 1: 33790 90,101: - 1: 47623 + 1: 47631 90,102: 1: 59640 90,103: @@ -7601,7 +7610,7 @@ entities: 1: 13311 0: 32768 95,100: - 1: 64392 + 1: 65416 0: 2 92,103: 1: 2720 @@ -7622,7 +7631,7 @@ entities: 94,104: 1: 53241 95,101: - 1: 30475 + 1: 30479 95,102: 1: 32631 95,103: @@ -7815,14 +7824,10 @@ entities: 1: 4096 98,97: 1: 16 - 98,99: - 1: 239 - 0: 24576 98,98: - 1: 57344 - 98,100: - 0: 5 - 1: 65280 + 1: 61440 + 98,99: + 1: 13311 99,98: 1: 61440 99,99: @@ -7832,9 +7837,9 @@ entities: 0: 4 1: 65280 100,98: - 1: 45192 + 1: 61576 100,99: - 1: 191 + 1: 255 0: 16384 97,101: 1: 58895 @@ -7844,6 +7849,8 @@ entities: 1: 17990 97,104: 1: 27733 + 98,100: + 1: 65328 98,101: 1: 64319 98,102: @@ -7859,10 +7866,10 @@ entities: 99,103: 1: 62395 100,100: - 1: 64256 + 1: 65280 0: 12 100,101: - 1: 47883 + 1: 47887 100,102: 1: 35835 100,103: @@ -8036,28 +8043,28 @@ entities: 101,97: 1: 48059 101,98: - 1: 45499 + 1: 61883 101,99: - 1: 191 + 1: 255 0: 16384 101,100: 0: 4 - 1: 64256 + 1: 65280 102,97: 1: 48127 102,98: - 1: 45247 + 1: 61631 102,99: - 1: 32959 + 1: 35071 103,97: 1: 57343 103,98: - 1: 47583 + 1: 63967 103,99: - 1: 12735 + 1: 13311 0: 32768 102,100: - 1: 64392 + 1: 65416 103,100: 1: 45875 104,96: @@ -8065,12 +8072,12 @@ entities: 104,97: 1: 53727 104,98: - 1: 55519 + 1: 63711 104,99: - 1: 51423 + 1: 51455 0: 4096 101,101: - 1: 47899 + 1: 47903 101,102: 1: 48123 101,103: @@ -8078,7 +8085,7 @@ entities: 101,104: 1: 8191 102,101: - 1: 47899 + 1: 47903 102,102: 1: 48059 102,103: @@ -8805,6 +8812,10 @@ entities: 1: 560 127,99: 1: 32 + 85,113: + 0: 19564 + 86,113: + 0: 1 uniqueMixes: - volume: 2500 immutable: True @@ -9304,21 +9315,24 @@ entities: data: tiles: 0,0: - 0: 4912 - 1: 8192 - 2: 4 + 0: 13104 + 1: 34820 + 0,-1: + 1: 28672 0,1: 0: 19 - 2: 64 + 1: 200 -1,0: 0: 58432 - 2: 2 + 1: 19 -1,1: 0: 15 -2,0: - 2: 32768 + 1: 32768 -2,1: - 2: 128 + 1: 128 + -1,-1: + 1: 49152 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -9335,21 +9349,6 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 293.14975 - moles: - - 20.078888 - - 75.53487 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - volume: 2500 immutable: True moles: @@ -9408,6 +9407,43 @@ entities: - type: GridAtmosphere version: 2 data: + tiles: + 0,0: + 0: 5 + 1: 2 + 0,-1: + 1: 30464 + uniqueMixes: + - volume: 2500 + temperature: 293.15 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -144360,7 +144396,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -91392.336 + secondsUntilStateChange: -91430.336 state: Opening - type: Airlock autoClose: False diff --git a/Resources/Prototypes/Corvax/Maps/Next/cute.yml b/Resources/Prototypes/Corvax/Maps/Next/cute.yml index c76f7e5b24d..026a9eedaae 100644 --- a/Resources/Prototypes/Corvax/Maps/Next/cute.yml +++ b/Resources/Prototypes/Corvax/Maps/Next/cute.yml @@ -4,8 +4,8 @@ mapPath: /Maps/Next/next_cute.yml maxRandomOffset: 0 randomRotation: false - minPlayers: 25 - maxPlayers: 55 + minPlayers: 0 + maxPlayers: 35 stations: NextCute: stationProto: StandardNanotrasenStation @@ -27,23 +27,23 @@ # cargo Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 2, 2 ] - CargoTechnician: [ 3, 3 ] + CargoTechnician: [ 2, 2 ] # engineering ChiefEngineer: [ 1, 1 ] AtmosphericTechnician: [ 2, 2 ] - StationEngineer: [ 5, 5 ] - TechnicalAssistant: [ 2, 2 ] + StationEngineer: [ 3, 3 ] + TechnicalAssistant: [ 1, 1 ] # medical ChiefMedicalOfficer: [ 1, 1 ] - MedicalDoctor: [ 3, 3 ] + MedicalDoctor: [ 2, 2 ] MedicalIntern: [ 2, 2 ] Psychologist: [ 1, 1 ] - Paramedic: [ 2, 2 ] + Paramedic: [ 1, 1 ] Chemist: [ 2, 2 ] # science ResearchDirector: [ 1, 1 ] - Scientist: [ 4, 4 ] - ResearchAssistant: [ 2, 2 ] + Scientist: [ 3, 3 ] + ResearchAssistant: [ 1, 1 ] # security HeadOfSecurity: [ 1, 1 ] Warden: [ 1, 1 ] @@ -59,7 +59,7 @@ Chaplain: [ 1, 1 ] Chef: [ 1, 1 ] Clown: [ 1, 1 ] - Janitor: [ 3, 3 ] + Janitor: [ 2, 2 ] Librarian: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] From f93cdadd425ba5798ed722312598c47c30e20e9a Mon Sep 17 00:00:00 2001 From: Ko4ergaNext Date: Tue, 21 Jan 2025 17:56:18 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D1=83=D1=8D=D1=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Corvax/Maps/Next/cute.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Corvax/Maps/Next/cute.yml b/Resources/Prototypes/Corvax/Maps/Next/cute.yml index 026a9eedaae..3be630ca0c2 100644 --- a/Resources/Prototypes/Corvax/Maps/Next/cute.yml +++ b/Resources/Prototypes/Corvax/Maps/Next/cute.yml @@ -5,7 +5,7 @@ maxRandomOffset: 0 randomRotation: false minPlayers: 0 - maxPlayers: 35 + maxPlayers: 35 stations: NextCute: stationProto: StandardNanotrasenStation From 556792ee715df941664bef25655c388640bad63c Mon Sep 17 00:00:00 2001 From: Ko4ergaNext Date: Wed, 22 Jan 2025 11:52:29 +0300 Subject: [PATCH 3/4] let's meow again --- Resources/Maps/Next/next_cute.yml | 2 +- Resources/Prototypes/Corvax/Maps/Next/cute.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Maps/Next/next_cute.yml b/Resources/Maps/Next/next_cute.yml index b3a45fa6701..bb2553e9b3e 100644 --- a/Resources/Maps/Next/next_cute.yml +++ b/Resources/Maps/Next/next_cute.yml @@ -102591,7 +102591,7 @@ entities: content: > Оппорозидон используется для регенерации гниющих тканей и мозгового вещества. - Действует на мертвых существ, чья температура тела не более 150K. + Действует на мертвых существ, чья температура тела не более 150K. [head=2]Рецепт Оппорозидона[/head] diff --git a/Resources/Prototypes/Corvax/Maps/Next/cute.yml b/Resources/Prototypes/Corvax/Maps/Next/cute.yml index 3be630ca0c2..026a9eedaae 100644 --- a/Resources/Prototypes/Corvax/Maps/Next/cute.yml +++ b/Resources/Prototypes/Corvax/Maps/Next/cute.yml @@ -5,7 +5,7 @@ maxRandomOffset: 0 randomRotation: false minPlayers: 0 - maxPlayers: 35 + maxPlayers: 35 stations: NextCute: stationProto: StandardNanotrasenStation From a8298e38e7722826763c05c5d0a0ebf382667248 Mon Sep 17 00:00:00 2001 From: Ko4ergaNext Date: Wed, 22 Jan 2025 12:01:20 +0300 Subject: [PATCH 4/4] zhopa --- Resources/Maps/Next/next_cute.yml | 2 +- Resources/Prototypes/Corvax/Maps/Next/cute.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Maps/Next/next_cute.yml b/Resources/Maps/Next/next_cute.yml index bb2553e9b3e..b3a45fa6701 100644 --- a/Resources/Maps/Next/next_cute.yml +++ b/Resources/Maps/Next/next_cute.yml @@ -102591,7 +102591,7 @@ entities: content: > Оппорозидон используется для регенерации гниющих тканей и мозгового вещества. - Действует на мертвых существ, чья температура тела не более 150K. + Действует на мертвых существ, чья температура тела не более 150K. [head=2]Рецепт Оппорозидона[/head] diff --git a/Resources/Prototypes/Corvax/Maps/Next/cute.yml b/Resources/Prototypes/Corvax/Maps/Next/cute.yml index 026a9eedaae..9112e10ccd3 100644 --- a/Resources/Prototypes/Corvax/Maps/Next/cute.yml +++ b/Resources/Prototypes/Corvax/Maps/Next/cute.yml @@ -21,7 +21,7 @@ path: /Maps/Corvax/Shuttles/corvax_cargocute.yml - type: StationJobs availableJobs: - # command + # command Captain: [ 1, 1 ] IAA: [ 1, 1 ] # cargo