mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-10 01:49:19 +00:00
[Map Edits] Minimal Piping/Device Fixes (#12239)
* map fixes * reverting delta fix for PR conflict
This commit is contained in:
@@ -4127,13 +4127,12 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/security/main)
|
||||
"ahO" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
|
||||
dir = 4;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/structure/chair/sofa/left{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/crew_quarters/fitness)
|
||||
"ahP" = (
|
||||
@@ -13940,8 +13939,7 @@
|
||||
/area/crew_quarters/dorms)
|
||||
"aFk" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
|
||||
dir = 4;
|
||||
pixel_y = 5
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/wood,
|
||||
/area/crew_quarters/bar)
|
||||
@@ -14441,13 +14439,12 @@
|
||||
/turf/closed/wall,
|
||||
/area/crew_quarters/theatre)
|
||||
"aGw" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on{
|
||||
dir = 4;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/wood,
|
||||
/area/crew_quarters/bar)
|
||||
"aGx" = (
|
||||
@@ -15098,10 +15095,6 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/crew_quarters/dorms)
|
||||
"aHV" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on{
|
||||
dir = 1;
|
||||
pixel_x = 5
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
dir = 4
|
||||
},
|
||||
@@ -15114,6 +15107,9 @@
|
||||
/obj/item/reagent_containers/rag/towel/random,
|
||||
/obj/item/reagent_containers/rag/towel/random,
|
||||
/obj/item/reagent_containers/rag/towel/random,
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/crew_quarters/toilet)
|
||||
"aHY" = (
|
||||
@@ -19161,6 +19157,7 @@
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/port)
|
||||
"aSY" = (
|
||||
@@ -48956,8 +48953,8 @@
|
||||
"cpn" = (
|
||||
/obj/machinery/light,
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 6
|
||||
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/engine_smes)
|
||||
@@ -53839,6 +53836,10 @@
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
/area/security/range)
|
||||
"dZm" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/closed/wall,
|
||||
/area/storage/art)
|
||||
"eaI" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/radio/intercom{
|
||||
@@ -55152,8 +55153,8 @@
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 6
|
||||
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
|
||||
dir = 8
|
||||
},
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
@@ -57621,6 +57622,9 @@
|
||||
/obj/machinery/door/airlock/maintenance{
|
||||
req_access_txt = "12"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/wood,
|
||||
/area/crew_quarters/bar)
|
||||
"plS" = (
|
||||
@@ -59521,11 +59525,10 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/atmos)
|
||||
"uQS" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
|
||||
dir = 1;
|
||||
pixel_x = 5
|
||||
},
|
||||
/obj/machinery/light/small,
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/crew_quarters/toilet)
|
||||
"uRd" = (
|
||||
@@ -81567,7 +81570,7 @@ aPF
|
||||
aQZ
|
||||
aRa
|
||||
aTF
|
||||
aPG
|
||||
dZm
|
||||
aSX
|
||||
hPP
|
||||
aZF
|
||||
|
||||
@@ -3938,13 +3938,12 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/security/main)
|
||||
"ahO" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
|
||||
dir = 4;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/structure/chair/sofa/left{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/crew_quarters/fitness)
|
||||
"ahP" = (
|
||||
@@ -14109,8 +14108,7 @@
|
||||
/area/crew_quarters/dorms)
|
||||
"aFk" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
|
||||
dir = 4;
|
||||
pixel_y = 5
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/wood,
|
||||
/area/crew_quarters/bar)
|
||||
@@ -14603,13 +14601,12 @@
|
||||
/turf/closed/wall,
|
||||
/area/crew_quarters/theatre)
|
||||
"aGw" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on{
|
||||
dir = 4;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/wood,
|
||||
/area/crew_quarters/bar)
|
||||
"aGx" = (
|
||||
@@ -15250,10 +15247,6 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/crew_quarters/dorms)
|
||||
"aHV" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on{
|
||||
dir = 1;
|
||||
pixel_x = 5
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
dir = 4
|
||||
},
|
||||
@@ -15266,6 +15259,9 @@
|
||||
/obj/item/reagent_containers/rag/towel/random,
|
||||
/obj/item/reagent_containers/rag/towel/random,
|
||||
/obj/item/reagent_containers/rag/towel/random,
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/crew_quarters/toilet)
|
||||
"aHY" = (
|
||||
@@ -19304,15 +19300,16 @@
|
||||
name = "Art Storage";
|
||||
pixel_y = 24
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/port)
|
||||
"aSY" = (
|
||||
@@ -35617,8 +35614,7 @@
|
||||
pixel_y = 3
|
||||
},
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
|
||||
dir = 4;
|
||||
pixel_y = 5
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/wood,
|
||||
/area/crew_quarters/bar)
|
||||
@@ -55452,11 +55448,10 @@
|
||||
/area/engine/engineering)
|
||||
"hOv" = (
|
||||
/obj/structure/table/wood/fancy,
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on{
|
||||
dir = 4;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/reagent_containers/food/snacks/burger/plain,
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/wood,
|
||||
/area/crew_quarters/bar)
|
||||
"hOI" = (
|
||||
@@ -55486,8 +55481,8 @@
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 6
|
||||
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
|
||||
dir = 8
|
||||
},
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
@@ -57748,8 +57743,7 @@
|
||||
pixel_y = 20
|
||||
},
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
|
||||
dir = 4;
|
||||
pixel_y = 5
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/wood,
|
||||
/area/crew_quarters/bar)
|
||||
@@ -58028,6 +58022,10 @@
|
||||
/obj/effect/spawner/lootdrop/keg,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/starboard/aft)
|
||||
"oFT" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/closed/wall,
|
||||
/area/storage/art)
|
||||
"oHB" = (
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/crew_quarters/dorms)
|
||||
@@ -60500,11 +60498,10 @@
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"uQS" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
|
||||
dir = 1;
|
||||
pixel_x = 5
|
||||
},
|
||||
/obj/machinery/light/small,
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/crew_quarters/toilet)
|
||||
"uRd" = (
|
||||
@@ -82695,7 +82692,7 @@ aPF
|
||||
aQZ
|
||||
aRa
|
||||
aTF
|
||||
aPG
|
||||
oFT
|
||||
aSX
|
||||
hPP
|
||||
aZF
|
||||
|
||||
@@ -6660,9 +6660,7 @@
|
||||
/obj/structure/cable/yellow{
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
|
||||
/turf/open/floor/plasteel/showroomfloor,
|
||||
/area/security/warden)
|
||||
"amc" = (
|
||||
@@ -7778,9 +7776,6 @@
|
||||
"aop" = (
|
||||
/obj/structure/bed,
|
||||
/obj/item/bedsheet,
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 9
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
@@ -7792,6 +7787,9 @@
|
||||
/obj/effect/turf_decal/tile/red{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/security/brig)
|
||||
"aoq" = (
|
||||
@@ -9147,6 +9145,7 @@
|
||||
/area/maintenance/port/fore)
|
||||
"aqY" = (
|
||||
/obj/machinery/computer/security/labor,
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/security/brig)
|
||||
"aqZ" = (
|
||||
@@ -11924,9 +11923,6 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/fore)
|
||||
"awC" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
dir = 1
|
||||
},
|
||||
@@ -14823,6 +14819,9 @@
|
||||
/obj/structure/cable/yellow{
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/security/brig)
|
||||
"aCr" = (
|
||||
@@ -14830,6 +14829,9 @@
|
||||
name = "Court Cell";
|
||||
req_access_txt = "63"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/security/brig)
|
||||
"aCs" = (
|
||||
@@ -79861,13 +79863,13 @@
|
||||
c_tag = "Chapel - Funeral Parlour";
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/chapel/main)
|
||||
"djk" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
|
||||
/turf/closed/wall,
|
||||
/area/chapel/main)
|
||||
"djr" = (
|
||||
@@ -80610,10 +80612,12 @@
|
||||
/area/security/brig)
|
||||
"dBH" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/obj/structure/cable/yellow{
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/security/brig)
|
||||
"dBI" = (
|
||||
@@ -82215,6 +82219,10 @@
|
||||
/obj/machinery/status_display/supply,
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/sorting)
|
||||
"orJ" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/turf/closed/wall,
|
||||
/area/security/brig)
|
||||
"oub" = (
|
||||
/obj/structure/sign/poster/official/random,
|
||||
/turf/closed/wall,
|
||||
@@ -82299,6 +82307,12 @@
|
||||
},
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"pvk" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/security/detectives_office)
|
||||
"pvA" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
@@ -104390,7 +104404,7 @@ cLa
|
||||
cPF
|
||||
cQb
|
||||
djj
|
||||
djr
|
||||
cQb
|
||||
cRq
|
||||
cPA
|
||||
aaa
|
||||
@@ -107370,7 +107384,7 @@ akv
|
||||
alO
|
||||
anf
|
||||
aop
|
||||
ahx
|
||||
orJ
|
||||
aqY
|
||||
asn
|
||||
atK
|
||||
@@ -112777,7 +112791,7 @@ axp
|
||||
dBF
|
||||
azO
|
||||
aBi
|
||||
ajm
|
||||
axw
|
||||
ajm
|
||||
ajm
|
||||
ajm
|
||||
@@ -113291,7 +113305,7 @@ axr
|
||||
ayF
|
||||
ayF
|
||||
ayF
|
||||
ayF
|
||||
pvk
|
||||
ayJ
|
||||
ayJ
|
||||
aGt
|
||||
|
||||
@@ -4058,6 +4058,7 @@
|
||||
pixel_y = -3
|
||||
},
|
||||
/obj/item/gun/energy/e_gun/advtaser,
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/security/armory)
|
||||
"akM" = (
|
||||
@@ -52409,6 +52410,23 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/library)
|
||||
"cBi" = (
|
||||
/obj/machinery/flasher/portable,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
|
||||
dir = 5
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/security/armory)
|
||||
"cBk" = (
|
||||
/obj/machinery/vending/boozeomat/pubby_maint,
|
||||
/turf/closed/wall,
|
||||
@@ -55283,6 +55301,9 @@
|
||||
name = "Sergeant-at-Armsky";
|
||||
weaponscheck = 1
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/security/armory)
|
||||
"iwe" = (
|
||||
@@ -55668,6 +55689,13 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/science/xenobiology)
|
||||
"juw" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/security/armory)
|
||||
"jvi" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
@@ -58246,6 +58274,15 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/security/execution/transfer)
|
||||
"pfB" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/security/armory)
|
||||
"pfP" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/storage/box/syringes,
|
||||
@@ -84497,7 +84534,7 @@ aiL
|
||||
ajg
|
||||
ajP
|
||||
akL
|
||||
alA
|
||||
cBi
|
||||
amh
|
||||
amV
|
||||
anF
|
||||
@@ -84754,7 +84791,7 @@ aiM
|
||||
aiM
|
||||
ajQ
|
||||
akM
|
||||
akM
|
||||
juw
|
||||
ami
|
||||
amW
|
||||
anG
|
||||
@@ -85268,7 +85305,7 @@ aiN
|
||||
aji
|
||||
ajS
|
||||
akO
|
||||
akO
|
||||
pfB
|
||||
amk
|
||||
amY
|
||||
anI
|
||||
|
||||
Reference in New Issue
Block a user