From 6a10c567827c7ac65be25b6e2ba3a3981086a06f Mon Sep 17 00:00:00 2001 From: EmoGarbage404 Date: Mon, 15 Jun 2026 10:40:39 -0400 Subject: [PATCH 1/3] Fix directional spawners getting fucked by fixrotations --- Resources/Maps/_ES/toast.yml | 5 +++-- .../Markers/Spawners/Random/posters.yml | 9 +++------ .../Markers/Spawners/Random/structures.yml | 3 +-- .../_ES/Entities/Markers/es_marker_base.yml | 11 +++++++++++ .../_ES/Markers/spawners.rsi/directional.png | Bin 339 -> 326 bytes 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Resources/Maps/_ES/toast.yml b/Resources/Maps/_ES/toast.yml index 67bc7be61b1..263e699c5a1 100644 --- a/Resources/Maps/_ES/toast.yml +++ b/Resources/Maps/_ES/toast.yml @@ -4,7 +4,7 @@ meta: engineVersion: 277.0.0 forkId: "" forkVersion: "" - time: 06/14/2026 16:50:29 + time: 06/15/2026 14:00:25 entityCount: 14692 maps: - 3 @@ -40113,9 +40113,10 @@ entities: parent: 2 - proto: ESSpawnerRandomArcadeOrPiano entities: - - uid: 14310 + - uid: 7514 components: - type: Transform + rot: -1.5707963267948966 rad pos: -3.5,-8.5 parent: 2 - proto: ESSpawnerRandomDistributedArmory diff --git a/Resources/Prototypes/_ES/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/_ES/Entities/Markers/Spawners/Random/posters.yml index 4817eb2c765..693f9d1b31c 100644 --- a/Resources/Prototypes/_ES/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/_ES/Entities/Markers/Spawners/Random/posters.yml @@ -1,5 +1,5 @@ - type: entity - parent: ESSpawnerBase + parent: ESSpawnerBaseDirectional id: ESRandomPosterAny name: random poster spawner suffix: ES @@ -16,10 +16,9 @@ - type: EntityTableSpawner table: tableId: ESPosterAny - directional: true - type: entity - parent: ESSpawnerBase + parent: ESSpawnerBaseDirectional id: ESRandomPosterContraband name: random contraband poster spawner suffix: ES @@ -35,10 +34,9 @@ - type: EntityTableSpawner table: tableId: ESPosterContraband - directional: true - type: entity - parent: ESSpawnerBase + parent: ESSpawnerBaseDirectional id: ESRandomPosterLegit name: random legit poster spawner suffix: ES @@ -54,4 +52,3 @@ - type: EntityTableSpawner table: tableId: ESPosterLegit - directional: true diff --git a/Resources/Prototypes/_ES/Entities/Markers/Spawners/Random/structures.yml b/Resources/Prototypes/_ES/Entities/Markers/Spawners/Random/structures.yml index 5f0aafd89da..d86fff08ef2 100644 --- a/Resources/Prototypes/_ES/Entities/Markers/Spawners/Random/structures.yml +++ b/Resources/Prototypes/_ES/Entities/Markers/Spawners/Random/structures.yml @@ -182,7 +182,7 @@ weight: 1 - type: entity - parent: ESSpawnerBase + parent: ESSpawnerBaseDirectional id: ESSpawnerRandomArcadeOrPiano name: Bar Entertainment Spawner suffix: ES @@ -201,4 +201,3 @@ weight: 2 - id: ESInstrumentPiano weight: 1 - directional: true diff --git a/Resources/Prototypes/_ES/Entities/Markers/es_marker_base.yml b/Resources/Prototypes/_ES/Entities/Markers/es_marker_base.yml index 35b966314cb..b8c8cd9a58d 100644 --- a/Resources/Prototypes/_ES/Entities/Markers/es_marker_base.yml +++ b/Resources/Prototypes/_ES/Entities/Markers/es_marker_base.yml @@ -23,3 +23,14 @@ # shader: unshaded - type: EntityTableSpawner offset: 0.0 + +- type: entity + parent: ESSpawnerBase + id: ESSpawnerBaseDirectional + abstract: true + components: + - type: EntityTableSpawner + directional: true + - type: Tag + tags: + - ForceNoFixRotations diff --git a/Resources/Textures/_ES/Markers/spawners.rsi/directional.png b/Resources/Textures/_ES/Markers/spawners.rsi/directional.png index 15187cf9dd78b1c4c00fcd7b3b9e174c204a908d..fd68f01388949cdeaef97d2b3745da5bf3bafdd0 100644 GIT binary patch delta 286 zcmV+(0pb4B0>%Q6F@FF_L_t(|obB2@4}%~OfMIO9iIe{SU#OFGri(O`(huQ;65nUT zq#j;RG@MES0000uqb~J_dhD$~Hp?yfT)A_o5nJi8w@#Rhmf~Mzr&Wd?d%Mo&FOlWwm3Rq7%bCZW}fS2-_2s`A434=-W>00000004m2WN#(=+ta1DrfbH2nnaE7 z1f=4Mb%)i~tQ;n7kN!7eE%IWG5#}bXw@D_-5tBWm) ktuKN+1_1y702iFn9UHpwJ76R|?f?J)07*qoM6N<$fCmBbkW9A`r(06 z;`?lv*gH>(hEpj30001Ilu1u4Yi-u!p&P}&<(or{*s83xx#gL;<(aXIky89i*tCvO z*4niF^cc7O^fDuVm0SVri(g2KaFrzR>3Ed?qle7}P;<3i~1F(B?H@=*G-d@un)0oBm3=2--zR_2QM!i;#-E@cqM!7ytkO00000AT{1w$?NUu zqqnAG#(qj7#&-gt;s)yutGQX()Y|NQH(V`pX`^IwqVM|iYkRiJLdQ?;1BuW?Gr&H! xz9UC8O6^(T>LgYlwkW2)2=W*N0001RN_Q&IqI8t(ZL$CW002ovPDHLkV1nEfm!tpy From 4788ba60723a648dbe061e1ae902e80e34ac7b5e Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Tue, 28 Apr 2026 09:31:52 -0400 Subject: [PATCH 2/3] Fix mapping autosaves (#39587) Fix autosaves while mapping --- Content.Server/Mapping/MappingSystem.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Server/Mapping/MappingSystem.cs b/Content.Server/Mapping/MappingSystem.cs index 6c2840fa223..1780883c89e 100644 --- a/Content.Server/Mapping/MappingSystem.cs +++ b/Content.Server/Mapping/MappingSystem.cs @@ -73,10 +73,10 @@ public override void Update(float frameTime) } _currentlyAutosaving[uid] = (CalculateNextTime(), name); - var saveDir = Path.Combine(_cfg.GetCVar(CCVars.AutosaveDirectory), name).Replace(Path.DirectorySeparatorChar, '/'); - _resMan.UserData.CreateDir(new ResPath(saveDir).ToRootedPath()); + var saveDir = new ResPath(Path.Combine(_cfg.GetCVar(CCVars.AutosaveDirectory), name).Replace(Path.DirectorySeparatorChar, '/')); + _resMan.UserData.CreateDir(saveDir.ToRootedPath()); - var path = new ResPath(Path.Combine(saveDir, $"{DateTime.Now:yyyy-M-dd_HH.mm.ss}-AUTO.yml")); + var path = saveDir / new ResPath($"{DateTime.Now:yyyy-M-dd_HH.mm.ss}-AUTO.yml"); Log.Info($"Autosaving map {name} ({uid}) to {path}. Next save in {ReadableTimeLeft(uid)} seconds."); if (HasComp(uid)) From 4f0b0ea9502caf7ea668685a6a5d73d378dbc725 Mon Sep 17 00:00:00 2001 From: EmoGarbage404 Date: Mon, 15 Jun 2026 11:09:11 -0400 Subject: [PATCH 3/3] Re-rotate the signs --- Resources/Maps/_ES/toast.yml | 173 +++++++++++++++++++++++++++++------ 1 file changed, 143 insertions(+), 30 deletions(-) diff --git a/Resources/Maps/_ES/toast.yml b/Resources/Maps/_ES/toast.yml index 263e699c5a1..642d70cc38d 100644 --- a/Resources/Maps/_ES/toast.yml +++ b/Resources/Maps/_ES/toast.yml @@ -4,8 +4,8 @@ meta: engineVersion: 277.0.0 forkId: "" forkVersion: "" - time: 06/15/2026 14:00:25 - entityCount: 14692 + time: 06/15/2026 15:02:42 + entityCount: 14710 maps: - 3 grids: @@ -39641,6 +39641,19 @@ entities: - uid: 23 components: - type: Transform + rot: 1.5707963267948966 rad + pos: -54.5,9.5 + parent: 2 + - uid: 5128 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -30.5,-46.5 + parent: 2 + - uid: 8029 + components: + - type: Transform + rot: 1.5707963267948966 rad pos: -54.5,12.5 parent: 2 - uid: 8911 @@ -39648,10 +39661,29 @@ entities: - type: Transform pos: -0.5,15.5 parent: 2 - - uid: 12286 + - uid: 9512 components: - type: Transform - pos: -30.5,-46.5 + rot: 3.141592653589793 rad + pos: -20.5,-2.5 + parent: 2 + - uid: 10480 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -36.5,4.5 + parent: 2 + - uid: 11129 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -45.5,2.5 + parent: 2 + - uid: 11868 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -47.5,-3.5 parent: 2 - uid: 12287 components: @@ -39668,35 +39700,38 @@ entities: - type: Transform pos: -17.5,-28.5 parent: 2 - - uid: 12290 + - uid: 12293 components: - type: Transform - pos: 16.5,-27.5 + rot: 3.141592653589793 rad + pos: -11.5,-32.5 parent: 2 - - uid: 12291 + - uid: 13819 components: - type: Transform - pos: -54.5,9.5 + pos: -13.5,-14.5 parent: 2 - - uid: 12292 + - uid: 13820 components: - type: Transform - pos: -20.5,-2.5 + pos: -4.5,-20.5 parent: 2 - - uid: 12293 + - uid: 13823 components: - type: Transform - pos: -36.5,4.5 + rot: -1.5707963267948966 rad + pos: -0.5,15.5 parent: 2 - - uid: 12294 + - uid: 13824 components: - type: Transform - pos: -45.5,2.5 + rot: 1.5707963267948966 rad + pos: -0.5,16.5 parent: 2 - - uid: 12295 + - uid: 13825 components: - type: Transform - pos: -47.5,-3.5 + pos: 4.5,-10.5 parent: 2 - uid: 14305 components: @@ -39720,6 +39755,12 @@ entities: - type: Transform pos: 26.5,-1.5 parent: 2 + - uid: 12286 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -65.5,8.5 + parent: 2 - uid: 12296 components: - type: Transform @@ -39750,6 +39791,36 @@ entities: - type: Transform pos: 24.5,-5.5 parent: 2 + - uid: 13816 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 24.5,-5.5 + parent: 2 + - uid: 13817 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 24.5,-6.5 + parent: 2 + - uid: 13818 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,-3.5 + parent: 2 + - uid: 13821 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -19.5,10.5 + parent: 2 + - uid: 13822 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -17.5,13.5 + parent: 2 - uid: 14306 components: - type: Transform @@ -39760,11 +39831,6 @@ entities: - type: Transform pos: -50.5,19.5 parent: 2 - - uid: 14308 - components: - - type: Transform - pos: -65.5,8.5 - parent: 2 - proto: ESRandomPosterLegit entities: - uid: 681 @@ -39772,6 +39838,12 @@ entities: - type: Transform pos: 14.5,-19.5 parent: 2 + - uid: 7515 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5,-19.5 + parent: 2 - uid: 8004 components: - type: Transform @@ -39787,16 +39859,58 @@ entities: - type: Transform pos: -46.5,-41.5 parent: 2 - - uid: 12303 + - uid: 12290 components: - type: Transform + rot: 1.5707963267948966 rad pos: -34.5,-2.5 parent: 2 - - uid: 14214 + - uid: 12291 components: - type: Transform + rot: 1.5707963267948966 rad pos: -49.5,-43.5 parent: 2 + - uid: 12294 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -78.5,-13.5 + parent: 2 + - uid: 12295 + components: + - type: Transform + pos: -47.5,-8.5 + parent: 2 + - uid: 13116 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-27.5 + parent: 2 + - uid: 13815 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,3.5 + parent: 2 + - uid: 13826 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-18.5 + parent: 2 + - uid: 13827 + components: + - type: Transform + pos: 14.5,-10.5 + parent: 2 + - uid: 13828 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 15.5,-18.5 + parent: 2 - proto: ESRound357 entities: - uid: 13326 @@ -65807,10 +65921,9 @@ entities: fixtures: {} - proto: PosterContrabandRedRum entities: - - uid: 8029 + - uid: 12292 components: - type: Transform - rot: 1.5707963267948966 rad pos: -10.5,-37.5 parent: 2 - type: Fixtures @@ -83284,11 +83397,6 @@ entities: - type: Transform pos: -14.5,-37.5 parent: 2 - - uid: 5128 - components: - - type: Transform - pos: -11.5,-37.5 - parent: 2 - uid: 5129 components: - type: Transform @@ -85884,6 +85992,11 @@ entities: - type: Transform pos: -60.5,22.5 parent: 2 + - uid: 12303 + components: + - type: Transform + pos: -11.5,-37.5 + parent: 2 - uid: 12439 components: - type: Transform