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

Commit 69a462e

Browse files
cowbot92cowbot92
committed
Merge remote-tracking branch 'upstream/master' into PortsPsionics
2 parents fde8a17 + 3edfd8f commit 69a462e

File tree

231 files changed

+4321
-2119
lines changed

Some content is hidden

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

231 files changed

+4321
-2119
lines changed

‎_maps/RandomRuins/IceRuins/icemoon_underground_alien_lab.dmm‎

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

‎_maps/RandomRuins/LavaRuins/lavaland_surface_meteorite.dmm‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
/obj/structure/stone_tile/burnt{
5151
dir = 8
5252
},
53-
/obj/item/clothing/under/ash_robe/tunic,
53+
/obj/item/clothing/under/tribal/ash_robe/tunic,
5454
/mob/living/simple_animal/hostile/skeleton/plasmaminer/jackhammer{
5555
desc = "A plasma-soaked miner, this one still seems to hold their mining tool in their hand, gripping tightly. Seemed to have been quite the crafty miner in their past life.";
5656
faction = list("mining");
@@ -483,7 +483,7 @@
483483
pixel_x = -1;
484484
pixel_y = -2
485485
},
486-
/obj/item/clothing/under/ash_robe/chief,
486+
/obj/item/clothing/under/tribal/ash_robe/chief,
487487
/obj/item/clothing/suit/armor/bone/heavy,
488488
/obj/item/clothing/suit/armor/tribalcoat,
489489
/turf/open/floor/plasteel/lavaland,
@@ -1036,7 +1036,7 @@
10361036
pixel_x = -5;
10371037
pixel_y = -5
10381038
},
1039-
/obj/item/clothing/under/ash_robe/hunter,
1039+
/obj/item/clothing/under/tribal/ash_robe/hunter,
10401040
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
10411041
/area/ruin/unpowered/ash_walkers)
10421042
"sQ" = (
@@ -1847,7 +1847,7 @@
18471847
/obj/effect/turf_decal/sand,
18481848
/obj/structure/closet/cabinet,
18491849
/obj/item/clothing/suit/armor/pathfinder,
1850-
/obj/item/clothing/under/rank/miner/lavaland,
1850+
/obj/item/clothing/under/rank/cargo/miner/lavaland,
18511851
/obj/effect/decal/cleanable/cobweb,
18521852
/obj/effect/decal/cleanable/cobweb/cobweb2,
18531853
/obj/item/clothing/under/plasmaman/mining,
@@ -1881,7 +1881,7 @@
18811881
/obj/item/scalpel/bone{
18821882
pixel_y = 16
18831883
},
1884-
/obj/item/clothing/under/ash_robe/shaman,
1884+
/obj/item/clothing/under/tribal/ash_robe/shaman,
18851885
/obj/item/oar{
18861886
pixel_y = -1
18871887
},
@@ -2019,7 +2019,7 @@
20192019
/obj/effect/turf_decal/siding/wood{
20202020
dir = 4
20212021
},
2022-
/obj/effect/decal/cleanable/blood/xtracks{
2022+
/obj/effect/decal/cleanable/xenoblood/xtracks{
20232023
dir = 1
20242024
},
20252025
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
@@ -2244,7 +2244,7 @@
22442244
/obj/effect/turf_decal/siding/wood{
22452245
dir = 1
22462246
},
2247-
/obj/effect/decal/cleanable/blood/xtracks{
2247+
/obj/effect/decal/cleanable/xenoblood/xtracks{
22482248
dir = 8
22492249
},
22502250
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
@@ -2349,7 +2349,7 @@
23492349
/obj/structure/stone_tile/block/cracked{
23502350
dir = 1
23512351
},
2352-
/obj/effect/decal/cleanable/blood/xtracks{
2352+
/obj/effect/decal/cleanable/xenoblood/xtracks{
23532353
dir = 10
23542354
},
23552355
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
@@ -2662,7 +2662,7 @@
26622662
/obj/item/cautery/bone{
26632663
pixel_x = -4
26642664
},
2665-
/obj/item/clothing/under/ash_robe/young,
2665+
/obj/item/clothing/under/tribal/ash_robe/young,
26662666
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
26672667
/area/ruin/unpowered/ash_walkers)
26682668
"Wc" = (

‎_maps/RandomRuins/LavaRuins/lavaland_surface_russianbunker.dmm‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -365,12 +365,6 @@
365365
/obj/effect/mob_spawn/human/corpse/damaged,
366366
/turf/open/lava/smooth/lava_land_surface,
367367
/area/lavaland/surface/outdoors)
368-
"cE" = (
369-
/turf/open/lava/smooth/lava_land_surface,
370-
/area/ruin/unpowered{
371-
name = "\improper Russian Bunker";
372-
noteleport = 1
373-
})
374368
"cG" = (
375369
/obj/effect/decal/cleanable/blood/drip,
376370
/obj/item/jawsoflife,
@@ -1049,7 +1043,7 @@ ab
10491043
ac
10501044
ac
10511045
ac
1052-
cE
1046+
ab
10531047
ab
10541048
ab
10551049
ab
@@ -1159,7 +1153,7 @@ aI
11591153
aE
11601154
Ni
11611155
YQ
1162-
pC
1156+
YQ
11631157
ab
11641158
ab
11651159
ab

‎_maps/map_files/AsteroidStation/AsteroidStation.dmm‎

Lines changed: 7 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -7762,9 +7762,6 @@
77627762
/obj/machinery/computer/mech_bay_power_console{
77637763
dir = 4
77647764
},
7765-
/obj/structure/cable{
7766-
icon_state = "0-4"
7767-
},
77687765
/turf/open/floor/plasteel/dark,
77697766
/area/science/robotics/mechbay)
77707767
"bJC" = (
@@ -8515,12 +8512,6 @@
85158512
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
85168513
dir = 6
85178514
},
8518-
/obj/structure/cable{
8519-
icon_state = "2-4"
8520-
},
8521-
/obj/structure/cable{
8522-
icon_state = "1-4"
8523-
},
85248515
/turf/open/floor/circuit,
85258516
/area/science/robotics/mechbay)
85268517
"bXC" = (
@@ -9381,12 +9372,6 @@
93819372
/area/security/main)
93829373
"cij" = (
93839374
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
9384-
/obj/structure/cable{
9385-
icon_state = "1-8"
9386-
},
9387-
/obj/structure/cable{
9388-
icon_state = "1-2"
9389-
},
93909375
/turf/open/floor/circuit,
93919376
/area/science/robotics/mechbay)
93929377
"cin" = (
@@ -12057,9 +12042,6 @@
1205712042
dir = 8
1205812043
},
1205912044
/obj/effect/landmark/event_spawn,
12060-
/obj/structure/cable{
12061-
icon_state = "4-8"
12062-
},
1206312045
/turf/open/floor/circuit,
1206412046
/area/science/robotics/mechbay)
1206512047
"cYN" = (
@@ -24202,9 +24184,6 @@
2420224184
pixel_y = 24;
2420324185
req_access = list("robotics")
2420424186
},
24205-
/obj/structure/cable{
24206-
icon_state = "2-8"
24207-
},
2420824187
/obj/machinery/button/door{
2420924188
id = "Skynet_launch";
2421024189
name = "Mech Bay Door Control";
@@ -26176,6 +26155,10 @@
2617626155
},
2617726156
/turf/open/floor/plasteel,
2617826157
/area/hallway/primary/fore)
26158+
"hpK" = (
26159+
/obj/effect/spawner/backrooms_portal,
26160+
/turf/open/floor/plasteel,
26161+
/area/quartermaster/warehouse)
2617926162
"hqn" = (
2618026163
/obj/structure/table/wood,
2618126164
/obj/effect/spawner/lootdrop/randomdrink,
@@ -29417,7 +29400,6 @@
2941729400
/obj/machinery/atmospherics/pipe/layer_manifold{
2941829401
dir = 4
2941929402
},
29420-
/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
2942129403
/turf/open/floor/plating/airless,
2942229404
/area/escapepodbay)
2942329405
"irh" = (
@@ -30623,7 +30605,6 @@
3062330605
icon_state = "1-2"
3062430606
},
3062530607
/obj/effect/turf_decal/ramp_middle,
30626-
/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
3062730608
/turf/open/floor/plasteel,
3062830609
/area/escapepodbay)
3062930610
"iKT" = (
@@ -32867,13 +32848,6 @@
3286732848
},
3286832849
/turf/open/floor/plasteel,
3286932850
/area/hallway/secondary/exit)
32870-
"jpN" = (
32871-
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
32872-
/obj/structure/cable{
32873-
icon_state = "1-2"
32874-
},
32875-
/turf/open/floor/circuit,
32876-
/area/science/robotics/mechbay)
3287732851
"jqc" = (
3287832852
/obj/structure/cable{
3287932853
icon_state = "4-8"
@@ -34396,9 +34370,6 @@
3439634370
/obj/structure/cable{
3439734371
icon_state = "2-8"
3439834372
},
34399-
/obj/structure/cable{
34400-
icon_state = "1-2"
34401-
},
3440234373
/turf/open/floor/plasteel/dark,
3440334374
/area/science/robotics/mechbay)
3440434375
"jRg" = (
@@ -36300,9 +36271,6 @@
3630036271
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
3630136272
dir = 1
3630236273
},
36303-
/obj/structure/cable{
36304-
icon_state = "1-8"
36305-
},
3630636274
/turf/open/floor/plasteel/dark,
3630736275
/area/science/robotics/mechbay)
3630836276
"ktn" = (
@@ -41235,9 +41203,6 @@
4123541203
/obj/machinery/mech_bay_recharge_port{
4123641204
dir = 2
4123741205
},
41238-
/obj/structure/cable{
41239-
icon_state = "0-4"
41240-
},
4124141206
/turf/open/floor/plasteel/dark,
4124241207
/area/science/robotics/mechbay)
4124341208
"mco" = (
@@ -66924,9 +66889,6 @@
6692466889
/obj/machinery/light{
6692566890
dir = 8
6692666891
},
66927-
/obj/structure/cable{
66928-
icon_state = "0-4"
66929-
},
6693066892
/obj/machinery/firealarm{
6693166893
dir = 4;
6693266894
pixel_x = -26
@@ -68125,7 +68087,6 @@
6812568087
/obj/machinery/door/airlock/external{
6812668088
name = "Shipbreaking External Access"
6812768089
},
68128-
/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
6812968090
/turf/open/floor/plasteel,
6813068091
/area/escapepodbay)
6813168092
"uau" = (
@@ -79936,9 +79897,6 @@
7993679897
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
7993779898
dir = 10
7993879899
},
79939-
/obj/structure/cable{
79940-
icon_state = "2-8"
79941-
},
7994279900
/turf/open/floor/circuit,
7994379901
/area/science/robotics/mechbay)
7994479902
"xLv" = (
@@ -80033,9 +79991,6 @@
8003379991
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
8003479992
dir = 8
8003579993
},
80036-
/obj/structure/cable{
80037-
icon_state = "4-8"
80038-
},
8003979994
/turf/open/floor/circuit,
8004079995
/area/science/robotics/mechbay)
8004179996
"xNj" = (
@@ -94205,7 +94160,7 @@ aJI
9420594160
aZs
9420694161
xga
9420794162
xIK
94208-
hSk
94163+
hpK
9420994164
dCg
9421094165
gBO
9421194166
aZs
@@ -110859,9 +110814,9 @@ aQZ
110859110814
gLE
110860110815
bXz
110861110816
cij
110862-
jpN
110863110817
cij
110864-
jpN
110818+
cij
110819+
cij
110865110820
ktk
110866110821
adX
110867110822
aFu

0 commit comments

Comments
 (0)