cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 13:18:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cetus fixes 03/26 (#12619)

Browse Source
This commit is contained in:
Olive
2026-04-01 23:13:34 +02:00
committed by GitHub
parent c111c229cd
commit 676963a824
3 changed files with 2470 additions and 1365 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_chomp/maps/cetus/cetus-1.dmm
+88 -72
View File
@@ -228,6 +228,14 @@
/obj/random/mob/mouse,
/turf/simulated/floor/tiled/freezer,
/area/maintenance/ab_Kitchen)
"aaD" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/shield_capacitor,
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
/turf/simulated/floor/tiled/techfloor,
/area/engineering/cetus/meteor/shieldgen)
"aaE" = (
/obj/machinery/door/firedoor/glass,
/obj/structure/window/maintenance_panel{
@@ -1107,7 +1115,7 @@
},
/obj/machinery/door/airlock/glass_research{
name = "Anomaly Testing";
req_access = list(65)
req_access = list(7)
},
/obj/machinery/door/firedoor/glass,
/obj/structure/disposalpipe/segment,
@@ -1339,6 +1347,28 @@
},
/turf/simulated/floor/tiled/neutral,
/area/maintenance/cetus/hallway)
"acw" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/effect/floor_decal/industrial/warning,
/obj/machinery/shield_gen/external,
/turf/simulated/floor/tiled/techfloor,
/area/engineering/cetus/meteor/shieldgen)
"acx" = (
/obj/structure/sign/department/shield{
pixel_y = 30
},
/obj/machinery/light/small{
dir = 1
},
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/tiled/techfloor,
/area/engineering/cetus/meteor/shieldgen)
"acy" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/tiled/techfloor,
/area/engineering/cetus/meteor/shieldgen)
"acC" = (
/obj/structure/sink{
dir = 4;
@@ -1788,8 +1818,6 @@
/obj/machinery/firealarm{
pixel_y = 24
},
/obj/machinery/shield_gen/external,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/light/small{
dir = 1
},
@@ -7213,12 +7241,6 @@
/obj/structure/cable/orange{
icon_state = "0-6"
},
/obj/structure/sign/department/shield{
pixel_y = 30
},
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/plating,
/area/engineering/cetus/meteor/shieldgen)
"dmb" = (
@@ -7663,12 +7685,14 @@
/turf/simulated/floor/tiled/white,
/area/rnd/cetus/meteor/carbonresearch)
"dym" = (
/obj/structure/disposalpipe/junction{
dir = 8
},
/obj/effect/floor_decal/spline/fancy/wood{
dir = 10
},
/obj/structure/disposalpipe/sortjunction{
dir = 8;
sortType = "Bar";
name = "Bar"
},
/turf/simulated/floor/tiled,
/area/crew_quarters/cetus/meteor/cafeteriaf1)
"dyp" = (
@@ -10766,7 +10790,6 @@
anchored = 1;
dir = 4;
icon_state = "emitter2";
id = "EngineEmitter";
state = 2
},
/turf/simulated/floor/plating,
@@ -11645,10 +11668,6 @@
/obj/effect/floor_decal/spline/fancy{
dir = 1
},
/obj/machinery/alarm{
dir = 8;
pixel_x = 25
},
/obj/machinery/light/fluorescent{
dir = 4
},
@@ -15839,6 +15858,11 @@
/obj/effect/floor_decal/spline/fancy{
dir = 10
},
/obj/machinery/alarm{
dir = 8;
pixel_x = 25;
pixel_y = 27
},
/turf/simulated/floor/plating,
/area/security/cetus/meteor/brig)
"hUm" = (
@@ -18658,13 +18682,11 @@
/turf/simulated/floor/tiled,
/area/crew_quarters/cetus/meteor/hallway2)
"jpg" = (
/obj/structure/disposalpipe/sortjunction{
dir = 8;
sortType = "Bar";
name = "Bar"
},
/obj/effect/floor_decal/spline/fancy/wood,
/obj/structure/railing,
/obj/structure/disposalpipe/junction{
dir = 8
},
/turf/simulated/floor/tiled,
/area/crew_quarters/cetus/meteor/cafeteriaf1)
"jpp" = (
@@ -19827,7 +19849,9 @@
/area/crew_quarters/sleep/cetus/meteor/dorm2)
"jPT" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/maintenance/rnd,
/obj/machinery/door/airlock/maintenance/rnd{
req_access = list(7)
},
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/door/blast/regular{
density = 0;
@@ -23467,8 +23491,6 @@
/turf/simulated/floor/plating,
/area/maintenance/cetus/aftmed)
"lHH" = (
/obj/machinery/shield_capacitor,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
@@ -24616,10 +24638,6 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/cetus/meteor/techstorage)
"mrH" = (
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/maintenance/cetus/meteor/aftstar)
"mrI" = (
/obj/structure/window/reinforced{
dir = 1
@@ -36052,8 +36070,6 @@
/turf/simulated/floor/tiled,
/area/engineering/cetus/meteor/atriumdeck1)
"siy" = (
/obj/machinery/shield_capacitor,
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/techfloor,
/area/engineering/cetus/meteor/shieldgen)
"siC" = (
@@ -96221,14 +96237,14 @@ hhG
kBV
ojJ
kKC
jNq
uAV
kzW
uQv
uQv
uQv
uQv
uQv
eOO
vOz
knr
knr
eOO
@@ -96479,14 +96495,14 @@ dgo
lVf
ogE
aPd
jNq
uAV
uQv
kzW
acw
hWI
rbs
hWI
uQv
eOO
aaD
vOz
eOO
knr
eOO
@@ -96737,14 +96753,14 @@ hhG
hHR
ojJ
kKC
jNq
uAV
uQv
kzW
acx
dlt
sFb
oWU
uQv
slB
aaD
kzW
eOO
knr
knr
@@ -96995,14 +97011,14 @@ ojJ
lVf
ogE
aPd
jNq
uAV
uQv
kzW
acy
hWI
uAz
hWI
uQv
slB
aaD
kzW
eOO
eOO
knr
@@ -97253,14 +97269,14 @@ ogE
hHR
ojJ
kKC
jNq
uAV
kzW
uQv
eNT
kRK
lHH
uQv
slB
kzW
slB
eOO
eOO
@@ -97542,11 +97558,11 @@ iUX
hGJ
hBX
eXe
lZX
eXe
lZX
eXe
lZX
eXe
eXe
eXe
eXe
slB
slB
@@ -97800,14 +97816,14 @@ fvl
vPG
hRu
wKr
slB
slB
slB
slB
slB
iQm
iQm
iQm
tiw
tiw
tiw
tiw
iQm
slB
slB
iQm
@@ -98058,11 +98074,11 @@ rXy
lcp
voG
fbs
slB
iQm
iQm
aam
iQm
tiw
tiw
tiw
tiw
tiw
fnG
@@ -98319,7 +98335,7 @@ wKr
iQm
iQm
tiw
mrH
tiw
tiw
tiw
iPN
@@ -98577,7 +98593,7 @@ fbs
iQm
tiw
tiw
aam
tiw
tiw
tiw
hzd
@@ -98836,8 +98852,8 @@ iQm
tiw
tiw
iQm
iQm
iQm
tiw
tiw
tiw
sRw
iQm
@@ -99091,18 +99107,18 @@ kdm
oDL
fbs
iQm
iQm
tiw
hzd
tiw
tiw
tiw
iQm
iQm
iQm
slB
iQm
slB
slB
slB
uAV
uAV
bSB
bSB
uAV
suH
suH
@@ -99349,7 +99365,9 @@ fDI
sIp
wKr
iQm
iQm
tiw
tiw
tiw
tiw
tiw
tiw
@@ -99357,8 +99375,6 @@ iQm
slB
slB
slB
slB
slB
uAV
uAV
qFw
@@ -99868,7 +99884,7 @@ tiw
tiw
fVH
iQm
tiw
iQm
tiw
jkO
iQm
modular_chomp/maps/cetus/cetus-2.dmm
+2234 -1260
View File
File diff suppressed because it is too large Load Diff
modular_chomp/maps/cetus/cetus-3.dmm
+148 -33
View File
@@ -541,12 +541,54 @@
},
/turf/simulated/floor/carpet/graycarpet,
/area/bridge/Deck3_Corridor)
"abk" = (
/obj/machinery/alarm{
pixel_y = 25
},
/turf/simulated/floor/carpet/graycarpet,
/area/maintenance/cetus/shallow/starboard)
"abl" = (
/obj/structure/lattice,
/obj/structure/catwalk,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/open,
/area/maintenance/cetus/threecp)
"abm" = (
/obj/structure/lattice,
/obj/structure/catwalk,
/obj/structure/disposalpipe/down{
dir = 8
},
/turf/simulated/open,
/area/maintenance/cetus/threecp)
"abn" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
/turf/simulated/floor/plating,
/area/maintenance/cetus/d3bar)
"abo" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/wood,
/area/crew_quarters/cetus/Galleryf2)
"abp" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/wood,
/area/crew_quarters/cetus/Galleryf2)
"abq" = (
/obj/machinery/alarm{
pixel_y = 25;
name = "N-alarm"
},
/turf/simulated/floor/carpet/graycarpet,
/area/bridge/Deck3_Corridor)
"abs" = (
/obj/machinery/conveyor{
id = "maintdelivery";
@@ -1252,6 +1294,9 @@
},
/obj/structure/lattice,
/obj/machinery/light/small,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/open,
/area/crew_quarters/cetus/Galleryf2)
"awu" = (
@@ -6436,13 +6481,13 @@
/turf/simulated/floor/plating,
/area/maintenance/cetus/threeap)
"dMT" = (
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
/obj/structure/cable/green{
icon_state = "4-8"
},
/obj/structure/disposalpipe/junction{
dir = 4;
icon_state = "pipe-j2"
},
/turf/simulated/floor/tiled,
/area/engineering/Atmospherics_Chamber)
"dNh" = (
@@ -9585,6 +9630,7 @@
"fzM" = (
/obj/structure/table/woodentable,
/obj/fiftyspawner/cardboard,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/cetus/Galleryf2)
"fAf" = (
@@ -10454,6 +10500,10 @@
/obj/effect/floor_decal/corner/green/bordercorner2{
dir = 10
},
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/floor/lino,
/area/crew_quarters/cetus/Galleryf2)
"gez" = (
@@ -12400,12 +12450,6 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/crew_quarters/cetus/Galleryf2)
"hiC" = (
/obj/machinery/alarm/alarms_hidden{
pixel_y = 19
},
/turf/simulated/floor/carpet/graycarpet,
/area/maintenance/cetus/shallow/starboard)
"hiN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/red{
dir = 4
@@ -13392,6 +13436,9 @@
/obj/structure/window/maintenance_panel{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plating,
/area/crew_quarters/cetus/Galleryf2)
"hQj" = (
@@ -14872,6 +14919,10 @@
/obj/effect/floor_decal/corner/green/border{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/cetus/Galleryf2)
"iLd" = (
@@ -15897,6 +15948,9 @@
/obj/structure/cable/green{
icon_state = "2-9"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/cetus/Galleryf2)
"jow" = (
@@ -16533,6 +16587,9 @@
req_one_access = list(25,28,37)
},
/obj/machinery/door/firedoor/glass,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/crew_quarters/cetus/Galleryf2)
"jLF" = (
@@ -17259,8 +17316,8 @@
/obj/structure/transit_tube{
icon_state = "D-SW"
},
/obj/structure/disposalpipe/segment{
dir = 4
/obj/structure/disposalpipe/sortjunction/bodies/flipped{
dir = 8
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/cetus/Galleryf2)
@@ -17429,6 +17486,10 @@
/obj/structure/cable/green{
icon_state = "5-8"
},
/obj/machinery/photocopier/faxmachine{
anchored = 0;
department = "Bridge"
},
/turf/simulated/floor/tiled/dark,
/area/bridge)
"kkT" = (
@@ -17837,6 +17898,10 @@
/obj/structure/bed/chair/wood{
dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/wood,
/area/crew_quarters/cetus/Galleryf2)
"kxA" = (
@@ -18379,6 +18444,7 @@
/obj/structure/transit_tube{
icon_state = "S-NW"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/cetus/Galleryf2)
"kOI" = (
@@ -18735,6 +18801,10 @@
dir = 4;
icon_state = "pipe-c"
},
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/floor/wood,
/area/crew_quarters/cetus/Galleryf2)
"kVR" = (
@@ -21622,6 +21692,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/cetus/Galleryf2)
"mxW" = (
@@ -26687,6 +26758,10 @@
/area/security/nuke_storage)
"pvF" = (
/obj/structure/lattice,
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/open,
/area/crew_quarters/cetus/Galleryf2)
"pvY" = (
@@ -26994,9 +27069,6 @@
icon_state = "4-10"
},
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/machinery/alarm/alarms_hidden{
pixel_y = 19
},
/turf/simulated/floor/carpet/graycarpet,
/area/bridge/Deck3_Corridor)
"pFp" = (
@@ -27007,6 +27079,10 @@
/obj/structure/sign/painting/public{
pixel_x = 31
},
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/open,
/area/crew_quarters/cetus/Galleryf2)
"pGO" = (
@@ -29094,6 +29170,10 @@
/obj/structure/table/woodentable,
/obj/item/threadneedle,
/obj/item/threadneedle,
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/cetus/Galleryf2)
"qQI" = (
@@ -30435,6 +30515,9 @@
/obj/effect/floor_decal/corner/green/bordercorner2{
dir = 6
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/cetus/Galleryf2)
"rCB" = (
@@ -30560,6 +30643,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/wood,
/area/crew_quarters/cetus/Galleryf2)
"rHE" = (
@@ -30573,6 +30657,10 @@
/obj/structure/sign/painting/public{
pixel_y = -32
},
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/cetus/Galleryf2)
"rIn" = (
@@ -31565,8 +31653,8 @@
/turf/simulated/floor/plating/turfpack/airless,
/area/solar/cetus/joint)
"snX" = (
/obj/machinery/alarm/alarms_hidden{
pixel_y = 19
/obj/machinery/alarm{
pixel_y = 25
},
/turf/simulated/floor/tiled,
/area/maintenance/cetus/shallow/flooded)
@@ -31843,8 +31931,8 @@
},
/area/ai)
"szq" = (
/obj/machinery/alarm/alarms_hidden{
pixel_y = 19
/obj/machinery/alarm{
pixel_y = 25
},
/turf/simulated/floor/carpet/graycarpet,
/area/maintenance/cetus/shallow/fp)
@@ -32628,9 +32716,9 @@
/turf/simulated/shuttle/floor/purple,
/area/shuttle/large_escape_pod1/centcom)
"taM" = (
/obj/machinery/alarm/alarms_hidden{
/obj/machinery/alarm{
dir = 4;
pixel_x = -20
pixel_x = -22
},
/turf/simulated/floor/carpet/graycarpet,
/area/maintenance/cetus/shallow/ap)
@@ -35726,6 +35814,10 @@
pixel_y = 11
},
/obj/item/radio/subspace,
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/wood,
/area/crew_quarters/cetus/Galleryf2)
"uIE" = (
@@ -35819,6 +35911,9 @@
"uLg" = (
/obj/structure/lattice,
/obj/machinery/light/small,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/open,
/area/crew_quarters/cetus/Galleryf2)
"uLs" = (
@@ -36896,6 +36991,9 @@
/obj/structure/sign/painting/public{
pixel_y = -32
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/open,
/area/crew_quarters/cetus/Galleryf2)
"vtK" = (
@@ -36944,7 +37042,7 @@
/obj/structure/table/wooden_reinforced,
/obj/machinery/photocopier/faxmachine{
anchored = 0;
department = "Internal Affairs"
department = "Secretary's Office"
},
/turf/simulated/floor/wood,
/area/bridge/secretaryoffice)
@@ -37416,7 +37514,7 @@
/obj/structure/table/wooden_reinforced,
/obj/machinery/photocopier/faxmachine{
anchored = 0;
department = "Internal Affairs"
department = "Conference Room"
},
/obj/machinery/light{
dir = 4;
@@ -38687,6 +38785,7 @@
/obj/structure/cable/green{
icon_state = "6-9"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/cetus/Galleryf2)
"wwk" = (
@@ -39314,6 +39413,10 @@
pixel_x = -22
},
/obj/structure/transit_tube_pod,
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/cetus/Galleryf2)
"wMC" = (
@@ -39792,6 +39895,10 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
/obj/machinery/alarm{
dir = 8;
pixel_x = 26
},
/turf/simulated/floor/wood,
/area/bridge/secretaryoffice)
"xdG" = (
@@ -40303,6 +40410,7 @@
/obj/machinery/light/small/fairylights{
pixel_y = 10
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/lino,
/area/crew_quarters/cetus/Galleryf2)
"xtp" = (
@@ -41287,6 +41395,10 @@
},
/obj/structure/table/woodentable,
/obj/item/tape_roll,
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/cetus/Galleryf2)
"xYU" = (
@@ -41542,6 +41654,9 @@
/obj/structure/bed/chair/wood{
dir = 8
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/wood,
/area/crew_quarters/cetus/Galleryf2)
"ygJ" = (
@@ -61434,7 +61549,7 @@ cjF
wsQ
xcU
kxn
bdj
abo
rGM
xsU
gek
@@ -61691,7 +61806,7 @@ pEq
haF
hZB
hZB
hZB
abp
ldJ
vED
mmb
@@ -61949,7 +62064,7 @@ qTS
cjF
kKq
oCe
bdj
dvB
wfN
iWC
gQh
@@ -64790,7 +64905,7 @@ hrV
jnk
hrV
ryI
hrV
abl
uow
pUM
pjz
@@ -65048,7 +65163,7 @@ oPg
mkH
bTE
jMe
hrV
abl
uow
uow
oci
@@ -65306,7 +65421,7 @@ aMA
mkH
mTD
jMe
hrV
abl
uow
uQQ
xWw
@@ -65564,7 +65679,7 @@ aMA
mkH
hrV
jMe
hrV
abm
uow
mhO
vwJ
@@ -81048,7 +81163,7 @@ cky
etf
rRw
uYA
iRe
abk
lGM
uYA
iRe
@@ -81281,7 +81396,7 @@ rRw
rRw
rRw
mrP
dhV
abq
apg
dzi
dhV
@@ -81306,7 +81421,7 @@ etf
oYg
rRw
uYA
hiC
iRe
uYA
uYA
hCr