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

Commit ad8b347

Browse files
SapphicOverloadSapphicOverload
committed
Merge remote-tracking branch 'upstream/master' into skill-issue
2 parents 4c2d46e + 642573f commit ad8b347

File tree

486 files changed

+14394
-17845
lines changed

Some content is hidden

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

486 files changed

+14394
-17845
lines changed

‎_maps/map_files/DonutStation/DonutStation.dmm‎

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

‎_maps/map_files/GaxStation/GaxStation.dmm‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35477,6 +35477,11 @@
3547735477
/obj/effect/mapping_helpers/airlock/access/all/security/brig,
3547835478
/turf/open/floor/plasteel,
3547935479
/area/security/prison)
35480+
"rgz" = (
35481+
/obj/machinery/paystand,
35482+
/obj/item/paper/guides/jobs/security/paystand_setup,
35483+
/turf/open/floor/plasteel,
35484+
/area/security/warden)
3548035485
"rgP" = (
3548135486
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
3548235487
dir = 4
@@ -46679,14 +46684,6 @@
4667946684
},
4668046685
/turf/open/floor/plasteel/white,
4668146686
/area/science/xenobiology)
46682-
"wFZ" = (
46683-
/obj/machinery/light_switch{
46684-
pixel_x = 24
46685-
},
46686-
/obj/machinery/paystand,
46687-
/obj/item/paper/guides/jobs/security/paystand_setup,
46688-
/turf/open/floor/plasteel,
46689-
/area/security/warden)
4669046687
"wGe" = (
4669146688
/obj/machinery/processor,
4669246689
/turf/open/floor/plasteel/cafeteria{
@@ -71956,7 +71953,7 @@ vVo
7195671953
hlo
7195771954
vNC
7195871955
xMn
71959-
wFZ
71956+
rgz
7196071957
pYB
7196171958
bVZ
7196271959
czC

‎_maps/map_files/IceMeta/IceMeta.dmm‎

Lines changed: 65 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -8206,26 +8206,6 @@
82068206
dir = 4
82078207
},
82088208
/area/science/robotics/lab)
8209-
"cul" = (
8210-
/obj/structure/cable/yellow{
8211-
icon_state = "1-8"
8212-
},
8213-
/obj/structure/cable/yellow{
8214-
icon_state = "4-8"
8215-
},
8216-
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
8217-
dir = 8
8218-
},
8219-
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
8220-
dir = 4
8221-
},
8222-
/obj/machinery/firealarm{
8223-
dir = 1;
8224-
pixel_y = -26
8225-
},
8226-
/obj/effect/turf_decal/trimline/secred/filled/line/lower,
8227-
/turf/open/floor/plasteel,
8228-
/area/hallway/secondary/exit/departure_lounge)
82298209
"cum" = (
82308210
/obj/structure/table/wood,
82318211
/obj/item/flashlight/lamp/green{
@@ -13455,7 +13435,9 @@
1345513435
/obj/structure/cable/yellow{
1345613436
icon_state = "0-2"
1345713437
},
13458-
/obj/machinery/power/apc/auto_name/west,
13438+
/obj/machinery/power/apc/auto_name/west{
13439+
pixel_x = -25
13440+
},
1345913441
/turf/open/floor/plasteel,
1346013442
/area/engine/engine_smes)
1346113443
"dWi" = (
@@ -14168,6 +14150,25 @@
1416814150
/obj/item/aiModule/supplied/freeform,
1416914151
/turf/open/floor/plasteel/dark,
1417014152
/area/ai_monitored/turret_protected/ai_upload)
14153+
"eiP" = (
14154+
/obj/structure/cable/yellow{
14155+
icon_state = "1-8"
14156+
},
14157+
/obj/structure/cable/yellow{
14158+
icon_state = "4-8"
14159+
},
14160+
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
14161+
dir = 8
14162+
},
14163+
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
14164+
dir = 4
14165+
},
14166+
/obj/effect/turf_decal/trimline/secred/filled/line/lower,
14167+
/obj/machinery/light_switch{
14168+
pixel_y = -25
14169+
},
14170+
/turf/open/floor/plasteel,
14171+
/area/hallway/secondary/exit/departure_lounge)
1417114172
"eiT" = (
1417214173
/obj/machinery/button/door{
1417314174
id = "prisonereducation";
@@ -16123,35 +16124,6 @@
1612316124
/obj/item/target/syndicate,
1612416125
/turf/open/floor/plasteel,
1612516126
/area/security/range)
16126-
"eNB" = (
16127-
/obj/structure/table,
16128-
/obj/machinery/newscaster/security_unit{
16129-
pixel_x = 29;
16130-
pixel_y = 1
16131-
},
16132-
/obj/machinery/camera{
16133-
c_tag = "Departure Lounge - Security Post";
16134-
dir = 1
16135-
},
16136-
/obj/item/book/manual/wiki/security_space_law{
16137-
pixel_x = -4;
16138-
pixel_y = 4
16139-
},
16140-
/obj/item/taperecorder{
16141-
pixel_x = 4
16142-
},
16143-
/obj/item/radio/intercom{
16144-
pixel_y = -32
16145-
},
16146-
/obj/effect/turf_decal/trimline/secred/filled/line/lower{
16147-
dir = 6
16148-
},
16149-
/obj/machinery/light_switch{
16150-
pixel_x = 23;
16151-
pixel_y = -23
16152-
},
16153-
/turf/open/floor/plasteel,
16154-
/area/hallway/secondary/exit/departure_lounge)
1615516127
"eNH" = (
1615616128
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
1615716129
dir = 4
@@ -47505,6 +47477,31 @@
4750547477
},
4750647478
/turf/open/floor/plasteel/white,
4750747479
/area/science/xenobiology)
47480+
"nIf" = (
47481+
/obj/structure/table,
47482+
/obj/machinery/newscaster/security_unit{
47483+
pixel_x = 29;
47484+
pixel_y = 1
47485+
},
47486+
/obj/machinery/camera{
47487+
c_tag = "Departure Lounge - Security Post";
47488+
dir = 1
47489+
},
47490+
/obj/item/book/manual/wiki/security_space_law{
47491+
pixel_x = -4;
47492+
pixel_y = 4
47493+
},
47494+
/obj/item/taperecorder{
47495+
pixel_x = 4
47496+
},
47497+
/obj/item/radio/intercom{
47498+
pixel_y = -32
47499+
},
47500+
/obj/effect/turf_decal/trimline/secred/filled/line/lower{
47501+
dir = 6
47502+
},
47503+
/turf/open/floor/plasteel,
47504+
/area/hallway/secondary/exit/departure_lounge)
4750847505
"nIi" = (
4750947506
/obj/effect/turf_decal/stripes/line{
4751047507
dir = 8
@@ -58315,6 +58312,18 @@
5831558312
},
5831658313
/turf/open/floor/plasteel,
5831758314
/area/mine/eva)
58315+
"qMG" = (
58316+
/obj/structure/chair/office/dark{
58317+
dir = 8
58318+
},
58319+
/obj/effect/turf_decal/trimline/secred/filled/line/lower{
58320+
dir = 9
58321+
},
58322+
/obj/machinery/firealarm{
58323+
pixel_y = 26
58324+
},
58325+
/turf/open/floor/plasteel,
58326+
/area/hallway/secondary/exit/departure_lounge)
5831858327
"qMO" = (
5831958328
/obj/machinery/power/apc{
5832058329
dir = 4;
@@ -62594,7 +62603,9 @@
6259462603
/turf/open/floor/plasteel/white,
6259562604
/area/medical/sleeper)
6259662605
"san" = (
62597-
/obj/machinery/airalarm/directional/west,
62606+
/obj/machinery/airalarm/directional/west{
62607+
pixel_x = -24
62608+
},
6259862609
/obj/effect/turf_decal/stripes/line{
6259962610
dir = 1
6260062611
},
@@ -65995,20 +66006,6 @@
6599566006
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
6599666007
/turf/open/floor/plasteel,
6599766008
/area/science/mixing)
65998-
"sXK" = (
65999-
/obj/structure/chair/office/dark{
66000-
dir = 8
66001-
},
66002-
/obj/machinery/computer/security/telescreen{
66003-
desc = "Used for watching output from station security cameras.";
66004-
name = "Security Camera Monitor";
66005-
pixel_y = 30
66006-
},
66007-
/obj/effect/turf_decal/trimline/secred/filled/line/lower{
66008-
dir = 9
66009-
},
66010-
/turf/open/floor/plasteel,
66011-
/area/hallway/secondary/exit/departure_lounge)
6601266009
"sXS" = (
6601366010
/obj/structure/table/wood,
6601466011
/obj/item/paper_bin{
@@ -244738,9 +244735,9 @@ cuc
244738244735
wAR
244739244736
ugk
244740244737
qHW
244741-
sXK
244738+
qMG
244742244739
iHW
244743-
cul
244740+
eiP
244744244741
qHW
244745244742
hwM
244746244743
pXc
@@ -245511,7 +245508,7 @@ dAi
245511245508
qHW
245512245509
pOm
245513245510
wjA
245514-
eNB
245511+
nIf
245515245512
qHW
245516245513
sBE
245517245514
bwy

‎_maps/map_files/YogStation/YogStation.dmm‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27442,6 +27442,24 @@
2744227442
},
2744327443
/turf/open/floor/carpet,
2744427444
/area/crew_quarters/heads/hos)
27445+
"gVc" = (
27446+
/obj/machinery/rnd/production/protolathe/department/engineering,
27447+
/obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{
27448+
dir = 4
27449+
},
27450+
/obj/machinery/firealarm{
27451+
dir = 8;
27452+
pixel_x = 26
27453+
},
27454+
/obj/machinery/camera{
27455+
c_tag = "Engineering - Foyer - Shared Storage";
27456+
dir = 8
27457+
},
27458+
/obj/machinery/light{
27459+
dir = 4
27460+
},
27461+
/turf/open/floor/plasteel,
27462+
/area/engine/storage_shared)
2744527463
"gVn" = (
2744627464
/obj/effect/spawner/structure/window/reinforced,
2744727465
/obj/machinery/door/poddoor/shutters/preopen{
@@ -48015,21 +48033,6 @@
4801548033
},
4801648034
/turf/open/floor/plating,
4801748035
/area/security/prison/hallway)
48018-
"osD" = (
48019-
/obj/machinery/rnd/production/protolathe/department/engineering,
48020-
/obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{
48021-
dir = 4
48022-
},
48023-
/obj/machinery/firealarm{
48024-
dir = 8;
48025-
pixel_x = 26
48026-
},
48027-
/obj/machinery/camera{
48028-
c_tag = "Engineering - Foyer - Shared Storage";
48029-
dir = 8
48030-
},
48031-
/turf/open/floor/plasteel,
48032-
/area/engine/storage_shared)
4803348036
"osE" = (
4803448037
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
4803548038
/obj/structure/disposalpipe/segment{
@@ -107413,7 +107416,7 @@ kHt
107413107416
cnG
107414107417
akB
107415107418
dXX
107416-
osD
107419+
gVc
107417107420
fpn
107418107421
raI
107419107422
cfb

0 commit comments

Comments
 (0)