Skip to content

Commit ace8285

Browse files
TheShuEdTheShuEd
authored
* content * catwalks * fix fucking icons * finish PR * +1 room * fix
1 parent ce9e13d commit ace8285

File tree

13 files changed

+6817
-45
lines changed

13 files changed

+6817
-45
lines changed

‎Content.Server/Procedural/DungeonJob.PostGen.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ private async Task PostGen(AutoCablingPostGen gen, Dungeon dungeon, EntityUid gr
173173
if (found)
174174
continue;
175175

176-
_entManager.SpawnEntity("CableApcExtension", _grid.GridTileToLocal(tile));
176+
_entManager.SpawnEntity(gen.Entity, _grid.GridTileToLocal(tile));
177177
}
178178
}
179179

@@ -854,11 +854,11 @@ private async Task PostGen(CorridorPostGen gen, Dungeon dungeon, EntityUid gridU
854854
}
855855

856856
var setTiles = new List<(Vector2i, Tile)>();
857-
var tileDef = _tileDefManager["FloorSteel"];
857+
var tileDef = _prototype.Index(gen.Tile);
858858

859859
foreach (var tile in corridorTiles)
860860
{
861-
setTiles.Add((tile, _tile.GetVariantTile((ContentTileDefinition) tileDef, random)));
861+
setTiles.Add((tile, _tile.GetVariantTile(tileDef, random)));
862862
}
863863

864864
grid.SetTiles(setTiles);

‎Content.Shared/Procedural/PostGeneration/AutoCablingPostGen.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1+
using Robust.Shared.Prototypes;
2+
13
namespace Content.Shared.Procedural.PostGeneration;
24

35
/// <summary>
46
/// Runs cables throughout the dungeon.
57
/// </summary>
68
public sealed partial class AutoCablingPostGen : IPostDunGen
79
{
8-
10+
[DataField]
11+
public EntProtoId Entity = "CableApcExtension";
912
}

‎Content.Shared/Procedural/PostGeneration/CorridorPostGen.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
using Content.Shared.Maps;
2+
using Robust.Shared.Prototypes;
3+
14
namespace Content.Shared.Procedural.PostGeneration;
25

36
/// <summary>
@@ -17,6 +20,9 @@ public sealed partial class CorridorPostGen : IPostDunGen
1720
[DataField("method")]
1821
public CorridorPostGenMethod Method = CorridorPostGenMethod.MinimumSpanningTree;
1922

23+
[DataField]
24+
public ProtoId<ContentTileDefinition> Tile = "FloorSteel";
25+
2026
/// <summary>
2127
/// How wide to make the corridor.
2228
/// </summary>

‎Resources/Maps/Dungeon/mineshaft.yml

Lines changed: 6310 additions & 0 deletions
Large diffs are not rendered by default.

‎Resources/Prototypes/Entities/Markers/Spawners/Random/mineshaft.yml

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
- type: entity
2+
id: RandomWoodenSupport
3+
name: wooden support spawner
4+
parent: MarkerBase
5+
components:
6+
- type: Sprite
7+
layers:
8+
- state: red
9+
- sprite: Objects/Decoration/mines.rsi
10+
state: support
11+
- type: RandomSpawner
12+
prototypes:
13+
- WoodenSupport
14+
- WoodenSupportBeam
15+
- WoodenSupportBeam
16+
- WoodenSupportBeam
17+
chance: 0.9
18+
19+
- type: entity
20+
id: RandomWoodenWall
21+
name: wooden wall spawner
22+
parent: MarkerBase
23+
components:
24+
- type: Sprite
25+
layers:
26+
- state: red
27+
- sprite: Objects/Decoration/mines.rsi
28+
state: support_wall
29+
- type: RandomSpawner
30+
prototypes:
31+
- WoodenSupportWall
32+
- WoodenSupportWallBroken
33+
chance: 0.9
34+
35+
- type: entity
36+
id: RandomStalagmiteOrCrystal
37+
name: stalagmite or crystal spawner
38+
parent: MarkerBase
39+
components:
40+
- type: Sprite
41+
layers:
42+
- state: red
43+
- sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
44+
state: stalagmite2
45+
- type: RandomSpawner
46+
offset: 0.3
47+
prototypes:
48+
- RandomBrownStalagmite
49+
- RandomGreyStalagmite
50+
- CrystalSpawner
51+
chance: 0.9
52+
53+
- type: entity
54+
id: RandomBrownStalagmite
55+
name: brown stalagmite spawner
56+
parent: MarkerBase
57+
components:
58+
- type: Sprite
59+
layers:
60+
- state: red
61+
- sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
62+
state: stalagmite2
63+
- type: RandomSpawner
64+
offset: 0.3
65+
prototypes:
66+
- FloraStalagmite1
67+
- FloraStalagmite2
68+
- FloraStalagmite3
69+
- FloraStalagmite4
70+
- FloraStalagmite5
71+
- FloraStalagmite6
72+
chance: 0.9
73+
74+
- type: entity
75+
id: RandomGreyStalagmite
76+
name: grey stalagmite spawner
77+
parent: MarkerBase
78+
components:
79+
- type: Sprite
80+
layers:
81+
- state: red
82+
- sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
83+
state: grey_stalagmite3
84+
- type: RandomSpawner
85+
offset: 0.3
86+
prototypes:
87+
- FloraGreyStalagmite1
88+
- FloraGreyStalagmite2
89+
- FloraGreyStalagmite3
90+
- FloraGreyStalagmite4
91+
- FloraGreyStalagmite5
92+
- FloraGreyStalagmite6
93+
chance: 0.9

