Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit d16c439

Browse files
committed
Reapply "Merge branch 'PortsPsionics' of https://github.com/cowbot92/Yogstation into pr/22301"
This reverts commit 4e67d32.
1 parent 4e67d32 commit d16c439

File tree

1,069 files changed

+215581
-697852
lines changed

Some content is hidden

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

1,069 files changed

+215581
-697852
lines changed

_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm

Lines changed: 398 additions & 401 deletions
Large diffs are not rendered by default.

_maps/RandomRuins/IceRuins/icemoon_underground_alien_lab.dmm

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"iW" = (
3232
/obj/structure/flora/tree/dead,
3333
/turf/open/floor/grass/snow,
34-
/area/ruin/powered/alien_lab)
34+
/area/icemoon/underground/explored)
3535
"kT" = (
3636
/obj/effect/decal/cleanable/blood/gibs/old,
3737
/obj/effect/decal/cleanable/blood/gibs/down,
@@ -44,7 +44,7 @@
4444
"lN" = (
4545
/obj/effect/decal/cleanable/blood/drip,
4646
/turf/open/floor/grass/snow,
47-
/area/ruin/powered/alien_lab)
47+
/area/icemoon/underground/explored)
4848
"mS" = (
4949
/obj/effect/decal/cleanable/blood/gibs/up,
5050
/obj/structure/bed/abductor,
@@ -59,7 +59,7 @@
5959
"rg" = (
6060
/obj/structure/flora/tree/pine,
6161
/turf/open/floor/grass/snow,
62-
/area/ruin/powered/alien_lab)
62+
/area/icemoon/underground/explored)
6363
"rY" = (
6464
/obj/machinery/light/small,
6565
/turf/open/floor/plating/abductor,
@@ -82,9 +82,8 @@
8282
/turf/open/floor/plating/abductor,
8383
/area/ruin/powered/alien_lab)
8484
"wa" = (
85-
/obj/structure/door_assembly/door_assembly_abductor,
8685
/turf/open/floor/grass/snow,
87-
/area/ruin/powered/alien_lab)
86+
/area/icemoon/underground/explored)
8887
"wD" = (
8988
/mob/living/simple_animal/hostile/abomination/altform2,
9089
/turf/open/floor/plating/abductor,
@@ -125,7 +124,7 @@
125124
/area/ruin/powered/alien_lab)
126125
"AZ" = (
127126
/obj/effect/spawner/structure/window,
128-
/turf/open/floor/plating/abductor,
127+
/turf/open/floor/plating,
129128
/area/ruin/powered/alien_lab)
130129
"Be" = (
131130
/mob/living/simple_animal/hostile/asteroid/wolf,
@@ -232,7 +231,7 @@
232231
"QC" = (
233232
/obj/structure/flora/tree/dead/jungle,
234233
/turf/open/floor/grass/snow,
235-
/area/ruin/powered/alien_lab)
234+
/area/icemoon/underground/explored)
236235
"TX" = (
237236
/obj/machinery/clonepod{
238237
icon_state = "pod_g"
@@ -295,8 +294,9 @@
295294
/turf/open/floor/plating/abductor,
296295
/area/ruin/powered/alien_lab)
297296
"YZ" = (
297+
/obj/structure/door_assembly/door_assembly_abductor,
298298
/turf/open/floor/grass/snow,
299-
/area/ruin/powered/alien_lab)
299+
/area/icemoon/underground/explored)
300300

