[READY]Cargo Update: Nanotrasen Supply Drop Pods!
This commit is contained in:
oranges
committed by
CitadelStationBot
CitadelStationBot
parent
dfe39e7a1d
commit
1f88c0c660
@@ -19258,7 +19258,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/turf/closed/wall,
|
||||
/area/maintenance/port)
|
||||
/area/quartermaster/warehouse)
|
||||
"aWD" = (
|
||||
/obj/structure/reagent_dispensers/fueltank,
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -19751,7 +19751,7 @@
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
|
||||
/turf/closed/wall,
|
||||
/area/maintenance/port)
|
||||
/area/quartermaster/warehouse)
|
||||
"aXF" = (
|
||||
/obj/effect/landmark/event_spawn,
|
||||
/turf/open/floor/plasteel/vault{
|
||||
@@ -19785,7 +19785,7 @@
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/turf/closed/wall,
|
||||
/area/maintenance/port)
|
||||
/area/quartermaster/warehouse)
|
||||
"aXK" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
@@ -19938,7 +19938,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/turf/closed/wall,
|
||||
/area/maintenance/port)
|
||||
/area/quartermaster/warehouse)
|
||||
"aYd" = (
|
||||
/obj/structure/chair/office/dark,
|
||||
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
|
||||
@@ -20526,7 +20526,7 @@
|
||||
"aZF" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/closed/wall,
|
||||
/area/maintenance/port)
|
||||
/area/quartermaster/warehouse)
|
||||
"aZG" = (
|
||||
/obj/machinery/light_switch{
|
||||
pixel_y = 28
|
||||
@@ -20552,7 +20552,7 @@
|
||||
/obj/item/stack/sheet/cardboard,
|
||||
/obj/item/stack/rods/fifty,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aZJ" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/device/camera/detective,
|
||||
@@ -20972,7 +20972,7 @@
|
||||
/area/hallway/primary/starboard)
|
||||
"baS" = (
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"baT" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
@@ -21011,7 +21011,7 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/obj/structure/closet/crate,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"baZ" = (
|
||||
/obj/machinery/status_display{
|
||||
layer = 4;
|
||||
@@ -21164,7 +21164,7 @@
|
||||
/obj/structure/closet/crate,
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"bbu" = (
|
||||
/obj/machinery/power/apc{
|
||||
dir = 1;
|
||||
@@ -21315,7 +21315,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"bbQ" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/reagent_containers/food/drinks/bottle/whiskey{
|
||||
@@ -21333,7 +21333,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"bbT" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/device/flashlight/lamp/green,
|
||||
@@ -21597,13 +21597,13 @@
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"bcF" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"bcG" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/machinery/computer/security/wooden_tv,
|
||||
@@ -21625,7 +21625,7 @@
|
||||
},
|
||||
/obj/structure/closet/crate/freezer,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"bcK" = (
|
||||
/obj/structure/rack,
|
||||
/obj/effect/spawner/lootdrop/maintenance,
|
||||
@@ -21676,7 +21676,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"bcS" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
@@ -21686,13 +21686,13 @@
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"bcT" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"bcU" = (
|
||||
/turf/open/floor/wood,
|
||||
/area/maintenance/bar)
|
||||
@@ -22063,7 +22063,7 @@
|
||||
"bdS" = (
|
||||
/obj/structure/closet/crate/internals,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"bdT" = (
|
||||
/obj/machinery/power/apc{
|
||||
dir = 8;
|
||||
@@ -22082,7 +22082,7 @@
|
||||
"bdU" = (
|
||||
/obj/structure/closet/crate/medical,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"bdV" = (
|
||||
/obj/item/stack/sheet/metal,
|
||||
/turf/open/floor/plating/airless,
|
||||
@@ -22339,7 +22339,7 @@
|
||||
},
|
||||
/obj/structure/closet/crate,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"bey" = (
|
||||
/turf/open/floor/plasteel/white/corner{
|
||||
dir = 8
|
||||
@@ -22381,7 +22381,7 @@
|
||||
},
|
||||
/obj/structure/closet/crate,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"beE" = (
|
||||
/obj/machinery/light,
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -22625,7 +22625,7 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/obj/item/stack/sheet/cardboard,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"bfh" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
@@ -22636,7 +22636,7 @@
|
||||
"bfi" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"bfj" = (
|
||||
/obj/structure/disposalpipe/trunk,
|
||||
/obj/structure/disposaloutlet{
|
||||
@@ -23087,7 +23087,7 @@
|
||||
dir = 9
|
||||
},
|
||||
/turf/closed/wall,
|
||||
/area/maintenance/port)
|
||||
/area/quartermaster/warehouse)
|
||||
"bgz" = (
|
||||
/obj/machinery/disposal/bin,
|
||||
/obj/structure/disposalpipe/trunk,
|
||||
@@ -23096,7 +23096,7 @@
|
||||
"bgA" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"bgB" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 6
|
||||
@@ -23694,7 +23694,7 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/obj/effect/turf_decal/delivery,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"bhX" = (
|
||||
/obj/structure/disposalpipe/sorting/wrap{
|
||||
dir = 1
|
||||
@@ -46740,7 +46740,7 @@
|
||||
"ckQ" = (
|
||||
/obj/structure/closet/cardboard,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"ckS" = (
|
||||
/obj/structure/closet/cardboard,
|
||||
/turf/open/floor/plating,
|
||||
@@ -52668,7 +52668,7 @@
|
||||
/obj/effect/landmark/event_spawn,
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"cBj" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/folder/blue,
|
||||
@@ -56963,6 +56963,7 @@
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/medical/sleeper)
|
||||
"QoZ" = (
|
||||
<<<<<<< HEAD
|
||||
/turf/open/space/basic,
|
||||
/area/maintenance/port/fore)
|
||||
"Qpa" = (
|
||||
@@ -60469,6 +60470,48 @@
|
||||
},
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/engine/gravity_generator)
|
||||
=======
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
"Qpa" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
"Qpb" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
dir = 4;
|
||||
name = "Cargo Warehouse APC";
|
||||
areastring = "/area/quartermaster/warehouse";
|
||||
pixel_x = 26
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/port)
|
||||
"Qpc" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
"Qpd" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
"Qpe" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
"Qpf" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
"Qpg" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
"Qph" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
>>>>>>> fcc3dae... Merge pull request #33436 from MrDoomBringer/DropItLikeItsHottest
|
||||
|
||||
(1,1,1) = {"
|
||||
aaa
|
||||
@@ -80642,7 +80685,7 @@ aWu
|
||||
aYa
|
||||
aZD
|
||||
aZD
|
||||
aZD
|
||||
Qpb
|
||||
aZD
|
||||
aZD
|
||||
bff
|
||||
@@ -81161,7 +81204,7 @@ baS
|
||||
bdS
|
||||
bdU
|
||||
ckQ
|
||||
aZE
|
||||
Qpg
|
||||
bjq
|
||||
bjr
|
||||
bjr
|
||||
@@ -81675,7 +81718,7 @@ bcR
|
||||
bcE
|
||||
baS
|
||||
bex
|
||||
bhY
|
||||
aZF
|
||||
bgu
|
||||
bic
|
||||
bku
|
||||
@@ -81932,7 +81975,7 @@ bcS
|
||||
bbt
|
||||
bfi
|
||||
beD
|
||||
aZE
|
||||
Qph
|
||||
aZE
|
||||
biA
|
||||
bmg
|
||||
@@ -82182,13 +82225,13 @@ aTH
|
||||
aPK
|
||||
aWz
|
||||
aWC
|
||||
aZE
|
||||
aZE
|
||||
aZE
|
||||
QoZ
|
||||
Qpa
|
||||
Qpc
|
||||
bcT
|
||||
aZE
|
||||
aZE
|
||||
aZE
|
||||
Qpd
|
||||
Qpe
|
||||
Qpf
|
||||
aZE
|
||||
bju
|
||||
biv
|
||||
|
||||
@@ -14591,6 +14591,9 @@
|
||||
dir = 6
|
||||
},
|
||||
/obj/effect/decal/cleanable/oil,
|
||||
/obj/structure/cable{
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/department/cargo)
|
||||
"aKl" = (
|
||||
@@ -14868,6 +14871,9 @@
|
||||
req_access_txt = "31"
|
||||
},
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/department/cargo)
|
||||
"aLi" = (
|
||||
@@ -15320,27 +15326,27 @@
|
||||
dir = 4
|
||||
},
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aMp" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aMq" = (
|
||||
/obj/effect/spawner/lootdrop/maintenance,
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aMr" = (
|
||||
/obj/structure/closet/crate,
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aMs" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
@@ -15349,7 +15355,7 @@
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aMt" = (
|
||||
/obj/structure/closet/cardboard,
|
||||
/obj/structure/disposalpipe/segment{
|
||||
@@ -15363,20 +15369,27 @@
|
||||
dir = 2
|
||||
},
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aMu" = (
|
||||
/obj/item/cigbutt/cigarbutt,
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aMv" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
dir = 4;
|
||||
name = "Cargo Warehouse APC";
|
||||
areastring = "/area/quartermaster/warehouse";
|
||||
pixel_x = 26
|
||||
},
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aMw" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 5
|
||||
@@ -15953,20 +15966,20 @@
|
||||
pixel_x = -32
|
||||
},
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aNO" = (
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aNP" = (
|
||||
/obj/structure/closet/crate,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aNQ" = (
|
||||
/obj/structure/extinguisher_cabinet{
|
||||
pixel_x = 27
|
||||
},
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aNR" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
@@ -16499,33 +16512,33 @@
|
||||
/obj/effect/spawner/lootdrop/maintenance,
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aOZ" = (
|
||||
/obj/item/stack/sheet/cardboard,
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 6
|
||||
},
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aPa" = (
|
||||
/obj/structure/closet/crate,
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aPb" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aPc" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aPd" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
@@ -16905,16 +16918,16 @@
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aQd" = (
|
||||
/obj/item/device/flashlight,
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aQe" = (
|
||||
/obj/effect/spawner/lootdrop/maintenance,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aQf" = (
|
||||
/obj/structure/closet/crate{
|
||||
icon_state = "crateopen";
|
||||
@@ -16922,11 +16935,11 @@
|
||||
},
|
||||
/obj/effect/spawner/lootdrop/maintenance,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aQg" = (
|
||||
/obj/structure/closet/crate/medical,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aQh" = (
|
||||
/turf/closed/wall/mineral/titanium,
|
||||
/area/shuttle/supply)
|
||||
@@ -17447,7 +17460,7 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/obj/effect/turf_decal/delivery,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aRo" = (
|
||||
/obj/machinery/door/poddoor/shutters{
|
||||
id = "qm_warehouse";
|
||||
@@ -17456,7 +17469,7 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/obj/effect/turf_decal/delivery,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aRp" = (
|
||||
/obj/machinery/door/poddoor/shutters{
|
||||
id = "qm_warehouse";
|
||||
@@ -17464,11 +17477,11 @@
|
||||
},
|
||||
/obj/effect/turf_decal/delivery,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aRq" = (
|
||||
/obj/structure/closet/crate/internals,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"aRr" = (
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/shuttle/supply)
|
||||
@@ -48293,7 +48306,7 @@
|
||||
"coL" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/quartermaster/storage)
|
||||
/area/quartermaster/warehouse)
|
||||
"coN" = (
|
||||
/turf/open/floor/plasteel/neutral/corner,
|
||||
/area/hallway/secondary/exit/departure_lounge)
|
||||
@@ -51373,6 +51386,7 @@
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/library)
|
||||
"cCX" = (
|
||||
<<<<<<< HEAD
|
||||
/obj/machinery/vending/kink,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/department/crew_quarters/dorms)
|
||||
@@ -51386,6 +51400,77 @@
|
||||
/obj/machinery/vending/kink,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/department/engine)
|
||||
=======
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/department/cargo)
|
||||
"cCY" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 10
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/department/cargo)
|
||||
"cCZ" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/obj/structure/cable{
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/department/cargo)
|
||||
"cDa" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
"cDb" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
"cDc" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
"cDd" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
"cDe" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
"cDf" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
"cDg" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
"cDh" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
"cDi" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
"cDj" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
"cDk" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
"cDl" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
"cDm" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
"cDn" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
>>>>>>> fcc3dae... Merge pull request #33436 from MrDoomBringer/DropItLikeItsHottest
|
||||
|
||||
(1,1,1) = {"
|
||||
aaa
|
||||
@@ -90809,12 +90894,12 @@ aEd
|
||||
aIj
|
||||
aJm
|
||||
aKg
|
||||
aLg
|
||||
cDa
|
||||
aMo
|
||||
aLg
|
||||
aLg
|
||||
aLg
|
||||
aLg
|
||||
cDd
|
||||
cDf
|
||||
cDg
|
||||
cDh
|
||||
aLg
|
||||
aTj
|
||||
aUu
|
||||
@@ -91842,8 +91927,8 @@ aMs
|
||||
aNO
|
||||
aPb
|
||||
aQe
|
||||
aLg
|
||||
aLg
|
||||
cDi
|
||||
cDj
|
||||
aTn
|
||||
aUx
|
||||
aVA
|
||||
@@ -92100,7 +92185,7 @@ aNP
|
||||
aPb
|
||||
aNO
|
||||
aNP
|
||||
aLg
|
||||
cDk
|
||||
aTo
|
||||
aSk
|
||||
aTm
|
||||
@@ -92357,7 +92442,7 @@ aNO
|
||||
aPc
|
||||
aQf
|
||||
aRq
|
||||
aLg
|
||||
cDl
|
||||
aTp
|
||||
aSk
|
||||
aTm
|
||||
@@ -92614,7 +92699,7 @@ aNQ
|
||||
aNO
|
||||
aQg
|
||||
aNP
|
||||
aLg
|
||||
cDm
|
||||
aTq
|
||||
aSk
|
||||
aVB
|
||||
@@ -92864,14 +92949,14 @@ aEd
|
||||
aEd
|
||||
aEd
|
||||
aEd
|
||||
aKl
|
||||
aLg
|
||||
aLg
|
||||
aLg
|
||||
cCX
|
||||
cDb
|
||||
cDc
|
||||
cDe
|
||||
coL
|
||||
coL
|
||||
coL
|
||||
aLg
|
||||
cDn
|
||||
aTr
|
||||
aUy
|
||||
aPd
|
||||
@@ -93121,7 +93206,7 @@ aGI
|
||||
aHr
|
||||
aEd
|
||||
aJp
|
||||
aKm
|
||||
cCY
|
||||
aLi
|
||||
aMw
|
||||
aEj
|
||||
@@ -93378,7 +93463,7 @@ aGJ
|
||||
aGJ
|
||||
aDl
|
||||
aEk
|
||||
aEk
|
||||
cCZ
|
||||
aLj
|
||||
aMx
|
||||
aEj
|
||||
|
||||
Reference in New Issue
Block a user