Skip to content

Commit 5af7ffa

Browse files
warriorstar-orionwarriorstar-orion
committed
Merge remote-tracking branch 'upstream/master' into refactor/action-buttons
2 parents a3283c3 + fdcf489 commit 5af7ffa

File tree

307 files changed

+24211
-15146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

307 files changed

+24211
-15146
lines changed

‎.editorconfig

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
[*]
2-
indent_style = tab
3-
indent_size = 4
4-
charset = utf-8
5-
trim_trailing_whitespace = true
6-
insert_final_newline = true
7-
end_of_line = lf
8-
9-
[*.yml]
10-
indent_style = space
11-
indent_size = 2
12-
13-
[*.py]
14-
indent_style = space
1+
[*]
2+
indent_style = tab
3+
indent_size = 4
4+
charset = utf-8
5+
trim_trailing_whitespace = true
6+
insert_final_newline = true
7+
end_of_line = lf
8+
9+
[*.yml]
10+
indent_style = space
11+
indent_size = 2
12+
13+
[*.py]
14+
indent_style = space
15+
16+
[*.rs]
17+
indent_style = space

‎.vscode/launch.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@
2121
"request": "launch",
2222
"name": "DS Debug",
2323
"dmb": "${workspaceFolder}/${command:CurrentDMB}"
24+
},
25+
{
26+
"type": "cppvsdbg",
27+
"request": "attach",
28+
"name": "Rust Attach",
29+
"processId": "${command:pickProcess}"
2430
}
2531
]
2632
}

‎_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@
411411
/area/ruin/unpowered/althland_excavation)
412412
"bE" = (
413413
/obj/effect/decal/cleanable/dirt,
414-
/obj/structure/chair/office{
414+
/obj/structure/chair{
415415
dir = 4
416416
},
417417
/turf/simulated/floor/plating/lavaland_air,
@@ -688,7 +688,7 @@
688688
/obj/effect/decal/cleanable/dirt,
689689
/obj/effect/decal/cleanable/dirt,
690690
/obj/effect/decal/cleanable/dirt,
691-
/obj/structure/chair/office,
691+
/obj/structure/chair,
692692
/turf/simulated/floor/plating/lavaland_air,
693693
/area/ruin/unpowered/althland_excavation)
694694
"je" = (
@@ -832,7 +832,7 @@
832832
/area/ruin/unpowered/althland_excavation)
833833
"qp" = (
834834
/obj/effect/decal/cleanable/dirt,
835-
/obj/structure/chair/office,
835+
/obj/structure/chair,
836836
/turf/simulated/floor/plating/lavaland_air,
837837
/area/ruin/unpowered/althland_excavation)
838838
"qw" = (
@@ -1196,7 +1196,7 @@
11961196
"HC" = (
11971197
/obj/effect/decal/cleanable/dirt,
11981198
/obj/effect/decal/cleanable/dirt,
1199-
/obj/structure/chair/office,
1199+
/obj/structure/chair,
12001200
/turf/simulated/floor/plating/lavaland_air,
12011201
/area/ruin/unpowered/althland_excavation)
12021202
"In" = (
@@ -1347,7 +1347,7 @@
13471347
/area/lavaland/surface/outdoors)
13481348
"Qk" = (
13491349
/obj/effect/decal/cleanable/glass,
1350-
/obj/structure/chair/office{
1350+
/obj/structure/chair{
13511351
dir = 1
13521352
},
13531353
/turf/simulated/floor/plating/lavaland_air,

‎_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_minebot_factory.dmm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
/turf/simulated/floor/plating/lavaland_air,
3030
/area/ruin/unpowered/althland_factory)
3131
"aZ" = (
32-
/obj/structure/chair/office,
32+
/obj/structure/chair,
3333
/obj/effect/decal/cleanable/dirt,
3434
/turf/simulated/floor/pod/light/lavaland_air{
3535
oxygen = 0;
@@ -254,7 +254,7 @@
254254
/turf/simulated/floor/plating/lavaland_air,
255255
/area/ruin/unpowered/althland_factory)
256256
"fZ" = (
257-
/obj/structure/chair/office,
257+
/obj/structure/chair,
258258
/obj/effect/decal/cleanable/dirt,
259259
/obj/effect/mapping_helpers/turfs/burn,
260260
/turf/simulated/floor/pod/light/lavaland_air{
@@ -1170,7 +1170,7 @@
11701170
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
11711171
/area/lavaland/surface/outdoors)
11721172
"Cp" = (
1173-
/obj/structure/chair/office,
1173+
/obj/structure/chair,
11741174
/obj/effect/decal/cleanable/dirt,
11751175
/turf/simulated/floor/plating/lavaland_air,
11761176
/area/ruin/unpowered/althland_factory)
@@ -1576,7 +1576,7 @@
15761576
/turf/simulated/floor/plating/lavaland_air,
15771577
/area/ruin/unpowered/althland_factory)
15781578
"MK" = (
1579-
/obj/structure/chair/office,
1579+
/obj/structure/chair,
15801580
/obj/effect/decal/remains/human,
15811581
/obj/effect/decal/cleanable/dirt,
15821582
/obj/effect/mapping_helpers/turfs/burn,

‎_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nt.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@
848848
/obj/docking_port/mobile/mining,
849849
/obj/structure/fans/tiny,
850850
/obj/docking_port/stationary{
851-
area_type = /area/lavaland/surface/outdoors;
851+
area_type = /area/lavaland/surface/outdoors/outpost/no_boulder;
852852
dir = 8;
853853
dwidth = 3;
854854
height = 5;

‎_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
/area/ruin/powered/sloth)
2626
"f" = (
2727
/obj/structure/table/wood,
28+
/obj/item/organ/internal/kidneys/xenobiology/lethargic,
2829
/obj/item/food/grown/citrus/orange,
2930
/turf/simulated/floor/sepia{
3031
slowdown = 10

‎_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@
278278
},
279279
/area/ruin/space/unpowered)
280280
"aO" = (
281-
/obj/structure/chair/office/light{
281+
/obj/structure/chair/office{
282282
dir = 8
283283
},
284284
/turf/simulated/floor/plasteel,

‎_maps/map_files/RandomRuins/SpaceRuins/casino.dmm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@
330330
/turf/simulated/floor/plating,
331331
/area/ruin/space/powered/casino/maints)
332332
"iw" = (
333-
/obj/structure/chair/office{
333+
/obj/structure/chair{
334334
dir = 4
335335
},
336336
/obj/structure/cable{
@@ -846,7 +846,7 @@
846846
/turf/simulated/floor/mineral/titanium/blue/airless,
847847
/area/ruin/space/powered/casino/docked_ships)
848848
"wY" = (
849-
/obj/structure/chair/office{
849+
/obj/structure/chair{
850850
dir = 1
851851
},
852852
/obj/effect/spawner/random/pool/casino_mob,

‎_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@
251251
/obj/effect/turf_decal/stripes/line{
252252
dir = 9
253253
},
254-
/obj/structure/chair/office{
254+
/obj/structure/chair{
255255
dir = 1
256256
},
257257
/turf/simulated/floor/engine/airless,
@@ -595,7 +595,7 @@
595595
/obj/structure/railing{
596596
dir = 6
597597
},
598-
/obj/structure/chair/office{
598+
/obj/structure/chair{
599599
dir = 1
600600
},
601601
/turf/simulated/floor/catwalk/airless,
@@ -664,7 +664,7 @@
664664
/area/ruin/space/deepstorage)
665665
"bY" = (
666666
/obj/structure/railing,
667-
/obj/structure/chair/office{
667+
/obj/structure/chair{
668668
dir = 1
669669
},
670670
/turf/simulated/floor/catwalk/airless,
@@ -2683,7 +2683,7 @@
26832683
},
26842684
/area/ruin/space/deepstorage)
26852685
"pH" = (
2686-
/obj/structure/chair/office,
2686+
/obj/structure/chair,
26872687
/turf/simulated/floor/plasteel{
26882688
dir = 10;
26892689
icon_state = "vault"
@@ -5872,7 +5872,7 @@
58725872
/turf/simulated/floor/plating,
58735873
/area/ruin/space/deepstorage)
58745874
"LM" = (
5875-
/obj/structure/chair/office{
5875+
/obj/structure/chair{
58765876
dir = 8
58775877
},
58785878
/obj/machinery/light/small{

‎_maps/map_files/RandomRuins/SpaceRuins/dj.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@
479479
},
480480
/area/ruin/space/djstation)
481481
"bp" = (
482-
/obj/structure/chair/office/light,
482+
/obj/structure/chair/office,
483483
/mob/living/simple_animal/hostile/soviet/ranged/mosin,
484484
/turf/simulated/floor/plasteel/dark,
485485
/area/ruin/space/djstation)

‎_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@
371371
},
372372
/area/ruin/space/moonbase19)
373373
"aY" = (
374-
/obj/structure/chair/office/light{
374+
/obj/structure/chair/office{
375375
dir = 1
376376
},
377377
/obj/machinery/newscaster/directional/south,
@@ -461,13 +461,6 @@
461461
dir = 8
462462
},
463463
/area/ruin/space/moonbase19)
464-
"bl" = (
465-
/obj/structure/chair/office{
466-
dir = 4
467-
},
468-
/obj/effect/decal/cleanable/dirt,
469-
/turf/simulated/floor/plasteel,
470-
/area/ruin/space/moonbase19)
471464
"bm" = (
472465
/obj/structure/closet,
473466
/turf/simulated/floor/plasteel,
@@ -738,12 +731,6 @@
738731
dir = 4
739732
},
740733
/area/ruin/space/moonbase19)
741-
"ch" = (
742-
/obj/structure/chair/office{
743-
dir = 8
744-
},
745-
/turf/simulated/floor/plasteel,
746-
/area/ruin/space/moonbase19)
747734
"ci" = (
748735
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
749736
/obj/structure/cable{
@@ -16497,7 +16484,7 @@ dM
1649716484
hN
1649816485
aE
1649916486
rJ
16500-
bl
16487+
Df
1650116488
uX
1650216489
aO
1650316490
ag
@@ -16619,7 +16606,7 @@ aA
1661916606
aB
1662016607
bi
1662116608
cX
16622-
ch
16609+
gS
1662316610
cv
1662416611
uM
1662516612
ag

‎_maps/map_files/RandomRuins/SpaceRuins/submaps/rocky_motel_submap.dmm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
/turf/simulated/floor/mineral/titanium,
119119
/area/template_noop)
120120
"lJ" = (
121-
/obj/structure/chair/office{
121+
/obj/structure/chair{
122122
dir = 8
123123
},
124124
/turf/simulated/floor/vault,
@@ -320,7 +320,7 @@
320320
/turf/simulated/floor/wood,
321321
/area/template_noop)
322322
"Ir" = (
323-
/obj/structure/chair/office{
323+
/obj/structure/chair{
324324
dir = 4
325325
},
326326
/turf/simulated/floor/vault,

‎_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2697,7 +2697,7 @@
26972697
},
26982698
/area/ruin/space/derelict/hallway/primary)
26992699
"hf" = (
2700-
/obj/structure/chair/office/light{
2700+
/obj/structure/chair/office{
27012701
dir = 4
27022702
},
27032703
/obj/effect/decal/cleanable/dirt,
@@ -3043,7 +3043,7 @@
30433043
/turf/simulated/floor/plasteel,
30443044
/area/ruin/space/derelict/hallway/primary)
30453045
"id" = (
3046-
/obj/structure/chair/office/light,
3046+
/obj/structure/chair/office,
30473047
/turf/simulated/floor/plasteel,
30483048
/area/ruin/space/derelict/hallway/primary)
30493049
"ie" = (

‎_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
/area/ruin/space/wreck_cargoship)
164164
"hn" = (
165165
/obj/effect/decal/cleanable/dirt,
166-
/obj/structure/chair/office{
166+
/obj/structure/chair{
167167
dir = 8
168168
},
169169
/turf/simulated/floor/plating,
@@ -568,7 +568,7 @@
568568
/turf/simulated/floor/plating,
569569
/area/ruin/space/wreck_cargoship)
570570
"un" = (
571-
/obj/structure/chair/office{
571+
/obj/structure/chair{
572572
dir = 1
573573
},
574574
/turf/simulated/floor/plasteel,

0 commit comments

Comments
 (0)