301301
(1,1,1) = {"
302302
fW
@@ -383,7 +383,7 @@ Jn
383383
Jn
384384
Jn
385385
Jn
386-
YZ
386+
wa
387387
fW
388388
fW
389389
fW
@@ -415,7 +415,7 @@ Nv
415415
Yw
416416
aw
417417
Jn
418-
YZ
418+
wa
419419
fW
420420
fW
421421
fW
@@ -447,7 +447,7 @@ Nv
447447
Nv
448448
Nv
449449
Jn
450-
YZ
450+
wa
451451
fW
452452
fW
453453
fW
@@ -511,7 +511,7 @@ Nv
511511
xi
512512
Nv
513513
Jn
514-
YZ
514+
wa
515515
fW
516516
fW
517517
fW
@@ -543,7 +543,7 @@ Nv
543543
Mw
544544
vi
545545
Jn
546-
YZ
546+
wa
547547
fW
548548
fW
549549
fW
@@ -575,7 +575,7 @@ NG
575575
Jn
576576
Jn
577577
Jn
578-
YZ
578+
wa
579579
fW
580580
fW
581581
fW
@@ -927,12 +927,12 @@ Nv
927927
Nv
928928
Nv
929929
Jn
930-
YZ
930+
wa
931931
Jn
932932
Xn
933933
Mz
934934
Jn
935-
YZ
935+
wa
936936
fW
937937
fW
938938
fW
@@ -959,12 +959,12 @@ Nv
959959
Nv
960960
AR
961961
Jn
962-
YZ
962+
wa
963963
Jn
964964
Jn
965965
Jn
966966
Jn
967-
YZ
967+
wa
968968
fW
969969
fW
970970
fW
@@ -991,11 +991,11 @@ Nv
991991
be
992992
Nv
993993
Jn
994-
YZ
995-
YZ
996-
YZ
997-
YZ
998-
YZ
994+
wa
995+
wa
996+
wa
997+
wa
998+
wa
999999
QC
10001000
fW
10011001
fW
@@ -1023,7 +1023,7 @@ Nv
10231023
Nv
10241024
Nv
10251025
Jn
1026-
YZ
1026+
wa
10271027
fW
10281028
fW
10291029
fW
@@ -1055,7 +1055,7 @@ Nv
10551055
Nv
10561056
Nv
10571057
Jn
1058-
YZ
1058+
wa
10591059
fW
10601060
fW
10611061
fW
@@ -1087,8 +1087,8 @@ Nv
10871087
TX
10881088
Nv
10891089
Jn
1090-
YZ
1091-
YZ
1090+
wa
1091+
wa
10921092
fW
10931093
fW
10941094
fW
@@ -1119,8 +1119,8 @@ lN
11191119
Nv
11201120
rY
11211121
Jn
1122-
YZ
1123-
YZ
1122+
wa
1123+
wa
11241124
fW
11251125
fW
11261126
fW
@@ -1146,12 +1146,12 @@ fW
11461146
fW
11471147
Jn
11481148
Jn
1149-
YZ
1150-
YZ
1151-
YZ
1149+
wa
1150+
wa
1151+
wa
11521152
Jn
11531153
Jn
1154-
YZ
1154+
wa
11551155
rg
11561156
fW
11571157
fW
@@ -1173,17 +1173,17 @@ fW
11731173
fW
11741174
fW
11751175
fW
1176-
YZ
1177-
YZ
1176+
wa
1177+
wa
11781178
fW
1179+
wa
1180+
wa
1181+
wa
11791182
YZ
1180-
YZ
1181-
YZ
1182-
YZ
1183-
YZ
1184-
YZ
1185-
YZ
1186-
YZ
1183+
wa
1184+
wa
1185+
wa
1186+
wa
11871187
fW
11881188
fW
11891189
fW
@@ -1206,16 +1206,16 @@ fW
12061206
fW
12071207
fW
12081208
rg
1209-
YZ
1210-
YZ
1211-
YZ
1212-
YZ
1213-
YZ
1209+
wa
1210+
wa
1211+
wa
1212+
wa
1213+
wa
1214+
wa
1215+
wa
12141216
wa
12151217
QC
1216-
YZ
1217-
YZ
1218-
YZ
1218+
wa
12191219
fW
12201220
fW
12211221
fW

0 commit comments

Comments
 (0)