‎Resources/Prototypes/Entities/Objects/Decoration/mining.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
thresholds:
3131
- trigger:
3232
!type:DamageTrigger
33-
damage: 50
33+
damage: 10
3434
behaviors:
3535
- !type:DoActsBehavior
3636
acts: [ "Destruction" ]
@@ -56,7 +56,13 @@
5656
placement:
5757
mode: SnapgridCenter
5858
components:
59+
- type: PlacementReplacement
60+
key: walls
61+
- type: Tag
62+
tags:
63+
- Wooden
5964
- type: Sprite
65+
noRot: true
6066
sprite: Objects/Decoration/mines.rsi
6167
state: support
6268
- type: Damageable
@@ -85,7 +91,7 @@
8591
thresholds:
8692
- trigger:
8793
!type:DamageTrigger
88-
damage: 150
94+
damage: 50
8995
behaviors:
9096
- !type:DoActsBehavior
9197
acts: [ "Destruction" ]
@@ -124,7 +130,14 @@
124130
placement:
125131
mode: SnapgridCenter
126132
components:
133+
- type: PlacementReplacement
134+
key: walls
135+
- type: Tag
136+
tags:
137+
- Wall
138+
- Wooden
127139
- type: Sprite
140+
noRot: true
128141
sprite: Objects/Decoration/mines.rsi
129142
state: support_wall
130143
- type: Damageable
@@ -147,7 +160,7 @@
147160
thresholds:
148161
- trigger:
149162
!type:DamageTrigger
150-
damage: 250
163+
damage: 75
151164
behaviors:
152165
- !type:DoActsBehavior
153166
acts: [ "Destruction" ]
@@ -168,7 +181,7 @@
168181
thresholds:
169182
- trigger:
170183
!type:DamageTrigger
171-
damage: 150
184+
damage: 50
172185
behaviors:
173186
- !type:DoActsBehavior
174187
acts: [ "Destruction" ]

‎Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
description: What can be better then late evening under the sky with guitar and friends.
66
components:
77
- type: Sprite
8+
noRot: true
89
sprite: Structures/Decoration/bonfire.rsi
910
layers:
1011
- state: bonfire

‎Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
description: Finally, some decent reception around here...
66
components:
77
- type: Sprite
8+
noRot: true
89
drawdepth: SmallObjects
910
layers:
1011
- map: ["computerLayerBody"]

‎Resources/Prototypes/Entities/Structures/Walls/asteroid.yml

