Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Content.Server/Mapping/MappingSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<MapComponent>(uid))
Expand Down
176 changes: 145 additions & 31 deletions Resources/Maps/_ES/toast.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ meta:
engineVersion: 277.0.0
forkId: ""
forkVersion: ""
time: 06/14/2026 16:50:29
entityCount: 14692
time: 06/15/2026 15:02:42
entityCount: 14710
maps:
- 3
grids:
Expand Down Expand Up @@ -39641,17 +39641,49 @@ 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
components:
- 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:
Expand All @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -39760,18 +39831,19 @@ 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
components:
- 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
Expand All @@ -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
Expand Down Expand Up @@ -40113,9 +40227,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
Expand Down Expand Up @@ -65806,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
Expand Down Expand Up @@ -83283,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
Expand Down Expand Up @@ -85883,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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- type: entity
parent: ESSpawnerBase
parent: ESSpawnerBaseDirectional
id: ESRandomPosterAny
name: random poster spawner
suffix: ES
Expand All @@ -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
Expand All @@ -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
Expand All @@ -54,4 +52,3 @@
- type: EntityTableSpawner
table:
tableId: ESPosterLegit
directional: true
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
weight: 1

- type: entity
parent: ESSpawnerBase
parent: ESSpawnerBaseDirectional
id: ESSpawnerRandomArcadeOrPiano
name: Bar Entertainment Spawner
suffix: ES
Expand All @@ -201,4 +201,3 @@
weight: 2
- id: ESInstrumentPiano
weight: 1
directional: true
11 changes: 11 additions & 0 deletions Resources/Prototypes/_ES/Entities/Markers/es_marker_base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file modified Resources/Textures/_ES/Markers/spawners.rsi/directional.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading