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

Commit fbb6eda

Browse files
committed
Merge remote-tracking branch 'upstream/master' into PortsPsionics
2 parents c51695a + 8dc6dee commit fbb6eda

File tree

71 files changed

+984
-661
lines changed

Some content is hidden

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

71 files changed

+984
-661
lines changed

_maps/RandomRuins/JungleRuins/miningbase.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
2525
dir = 1
2626
},
27-
/mob/living/simple_animal/turtle,
27+
/mob/living/simple_animal/triceratops,
2828
/turf/open/floor/plasteel,
2929
/area/mine/living_quarters)
3030
"av" = (

_maps/RandomRuins/StationRuins/BoxStation/testingsite_range1.dmm

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,7 @@
124124
/turf/open/floor/plating/airless,
125125
/area/template_noop)
126126
"M" = (
127-
/turf/closed/indestructible{
128-
desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease";
129-
icon_state = "riveted";
130-
name = "hyper-reinforced wall"
131-
},
127+
/turf/closed/indestructible/riveted/testingsite,
132128
/area/template_noop)
133129
"O" = (
134130
/obj/effect/turf_decal/stripes/line,

_maps/RandomRuins/StationRuins/BoxStation/testingsite_range2.dmm

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,7 @@
129129
/turf/open/floor/plating/airless,
130130
/area/template_noop)
131131
"M" = (
132-
/turf/closed/indestructible{
133-
desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease";
134-
icon_state = "riveted";
135-
name = "hyper-reinforced wall"
136-
},
132+
/turf/closed/indestructible/riveted/testingsite,
137133
/area/template_noop)
138134
"O" = (
139135
/obj/effect/turf_decal/stripes/line,

_maps/RandomRuins/StationRuins/BoxStation/testingsite_range3.dmm

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,7 @@
116116
/turf/closed/wall,
117117
/area/template_noop)
118118
"H" = (
119-
/turf/closed/indestructible{
120-
desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease";
121-
icon_state = "riveted";
122-
name = "hyper-reinforced wall"
123-
},
119+
/turf/closed/indestructible/riveted/testingsite,
124120
/area/template_noop)
125121
"I" = (
126122
/obj/effect/turf_decal/stripes/corner,

_maps/RandomRuins/StationRuins/BoxStation/testingsite_range4.dmm

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -229,11 +229,7 @@
229229
/turf/closed/wall,
230230
/area/template_noop)
231231
"M" = (
232-
/turf/closed/indestructible{
233-
desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease";
234-
icon_state = "riveted";
235-
name = "hyper-reinforced wall"
236-
},
232+
/turf/closed/indestructible/riveted/testingsite,
237233
/area/template_noop)
238234
"P" = (
239235
/obj/effect/turf_decal/stripes/line{

_maps/map_files/DonutStation/DonutStation.dmm

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50040,11 +50040,7 @@
5004050040
/turf/open/floor/plasteel,
5004150041
/area/security/checkpoint/science)
5004250042
"vaD" = (
50043-
/turf/closed/indestructible{
50044-
desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease";
50045-
icon_state = "riveted";
50046-
name = "hyper-reinforced wall"
50047-
},
50043+
/turf/closed/indestructible/riveted/testingsite,
5004850044
/area/space/nearstation)
5004950045
"vaW" = (
5005050046
/obj/machinery/light/small{

_maps/map_files/GaxStation/GaxStation.dmm

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,6 +1232,7 @@
12321232
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
12331233
dir = 8
12341234
},
1235+
/obj/effect/turf_decal/ramp_middle,
12351236
/turf/open/floor/plasteel,
12361237
/area/hydroponics/garden)
12371238
"aEO" = (
@@ -1842,6 +1843,7 @@
18421843
pixel_x = 11;
18431844
pixel_y = 8
18441845
},
1846+
/obj/effect/turf_decal/ramp_middle,
18451847
/turf/open/floor/grass,
18461848
/area/hydroponics/garden)
18471849
"aTR" = (
@@ -2899,6 +2901,9 @@
28992901
/obj/effect/turf_decal/siding/wideplating/corner{
29002902
dir = 4
29012903
},
2904+
/obj/effect/turf_decal/ramp_corner{
2905+
dir = 4
2906+
},
29022907
/turf/open/indestructible/grass/sand,
29032908
/area/hydroponics/garden)
29042909
"buE" = (
@@ -3090,6 +3095,9 @@
30903095
dir = 4
30913096
},
30923097
/obj/machinery/seed_extractor,
3098+
/obj/effect/turf_decal/ramp_middle{
3099+
dir = 8
3100+
},
30933101
/turf/open/floor/grass,
30943102
/area/hydroponics/garden)
30953103
"bBo" = (
@@ -8435,6 +8443,7 @@
84358443
dir = 8
84368444
},
84378445
/obj/machinery/washing_machine,
8446+
/obj/effect/turf_decal/ramp_middle,
84388447
/turf/open/floor/plasteel/cafeteria,
84398448
/area/crew_quarters/toilet/auxiliary)
84408449
"ebI" = (
@@ -12468,6 +12477,9 @@
1246812477
dir = 4
1246912478
},
1247012479
/obj/machinery/biogenerator,
12480+
/obj/effect/turf_decal/ramp_middle{
12481+
dir = 8
12482+
},
1247112483
/turf/open/floor/grass,
1247212484
/area/hydroponics/garden)
1247312485
"fOd" = (
@@ -14169,6 +14181,7 @@
1416914181
dir = 8
1417014182
},
1417114183
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
14184+
/obj/effect/turf_decal/ramp_middle,
1417214185
/turf/open/floor/plasteel,
1417314186
/area/hydroponics/garden)
1417414187
"gGa" = (
@@ -17540,6 +17553,9 @@
1754017553
/turf/open/floor/plasteel,
1754117554
/area/hallway/secondary/exit)
1754217555
"imX" = (
17556+
/obj/effect/turf_decal/ramp_middle{
17557+
dir = 1
17558+
},
1754317559
/turf/open/floor/plasteel/stairs/goon/stairs2_wide{
1754417560
dir = 1
1754517561
},
@@ -22735,6 +22751,9 @@
2273522751
/turf/open/floor/grass,
2273622752
/area/hydroponics/garden)
2273722753
"kVA" = (
22754+
/obj/effect/turf_decal/ramp_middle{
22755+
dir = 1
22756+
},
2273822757
/turf/open/floor/plasteel/stairs/goon/stairs_wide{
2273922758
dir = 1
2274022759
},
@@ -26421,6 +26440,7 @@
2642126440
/obj/machinery/light{
2642226441
dir = 8
2642326442
},
26443+
/obj/effect/turf_decal/ramp_middle,
2642426444
/turf/open/floor/plasteel,
2642526445
/area/hydroponics/garden)
2642626446
"mIS" = (
@@ -34553,6 +34573,9 @@
3455334573
},
3455434574
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
3455534575
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
34576+
/obj/effect/turf_decal/ramp_middle{
34577+
dir = 1
34578+
},
3455634579
/turf/open/floor/plasteel/stairs/goon/stairs_middle,
3455734580
/area/hydroponics/garden)
3455834581
"qQC" = (
@@ -35489,6 +35512,7 @@
3548935512
},
3549035513
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
3549135514
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
35515+
/obj/effect/turf_decal/ramp_middle,
3549235516
/turf/open/indestructible/grass/sand,
3549335517
/area/hydroponics/garden)
3549435518
"rmC" = (
@@ -37609,6 +37633,7 @@
3760937633
dir = 1
3761037634
},
3761137635
/obj/machinery/washing_machine,
37636+
/obj/effect/turf_decal/ramp_middle,
3761237637
/turf/open/floor/plasteel/cafeteria,
3761337638
/area/crew_quarters/toilet/auxiliary)
3761437639
"snD" = (
@@ -38761,6 +38786,9 @@
3876138786
/turf/open/floor/plating,
3876238787
/area/maintenance/department/science/central)
3876338788
"sQs" = (
38789+
/obj/effect/turf_decal/ramp_corner{
38790+
dir = 8
38791+
},
3876438792
/turf/open/floor/plasteel/cafeteria,
3876538793
/area/crew_quarters/toilet/auxiliary)
3876638794
"sQy" = (
@@ -39876,7 +39904,12 @@
3987639904
"trI" = (
3987739905
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
3987839906
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
39879-
/turf/open/floor/plasteel/stairs/goon/stairs_wide,
39907+
/obj/effect/turf_decal/ramp_middle{
39908+
dir = 1
39909+
},
39910+
/turf/open/floor/plasteel/stairs/goon/stairs_wide{
39911+
dir = 1
39912+
},
3988039913
/area/hydroponics/garden)
3988139914
"tsz" = (
3988239915
/turf/open/floor/plasteel/dark,
@@ -41870,6 +41903,7 @@
4187041903
/obj/effect/turf_decal/stripes/corner{
4187141904
dir = 4
4187241905
},
41906+
/obj/structure/railing/corner,
4187341907
/turf/open/floor/plasteel,
4187441908
/area/hydroponics/garden)
4187541909
"uwi" = (
@@ -44962,7 +44996,12 @@
4496244996
persistence_id = "public";
4496344997
pixel_x = 32
4496444998
},
44965-
/turf/open/floor/plasteel/stairs/goon/stairs2_wide,
44999+
/obj/effect/turf_decal/ramp_middle{
45000+
dir = 1
45001+
},
45002+
/turf/open/floor/plasteel/stairs/goon/stairs2_wide{
45003+
dir = 1
45004+
},
4496645005
/area/hydroponics/garden)
4496745006
"vTP" = (
4496845007
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
@@ -45833,6 +45872,10 @@
4583345872
dir = 8;
4583445873
pixel_x = 24
4583545874
},
45875+
/obj/effect/turf_decal/ramp_corner{
45876+
dir = 1
45877+
},
45878+
/obj/structure/railing/corner,
4583645879
/turf/open/floor/grass,
4583745880
/area/hydroponics/garden)
4583845881
"woR" = (
@@ -46688,6 +46731,9 @@
4668846731
dir = 4
4668946732
},
4669046733
/obj/machinery/vending/hydroseeds/weak,
46734+
/obj/effect/turf_decal/ramp_middle{
46735+
dir = 8
46736+
},
4669146737
/turf/open/floor/grass,
4669246738
/area/hydroponics/garden)
4669346739
"wKL" = (
@@ -46992,6 +47038,9 @@
4699247038
dir = 4
4699347039
},
4699447040
/obj/machinery/vending/hydronutrients,
47041+
/obj/effect/turf_decal/ramp_middle{
47042+
dir = 8
47043+
},
4699547044
/turf/open/floor/grass,
4699647045
/area/hydroponics/garden)
4699747046
"wTB" = (
@@ -49640,7 +49689,7 @@
4964049689
/obj/machinery/door/window/eastleft{
4964149690
dir = 8;
4964249691
name = "Hydroponics Window";
49643-
req_one_access_txt = "30;35"
49692+
req_one_access_txt = "35"
4964449693
},
4964549694
/turf/open/floor/plasteel,
4964649695
/area/crew_quarters/kitchen)

0 commit comments

Comments
 (0)