Lines changed: 27 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,19 @@
44
#Asteroid rock
55
- type: entity
66
id: AsteroidRock
7-
parent: BaseStructure
7+
parent: BaseWall
88
name: asteroid rock
99
description: A rocky asteroid.
1010
components:
11-
- type: PlacementReplacement
12-
key: walls
11+
- type: Transform
12+
noRot: true
1313
- type: IconSmooth
1414
key: walls
1515
mode: NoSprite
1616
- type: SmoothEdge
17+
- type: Icon
18+
sprite: Structures/Walls/rock.rsi
19+
state: rock_asteroid
1720
- type: Sprite
1821
sprite: Structures/Walls/rock.rsi
1922
layers:
@@ -42,21 +45,6 @@
4245
path: /Audio/Effects/break_stone.ogg
4346
params:
4447
volume: -6
45-
- type: Occluder
46-
- type: Airtight
47-
- type: Fixtures
48-
fixtures:
49-
fix1:
50-
shape:
51-
!type:PhysShapeAabb
52-
bounds: "-0.5,-0.5,0.5,0.5"
53-
density: 100
54-
mask:
55-
- FullTileMask
56-
layer:
57-
- WallLayer
58-
- type: RadiationBlocker
59-
resistance: 2
6048

6149
# Ore veins
6250
- type: entity
@@ -379,12 +367,12 @@
379367
# Rocks and ore veins
380368
- type: entity
381369
id: WallRock
382-
parent: BaseStructure
370+
parent: BaseWall
383371
name: rock
384372
suffix: planetmap
385373
components:
386-
- type: PlacementReplacement
387-
key: walls
374+
- type: Transform
375+
noRot: true
388376
- type: SoundOnGather
389377
- type: Gatherable
390378
whitelist:
@@ -401,22 +389,12 @@
401389
behaviors:
402390
- !type:DoActsBehavior
403391
acts: ["Destruction"]
404-
- type: Occluder
405-
- type: Airtight
406-
- type: Fixtures
407-
fixtures:
408-
fix1:
409-
shape:
410-
!type:PhysShapeAabb
411-
bounds: "-0.5,-0.5,0.5,0.5"
412-
density: 100
413-
mask:
414-
- FullTileMask
415-
layer:
416-
- WallLayer
417392
- type: IconSmooth
418393
key: walls
419394
mode: NoSprite
395+
- type: Icon
396+
sprite: Structures/Walls/rock.rsi
397+
state: rock
420398
- type: SmoothEdge
421399
- type: Sprite
422400
sprite: Structures/Walls/rock.rsi
@@ -430,8 +408,6 @@
430408
state: rock_north
431409
- map: [ "enum.EdgeLayer.West" ]
432410
state: rock_west
433-
- type: RadiationBlocker
434-
resistance: 2
435411

436412
# Ore veins
437413
- type: entity
@@ -662,6 +638,9 @@
662638
name: basalt
663639
parent: WallRock
664640
components:
641+
- type: Icon
642+
sprite: Structures/Walls/rock.rsi
643+
state: rock_wall
665644
- type: Sprite
666645
sprite: Structures/Walls/rock.rsi
667646
layers:
@@ -902,6 +881,9 @@
902881
name: snowdrift
903882
parent: WallRock
904883
components:
884+
- type: Icon
885+
sprite: Structures/Walls/rock.rsi
886+
state: rock_snow
905887
- type: Sprite
906888
sprite: Structures/Walls/rock.rsi
907889
layers:
@@ -1142,6 +1124,9 @@
11421124
name: sandstone
11431125
parent: WallRock
11441126
components:
1127+
- type: Icon
1128+
sprite: Structures/Walls/rock.rsi
1129+
state: rock_sand
11451130
- type: Sprite
11461131
sprite: Structures/Walls/rock.rsi
11471132
layers:
@@ -1382,6 +1367,9 @@
13821367
name: chromite
13831368
parent: WallRock
13841369
components:
1370+
- type: Icon
1371+
sprite: Structures/Walls/rock.rsi
1372+
state: rock_chromite
13851373
- type: Sprite
13861374
sprite: Structures/Walls/rock.rsi
13871375
layers:
@@ -1622,6 +1610,9 @@
16221610
name: andesite
16231611
parent: WallRock
16241612
components:
1613+
- type: Icon
1614+
sprite: Structures/Walls/rock.rsi
1615+
state: rock_andesite
16251616
- type: Sprite
16261617
sprite: Structures/Walls/rock.rsi
16271618
layers:

0 commit comments

Comments
 (0)