[MIRROR] Adds a shower drain fluff item (#26949)

* Adds a shower drain fluff item (#82071)

## About The Pull Request

Turns the varedited fluff item into its own item so it no longer has a
varedited icon & icon state.

## Why It's Good For The Game

We're varediting this fluff item 17 times on current tg master and it's
pretty bad. Varediting icon/icon state in maps should be discouraged and
hopefully banned later, it's not hard to make a subtype of an item so we
should be able to expect mappers to do that rather than this.

## Changelog

Nothing player-facing.

* Adds a shower drain fluff item

---------

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-03-19 10:27:53 -05:00
committed by GitHub
co-authored by John Willard
parent 1dd5322bf1
commit d8151eaaa8
8 changed files with 876 additions and 947 deletions
@@ -243,17 +243,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/ruin/space/has_grav/allamericandiner)
"nq" = (
/obj/machinery/shower/directional/east,
/obj/structure/fluff{
desc = "What, you think the water just magically soaks into the metallic flooring?";
icon = 'icons/obj/mining_zones/survival_pod.dmi';
icon_state = "fan_tiny";
name = "shower drain"
},
/obj/item/soap,
/turf/open/floor/iron/freezer,
/area/ruin/space/has_grav/allamericandiner)
"nr" = (
/obj/structure/table/wood,
/obj/item/paper_bin{
@@ -359,6 +348,13 @@
"rd" = (
/turf/open/floor/iron/kitchen,
/area/ruin/space/has_grav/allamericandiner)
"ri" = (
/obj/machinery/door/window/left/directional/south{
name = "Trash Dumpster"
},
/obj/structure/plasticflaps,
/turf/open/floor/plating,
/area/ruin/space/has_grav/allamericandiner)
"rG" = (
/obj/structure/chair/stool/bar/directional/north,
/obj/effect/decal/cleanable/dirt,
@@ -601,17 +597,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/freezer,
/area/ruin/space/has_grav/allamericandiner)
"CF" = (
/obj/machinery/shower/directional/west,
/obj/structure/fluff{
desc = "What, you think the water just magically soaks into the metallic flooring?";
icon = 'icons/obj/mining_zones/survival_pod.dmi';
icon_state = "fan_tiny";
name = "shower drain"
},
/obj/item/soap,
/turf/open/floor/iron/freezer,
/area/ruin/space/has_grav/allamericandiner)
"Du" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/condiment/peppermill{
@@ -627,6 +612,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/space/has_grav/allamericandiner)
"DD" = (
/obj/machinery/shower/directional/east,
/obj/structure/fluff/shower_drain,
/obj/item/soap,
/turf/open/floor/iron/freezer,
/area/ruin/space/has_grav/allamericandiner)
"DQ" = (
/obj/structure/chair/sofa/right/maroon,
/obj/effect/decal/cleanable/dirt,
@@ -638,6 +629,13 @@
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/allamericandiner)
"DZ" = (
/obj/machinery/door/window/left/directional/east{
name = "Kitchen"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/kitchen/small,
/area/ruin/space/has_grav/allamericandiner)
"Eo" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -772,13 +770,6 @@
/obj/item/paper/fluff/ruins/allamericandiner,
/turf/open/floor/iron/kitchen/small,
/area/ruin/space/has_grav/allamericandiner)
"Ic" = (
/obj/machinery/door/window/left/directional/east{
name = "Kitchen"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/kitchen/small,
/area/ruin/space/has_grav/allamericandiner)
"Id" = (
/obj/structure/window/reinforced/tinted/spawner/directional/west,
/obj/effect/turf_decal/siding/green{
@@ -961,6 +952,12 @@
/obj/item/storage/dice,
/turf/open/floor/iron,
/area/ruin/space/has_grav/allamericandiner)
"OJ" = (
/obj/machinery/shower/directional/west,
/obj/structure/fluff/shower_drain,
/obj/item/soap,
/turf/open/floor/iron/freezer,
/area/ruin/space/has_grav/allamericandiner)
"Ph" = (
/obj/structure/chair/sofa/left/maroon{
dir = 4
@@ -1141,13 +1138,6 @@
/obj/structure/sink/directional/south,
/turf/open/floor/iron/freezer,
/area/ruin/space/has_grav/allamericandiner)
"Vn" = (
/obj/machinery/door/window/left/directional/south{
name = "Trash Dumpster"
},
/obj/structure/plasticflaps,
/turf/open/floor/plating,
/area/ruin/space/has_grav/allamericandiner)
"Vq" = (
/obj/structure/table/reinforced,
/obj/machinery/light/dim/directional/east,
@@ -1567,7 +1557,7 @@ oN
EK
pa
Is
Ic
DZ
Xw
Du
FB
@@ -2093,7 +2083,7 @@ Kp
jx
Kp
Lp
CF
OJ
EK
oN
oN
@@ -2167,7 +2157,7 @@ YX
Im
YX
bE
nq
DD
EK
oN
oN
@@ -2229,7 +2219,7 @@ Bn
wC
qB
qB
Vn
ri
ck
fz
vA
@@ -2483,12 +2483,7 @@
pixel_x = 15;
pixel_y = 12
},
/obj/structure/fluff{
desc = "Ew, I think I see a hairball.";
icon = 'icons/obj/mining_zones/survival_pod.dmi';
icon_state = "fan_tiny";
name = "shower drain"
},
/obj/structure/fluff/shower_drain,
/obj/machinery/shower/directional/east,
/turf/open/floor/iron/showroomfloor,
/area/ruin/space/has_grav/dangerous_research/dorms)
+1 -6
View File
@@ -973,12 +973,7 @@
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/interdyne)
"NU" = (
/obj/structure/fluff{
desc = "Ew, I think I see a hairball.";
icon = 'icons/obj/mining_zones/survival_pod.dmi';
icon_state = "fan_tiny";
name = "shower drain"
},
/obj/structure/fluff/shower_drain,
/obj/machinery/shower/directional/east,
/obj/item/soap/syndie,
/obj/machinery/light/blacklight/directional/north,
+142 -147
View File
@@ -8402,6 +8402,12 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/science/xenobiology)
"cyo" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 9
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"cyA" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/unres{
@@ -11413,11 +11419,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron,
/area/station/commons/storage/mining)
"drG" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
/turf/open/floor/iron,
/area/station/cargo/office)
"drH" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 1
@@ -14026,6 +14027,14 @@
},
/turf/open/floor/plating,
/area/station/engineering/atmos/pumproom)
"ehW" = (
/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal/bin,
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/white/side{
dir = 9
},
/area/station/science/lab)
"ehZ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -14730,28 +14739,6 @@
/obj/machinery/light_switch/directional/north,
/turf/open/floor/iron,
/area/station/commons/locker)
"eub" = (
/obj/machinery/camera{
c_tag = "Medbay Pharmacy";
dir = 9;
network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 1
},
/obj/machinery/shower/directional/south,
/obj/structure/railing{
dir = 4
},
/obj/structure/fluff{
desc = "What, you think the water just magically soaks into the metallic flooring?";
icon = 'icons/obj/mining_zones/survival_pod.dmi';
icon_state = "fan_tiny";
name = "shower drain"
},
/obj/effect/turf_decal/stripes/white/end,
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
"euc" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -17954,14 +17941,6 @@
/obj/structure/cable,
/turf/open/floor/iron/showroomfloor,
/area/station/engineering/atmos)
"fwQ" = (
/obj/structure/table/reinforced,
/obj/structure/secure_safe/caps_spare/directional/east,
/obj/item/papercutter{
pixel_x = 7
},
/turf/open/floor/iron,
/area/station/command/bridge)
"fwS" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -19044,14 +19023,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/science/explab)
"fOR" = (
/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal/bin,
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/white/side{
dir = 9
},
/area/station/science/lab)
"fPb" = (
/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/structure/cable,
@@ -20582,6 +20553,18 @@
"gmW" = (
/turf/closed/wall,
/area/station/commons/fitness)
"gnb" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 8
},
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"gnh" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/department/cargo)
@@ -21505,15 +21488,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/fore)
"gDE" = (
/obj/machinery/defibrillator_mount/directional/north,
/obj/effect/turf_decal/tile/blue/full,
/obj/machinery/light/cold/directional/north,
/obj/machinery/stasis{
dir = 4
},
/turf/open/floor/iron/large,
/area/station/medical/treatment_center)
"gDN" = (
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 1
@@ -25351,18 +25325,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat_interior)
"hPf" = (
/obj/structure/safe,
/obj/item/clothing/head/costume/bearpelt,
/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
/obj/item/gun/ballistic/revolver/russian,
/obj/item/ammo_box/a357,
/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka,
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/nuke_storage)
"hPk" = (
/obj/machinery/door/airlock/security{
name = "Permabrig Chapel"
@@ -25373,6 +25335,14 @@
/obj/machinery/door/firedoor,
/turf/open/floor/wood,
/area/station/security/prison/rec)
"hPl" = (
/obj/structure/table/reinforced,
/obj/structure/secure_safe/caps_spare/directional/east,
/obj/item/papercutter{
pixel_x = 7
},
/turf/open/floor/iron,
/area/station/command/bridge)
"hPs" = (
/turf/closed/wall/r_wall,
/area/station/security/prison/work)
@@ -29853,14 +29823,6 @@
/obj/machinery/atmospherics/components/tank,
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
"jln" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/machinery/airalarm/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"jlu" = (
/obj/structure/railing/corner,
/turf/open/lava/plasma/ice_moon,
@@ -32181,13 +32143,6 @@
/obj/effect/turf_decal/box/white,
/turf/open/floor/engine,
/area/station/engineering/atmos/hfr_room)
"jVH" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/trimline/blue/filled/corner,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"jVL" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -33380,6 +33335,15 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
"kmG" = (
/obj/machinery/defibrillator_mount/directional/north,
/obj/effect/turf_decal/tile/blue/full,
/obj/machinery/light/cold/directional/north,
/obj/machinery/stasis{
dir = 4
},
/turf/open/floor/iron/large,
/area/station/medical/treatment_center)
"kmH" = (
/obj/effect/spawner/random/entertainment/cigar,
/obj/structure/table,
@@ -41107,6 +41071,14 @@
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"mFm" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 5
},
/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal/bin,
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
"mFt" = (
/obj/machinery/atmospherics/components/binary/pump/on{
name = "Waste In"
@@ -42282,6 +42254,23 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/commons/fitness)
"mZM" = (
/obj/machinery/camera{
c_tag = "Medbay Pharmacy";
dir = 9;
network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 1
},
/obj/machinery/shower/directional/south,
/obj/structure/railing{
dir = 4
},
/obj/structure/fluff/shower_drain,
/obj/effect/turf_decal/stripes/white/end,
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
"mZS" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/tile/blue,
@@ -45359,6 +45348,14 @@
},
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"nRd" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/machinery/airalarm/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"nRm" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -52456,17 +52453,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"pYx" = (
/obj/structure/table/glass,
/obj/item/reagent_containers/cup/bottle/epinephrine,
/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 6
},
/obj/item/reagent_containers/syringe,
/obj/effect/turf_decal/tile/blue/full,
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron/large,
/area/station/medical/treatment_center)
"pYz" = (
/obj/structure/railing/corner,
/obj/machinery/door/firedoor/border_only,
@@ -52875,6 +52861,17 @@
"qfh" = (
/turf/open/floor/iron/recharge_floor,
/area/station/science/robotics/mechbay)
"qfi" = (
/obj/structure/table/glass,
/obj/item/reagent_containers/cup/bottle/epinephrine,
/obj/item/reagent_containers/cup/bottle/multiver{
pixel_x = 6
},
/obj/item/reagent_containers/syringe,
/obj/effect/turf_decal/tile/blue/full,
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron/large,
/area/station/medical/treatment_center)
"qfj" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
@@ -53795,6 +53792,13 @@
/obj/machinery/light/directional/south,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
"quu" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
/turf/open/floor/iron/dark/textured_half{
dir = 1
},
/area/station/security/office)
"quB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment{
@@ -57189,12 +57193,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
"ruM" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 9
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"ruO" = (
/obj/machinery/firealarm/directional/west,
/obj/structure/disposalpipe/segment{
@@ -60401,16 +60399,6 @@
/obj/item/radio/intercom/directional/north,
/turf/open/floor/iron/white,
/area/station/science/ordnance)
"sth" = (
/obj/item/radio/intercom/directional/east,
/obj/structure/disposalpipe/trunk{
dir = 1
},
/obj/machinery/disposal/bin,
/obj/machinery/computer/security/telescreen/entertainment/directional/south,
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/dark,
/area/station/engineering/storage)
"sto" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -61412,14 +61400,6 @@
/obj/effect/turf_decal/tile/yellow/full,
/turf/open/floor/iron/large,
/area/station/medical/pharmacy)
"sHd" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 5
},
/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal/bin,
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
"sHh" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet,
@@ -66429,6 +66409,13 @@
/obj/effect/spawner/random/engineering/tracking_beacon,
/turf/open/floor/iron,
/area/station/command/teleporter)
"uoV" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/trimline/blue/filled/corner,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"upa" = (
/obj/structure/closet/firecloset,
/turf/open/floor/plating,
@@ -70924,6 +70911,18 @@
/obj/machinery/light/floor,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
"vNv" = (
/obj/structure/safe,
/obj/item/clothing/head/costume/bearpelt,
/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
/obj/item/gun/ballistic/revolver/russian,
/obj/item/ammo_box/a357,
/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka,
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/nuke_storage)
"vND" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 1
@@ -71321,6 +71320,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"vUL" = (
/obj/item/radio/intercom/directional/east,
/obj/structure/disposalpipe/trunk{
dir = 1
},
/obj/machinery/disposal/bin,
/obj/machinery/computer/security/telescreen/entertainment/directional/south,
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/dark,
/area/station/engineering/storage)
"vUW" = (
/obj/item/stack/cable_coil{
amount = 7;
@@ -73800,6 +73809,11 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/engine,
/area/station/science/explab)
"wGk" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
/turf/open/floor/iron,
/area/station/cargo/office)
"wGv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
@@ -74195,13 +74209,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"wMV" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
/turf/open/floor/iron/dark/textured_half{
dir = 1
},
/area/station/security/office)
"wNp" = (
/obj/machinery/door/airlock/maintenance{
name = "Medbay Maintenance"
@@ -79038,18 +79045,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/storage)
"ylS" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 8
},
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"ylU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -231597,7 +231592,7 @@ ybQ
egF
jYV
jDW
hPf
vNv
ybQ
sDl
jOt
@@ -232133,7 +232128,7 @@ tKI
dMv
pdf
tKI
drG
wGk
ssc
cXl
wRx
@@ -236042,7 +236037,7 @@ wrc
eVV
rat
dNG
sth
vUL
aUj
aUj
stI
@@ -237725,7 +237720,7 @@ nbp
xKY
omk
sMY
wMV
quu
qqM
wMi
kvI
@@ -240344,7 +240339,7 @@ nfk
utR
tmQ
qnV
fwQ
hPl
kBr
lhv
iGH
@@ -244981,7 +244976,7 @@ cwh
dEV
pNx
azw
eub
mZM
eyc
qPt
uTc
@@ -245759,8 +245754,8 @@ sHc
oGs
sEz
jFZ
jVH
ylS
uoV
gnb
gTi
whh
pQL
@@ -246016,7 +246011,7 @@ azw
cXu
frP
oIJ
jln
nRd
lwQ
tHr
tHr
@@ -246275,7 +246270,7 @@ eqp
cTV
fHz
lwQ
pYx
qfi
sEK
eHg
ahL
@@ -246532,8 +246527,8 @@ iBj
mcW
sFG
lwQ
gDE
ruM
kmG
cyo
lup
lup
aCA
@@ -250140,7 +250135,7 @@ bNH
rIc
tVB
klc
sHd
mFm
jih
rkM
iYs
@@ -258352,7 +258347,7 @@ kuV
cAi
qWn
oPq
fOR
ehW
tFF
tia
qNn
File diff suppressed because it is too large Load Diff
+245 -275
View File
@@ -3632,17 +3632,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
"awh" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 1
},
/obj/machinery/disposal/bin,
/obj/machinery/status_display/evac/directional/north,
/obj/structure/disposalpipe/trunk{
dir = 2
},
/turf/open/floor/iron,
/area/station/commons/dorms)
"awi" = (
/obj/effect/turf_decal/stripes{
dir = 4
@@ -8050,20 +8039,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron/dark,
/area/station/security/courtroom/holding)
"bLr" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 5
},
/obj/structure/plaque/static_plaque/golden{
pixel_x = 32
},
/obj/structure/disposalpipe/trunk{
dir = 8
},
/obj/structure/window/reinforced/spawner/directional/south,
/turf/open/floor/iron,
/area/station/security/office)
"bLA" = (
/obj/structure/table/wood,
/obj/item/folder{
@@ -10468,6 +10443,19 @@
/obj/structure/thermoplastic/light,
/turf/open/openspace,
/area/station/hallway/primary/tram/center)
"cAc" = (
/obj/structure/table,
/obj/item/storage/box/beakers{
pixel_x = 3;
pixel_y = 3
},
/obj/machinery/camera/directional/north{
c_tag = "Service - Hydroponics"
},
/obj/effect/turf_decal/tile/green/fourcorners,
/obj/item/storage/box/syringes,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"cAd" = (
/obj/structure/marker_beacon/burgundy,
/turf/open/floor/plating/airless,
@@ -10844,6 +10832,17 @@
},
/turf/open/floor/iron/white,
/area/station/security/medical)
"cGY" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 9
},
/obj/machinery/disposal/bin,
/obj/machinery/newscaster/directional/north,
/obj/structure/disposalpipe/trunk{
dir = 4
},
/turf/open/floor/iron,
/area/station/engineering/main)
"cHj" = (
/obj/structure/disposalpipe/junction/flip{
dir = 4
@@ -11643,18 +11642,6 @@
/obj/machinery/light/cold/directional/north,
/turf/open/floor/iron/freezer,
/area/station/security/prison/shower)
"cVk" = (
/obj/effect/turf_decal/box,
/obj/machinery/shower/directional/east,
/obj/structure/fluff{
desc = "Ew, I think I see a hairball.";
icon = 'icons/obj/mining_zones/survival_pod.dmi';
icon_state = "fan_tiny";
name = "shower drain"
},
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"cVl" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
@@ -16740,18 +16727,6 @@
"ePG" = (
/turf/closed/wall/r_wall,
/area/station/science/auxlab/firing_range)
"ePS" = (
/obj/machinery/shower/directional/west,
/obj/structure/fluff{
desc = "What, you think the water just magically soaks into the metallic flooring?";
icon = 'icons/obj/mining_zones/survival_pod.dmi';
icon_state = "fan_tiny";
name = "shower drain"
},
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/purple/fourcorners,
/turf/open/floor/iron/white,
/area/station/science/research)
"eQm" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -19110,17 +19085,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/grimy,
/area/station/service/library/lounge)
"fJQ" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 9
},
/obj/machinery/newscaster/directional/north,
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
dir = 4
},
/turf/open/floor/iron/white,
/area/station/science/lab)
"fKg" = (
/obj/machinery/air_sensor/nitrogen_tank,
/turf/open/floor/engine/n2,
@@ -21052,6 +21016,16 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/dorms)
"gua" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
},
/obj/structure/disposalpipe/trunk{
dir = 2
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"gui" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -21205,17 +21179,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"gxO" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 9
},
/obj/machinery/disposal/bin,
/obj/machinery/newscaster/directional/north,
/obj/structure/disposalpipe/trunk{
dir = 4
},
/turf/open/floor/iron,
/area/station/engineering/main)
"gxV" = (
/obj/machinery/mech_bay_recharge_port{
dir = 2
@@ -21292,6 +21255,16 @@
"gyP" = (
/turf/closed/wall,
/area/station/science/robotics/mechbay)
"gzg" = (
/obj/structure/chair/comfy/black,
/obj/effect/turf_decal/siding/wood{
dir = 6
},
/obj/structure/disposalpipe/segment{
dir = 9
},
/turf/open/floor/wood,
/area/station/command/meeting_room)
"gzw" = (
/turf/closed/wall/r_wall,
/area/station/science/ordnance/office)
@@ -22516,18 +22489,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"gWt" = (
/obj/effect/turf_decal/box,
/obj/structure/fluff{
desc = "Ew, I think I see a hairball.";
icon = 'icons/obj/mining_zones/survival_pod.dmi';
icon_state = "fan_tiny";
name = "shower drain"
},
/obj/machinery/shower/directional/west,
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"gWu" = (
/obj/effect/turf_decal/trimline/yellow/filled/line,
/obj/effect/turf_decal/trimline/yellow/filled/corner{
@@ -24020,6 +23981,16 @@
},
/turf/open/floor/wood,
/area/station/service/bar/backroom)
"hCD" = (
/obj/structure/safe,
/obj/item/clothing/head/costume/bearpelt,
/obj/item/gun/ballistic/revolver/russian,
/obj/item/ammo_box/a357,
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/light/dim/directional/east,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/nuke_storage)
"hCN" = (
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/obj/machinery/light/floor,
@@ -26706,6 +26677,17 @@
/obj/effect/mapping_helpers/requests_console/assistance,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"iEj" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 1
},
/obj/machinery/disposal/bin,
/obj/machinery/status_display/evac/directional/north,
/obj/structure/disposalpipe/trunk{
dir = 2
},
/turf/open/floor/iron,
/area/station/commons/dorms)
"iEl" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -31072,6 +31054,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/captain)
"kbR" = (
/obj/effect/turf_decal/box,
/obj/structure/fluff/shower_drain,
/obj/machinery/shower/directional/west,
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"kbW" = (
/obj/structure/table/wood,
/obj/machinery/firealarm/directional/north{
@@ -32918,21 +32907,6 @@
},
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
"kHd" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/shower/directional/west,
/obj/effect/turf_decal/bot,
/obj/structure/fluff{
desc = "What, you think the water just magically soaks into the metallic flooring?";
icon = 'icons/obj/mining_zones/survival_pod.dmi';
icon_state = "fan_tiny";
name = "shower drain"
},
/obj/effect/turf_decal/tile/purple/fourcorners,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"kHn" = (
/obj/effect/turf_decal/trimline/yellow/filled/corner{
dir = 1
@@ -33734,6 +33708,19 @@
},
/turf/open/floor/iron/white,
/area/station/science/lab)
"kUg" = (
/obj/structure/reagent_dispensers/watertank/high,
/obj/structure/railing{
dir = 4
},
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 4
},
/obj/effect/turf_decal/tile/green/fourcorners,
/obj/machinery/newscaster/directional/south,
/obj/item/reagent_containers/cup/watering_can,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"kUm" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -34600,6 +34587,10 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/prison)
"lkV" = (
/obj/structure/table/glass,
/turf/open/floor/glass,
/area/station/command/meeting_room)
"lkZ" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -35089,10 +35080,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"lrZ" = (
/obj/structure/table/glass,
/turf/open/floor/glass,
/area/station/command/meeting_room)
"lse" = (
/turf/open/floor/carpet,
/area/station/service/theater)
@@ -38697,19 +38684,6 @@
},
/turf/open/floor/engine,
/area/station/science/xenobiology)
"mFj" = (
/obj/structure/reagent_dispensers/watertank/high,
/obj/structure/railing{
dir = 4
},
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 4
},
/obj/effect/turf_decal/tile/green/fourcorners,
/obj/machinery/newscaster/directional/south,
/obj/item/reagent_containers/cup/watering_can,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"mFo" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
@@ -39733,6 +39707,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/grimy,
/area/station/service/library/lounge)
"nbe" = (
/obj/structure/table/reinforced,
/obj/structure/secure_safe/caps_spare/directional/east,
/obj/machinery/cell_charger{
pixel_y = 4
},
/obj/item/stock_parts/cell/high,
/turf/open/floor/iron,
/area/station/command/bridge)
"nbh" = (
/obj/structure/railing/corner,
/obj/effect/turf_decal/trimline/blue/filled/corner,
@@ -42028,6 +42011,16 @@
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/station/cargo/miningdock/cafeteria)
"nOR" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 10
},
/obj/structure/disposalpipe/trunk{
dir = 1
},
/turf/open/floor/iron,
/area/station/cargo/storage)
"nPe" = (
/turf/open/floor/carpet,
/area/station/medical/psychology)
@@ -42178,6 +42171,13 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
"nRP" = (
/obj/machinery/shower/directional/west,
/obj/structure/fluff/shower_drain,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/purple/fourcorners,
/turf/open/floor/iron/white,
/area/station/science/research)
"nRW" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 8
@@ -43176,6 +43176,20 @@
/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"ojq" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 5
},
/obj/structure/plaque/static_plaque/golden{
pixel_x = 32
},
/obj/structure/disposalpipe/trunk{
dir = 8
},
/obj/structure/window/reinforced/spawner/directional/south,
/turf/open/floor/iron,
/area/station/security/office)
"ojI" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -44621,16 +44635,6 @@
/obj/effect/turf_decal/trimline/yellow/filled/warning,
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
"oQO" = (
/obj/structure/safe,
/obj/item/clothing/head/costume/bearpelt,
/obj/item/gun/ballistic/revolver/russian,
/obj/item/ammo_box/a357,
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/light/dim/directional/east,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/nuke_storage)
"oQU" = (
/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/misc/grass/jungle,
@@ -46975,19 +46979,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
"pGO" = (
/obj/structure/railing{
dir = 8
},
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
},
/obj/structure/disposalpipe/trunk{
dir = 1
},
/obj/machinery/disposal/bin,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
"pGS" = (
/obj/machinery/telecomms/bus/preset_one,
/turf/open/floor/iron/dark/telecomms,
@@ -48408,15 +48399,6 @@
"qgt" = (
/turf/closed/wall/rock/porous,
/area/station/medical/chemistry)
"qgy" = (
/obj/structure/table/reinforced,
/obj/structure/secure_safe/caps_spare/directional/east,
/obj/machinery/cell_charger{
pixel_y = 4
},
/obj/item/stock_parts/cell/high,
/turf/open/floor/iron,
/area/station/command/bridge)
"qgB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -49910,15 +49892,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"qHW" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron,
/area/station/security/checkpoint/science)
"qIc" = (
/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/structure/cable,
@@ -54269,16 +54242,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"skb" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 10
},
/obj/structure/disposalpipe/trunk{
dir = 1
},
/turf/open/floor/iron,
/area/station/cargo/storage)
"ski" = (
/turf/open/floor/carpet,
/area/station/hallway/secondary/entry)
@@ -55408,6 +55371,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security/brig)
"sDW" = (
/obj/effect/turf_decal/box,
/obj/machinery/shower/directional/east,
/obj/structure/fluff/shower_drain,
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"sDY" = (
/obj/structure/railing{
dir = 1
@@ -55510,6 +55480,17 @@
},
/turf/open/floor/iron/dark,
/area/station/security/courtroom/holding)
"sGc" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 9
},
/obj/machinery/newscaster/directional/north,
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
dir = 4
},
/turf/open/floor/iron/white,
/area/station/science/lab)
"sGk" = (
/obj/machinery/button/door/directional/east{
id = "miningdorm1";
@@ -56326,6 +56307,12 @@
},
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
"sUE" = (
/obj/structure/fluff/shower_drain,
/obj/machinery/duct,
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/freezer,
/area/station/commons/toilet)
"sUX" = (
/obj/structure/railing{
dir = 4
@@ -56866,24 +56853,6 @@
"tes" = (
/turf/open/floor/glass/reinforced,
/area/station/command/heads_quarters/rd)
"teH" = (
/obj/structure/reagent_dispensers/watertank/high,
/obj/structure/railing{
dir = 8
},
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 8
},
/obj/machinery/elevator_control_panel/directional/south{
desc = "A small control panel used to move the kitchen dumbwaiter up and down.";
linked_elevator_id = "dumbwaiter_lift";
name = "Dumbwaiter control Panel";
preset_destination_names = list("2" = "Hydroponics", "3" = "Kitchen")
},
/obj/effect/turf_decal/tile/green/fourcorners,
/obj/item/reagent_containers/cup/watering_can,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"teM" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner,
/obj/effect/turf_decal/trimline/neutral/filled/corner{
@@ -60054,20 +60023,6 @@
},
/turf/open/floor/iron,
/area/station/command/teleporter)
"ujv" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 5
},
/obj/machinery/shower/directional/west,
/obj/effect/turf_decal/box,
/obj/structure/fluff{
desc = "What, you think the water just magically soaks into the metallic flooring?";
icon = 'icons/obj/mining_zones/survival_pod.dmi';
icon_state = "fan_tiny";
name = "shower drain"
},
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
"ujw" = (
/obj/effect/landmark/start/hangover,
/obj/structure/disposalpipe/segment,
@@ -62919,6 +62874,24 @@
/obj/structure/cable,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/starboard/central)
"vcs" = (
/obj/structure/reagent_dispensers/watertank/high,
/obj/structure/railing{
dir = 8
},
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 8
},
/obj/machinery/elevator_control_panel/directional/south{
desc = "A small control panel used to move the kitchen dumbwaiter up and down.";
linked_elevator_id = "dumbwaiter_lift";
name = "Dumbwaiter control Panel";
preset_destination_names = list("2" = "Hydroponics", "3" = "Kitchen")
},
/obj/effect/turf_decal/tile/green/fourcorners,
/obj/item/reagent_containers/cup/watering_can,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"vcv" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 10
@@ -64129,15 +64102,6 @@
},
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
"vxv" = (
/obj/effect/turf_decal/siding/wood,
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
dir = 8
},
/obj/machinery/light/warm/directional/north,
/turf/open/floor/wood,
/area/station/command/meeting_room)
"vyo" = (
/obj/machinery/duct,
/obj/structure/cable,
@@ -64760,6 +64724,15 @@
},
/turf/open/floor/iron,
/area/station/commons/dorms)
"vHX" = (
/obj/effect/turf_decal/siding/wood,
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
dir = 8
},
/obj/machinery/light/warm/directional/north,
/turf/open/floor/wood,
/area/station/command/meeting_room)
"vIa" = (
/obj/machinery/vending/cigarette,
/obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -66155,19 +66128,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/tram/right)
"wjd" = (
/obj/structure/table,
/obj/item/storage/box/beakers{
pixel_x = 3;
pixel_y = 3
},
/obj/machinery/camera/directional/north{
c_tag = "Service - Hydroponics"
},
/obj/effect/turf_decal/tile/green/fourcorners,
/obj/item/storage/box/syringes,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"wjk" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "Security Maintenance Hatch"
@@ -66721,6 +66681,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/medical/virology)
"wvW" = (
/obj/structure/railing{
dir = 8
},
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
},
/obj/structure/disposalpipe/trunk{
dir = 1
},
/obj/machinery/disposal/bin,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
"wwc" = (
/obj/structure/table/wood,
/obj/item/paper_bin{
@@ -68014,16 +67987,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
"wWe" = (
/obj/structure/chair/comfy/black,
/obj/effect/turf_decal/siding/wood{
dir = 6
},
/obj/structure/disposalpipe/segment{
dir = 9
},
/turf/open/floor/wood,
/area/station/command/meeting_room)
"wWh" = (
/obj/machinery/vending/cola/blue,
/obj/effect/turf_decal/siding/thinplating/dark{
@@ -68123,6 +68086,15 @@
},
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat/foyer)
"wXJ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron,
/area/station/security/checkpoint/science)
"wXM" = (
/turf/open/floor/carpet,
/area/station/commons/vacant_room/office)
@@ -68305,6 +68277,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/closed/wall/r_wall,
/area/station/medical/virology)
"xbv" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 5
},
/obj/machinery/shower/directional/west,
/obj/effect/turf_decal/box,
/obj/structure/fluff/shower_drain,
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
"xbw" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
@@ -69058,17 +69039,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"xrf" = (
/obj/structure/fluff{
desc = "What, you think the water just magically soaks into the metallic flooring?";
icon = 'icons/obj/mining_zones/survival_pod.dmi';
icon_state = "fan_tiny";
name = "shower drain"
},
/obj/machinery/duct,
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/freezer,
/area/station/commons/toilet)
"xrl" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
@@ -69844,6 +69814,16 @@
"xFx" = (
/turf/open/floor/iron,
/area/station/commons/fitness)
"xGu" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/shower/directional/west,
/obj/effect/turf_decal/bot,
/obj/structure/fluff/shower_drain,
/obj/effect/turf_decal/tile/purple/fourcorners,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"xGw" = (
/obj/machinery/door/airlock/external{
name = "Labor Camp Shuttle Airlock"
@@ -70447,16 +70427,6 @@
/obj/effect/turf_decal/trimline/blue/filled/line,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"xSz" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
},
/obj/structure/disposalpipe/trunk{
dir = 2
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"xSD" = (
/obj/structure/chair/office/light{
dir = 8
@@ -84278,7 +84248,7 @@ apC
abM
apC
thi
xrf
sUE
alT
amr
alT
@@ -84289,7 +84259,7 @@ kMD
alT
amr
alT
xrf
sUE
pAv
apC
abM
@@ -88650,7 +88620,7 @@ fFi
apC
fii
apC
awh
iEj
wBc
nhL
npe
@@ -90671,7 +90641,7 @@ rUR
aaa
rUR
pnp
oQO
hCD
lQM
abM
abM
@@ -101505,7 +101475,7 @@ pkp
pkp
pkp
pLH
gxO
cGY
sqV
lku
osj
@@ -103251,7 +103221,7 @@ adg
ykN
qMf
dyC
mFj
kUg
nUP
gvC
cay
@@ -103758,14 +103728,14 @@ iJn
gzP
uQb
nUP
wjd
cAc
wHX
nWT
adg
ykN
qMf
mCR
teH
vcs
nUP
cQY
aer
@@ -117448,7 +117418,7 @@ puT
awT
qVr
kXg
kHd
xGu
dGk
qVr
kkL
@@ -155171,7 +155141,7 @@ qdY
xNj
qyZ
kSZ
wWe
gzg
imr
iue
hyE
@@ -155427,11 +155397,11 @@ lSo
azy
tFK
qyZ
vxv
vHX
hHI
nfR
hHI
lrZ
lkV
hHI
nUM
bNF
@@ -155694,7 +155664,7 @@ pRB
kVV
mIp
hZP
pGO
wvW
cMb
qiq
crR
@@ -156470,7 +156440,7 @@ aQO
rup
wzm
rAh
qgy
nbe
eUy
mgq
nhV
@@ -159003,7 +158973,7 @@ bcq
idF
dYe
auR
bLr
ojq
mld
nPw
lMQ
@@ -166770,7 +166740,7 @@ jyH
wmy
iYv
kFf
ujv
xbv
mOM
ssF
kTS
@@ -168836,7 +168806,7 @@ xSZ
yfw
oIU
aLA
gWt
kbR
wbT
dvQ
uZQ
@@ -169350,7 +169320,7 @@ xSZ
aLd
oIU
aLA
cVk
sDW
krE
bvK
eGn
@@ -170120,7 +170090,7 @@ uHB
jtr
jtr
jKi
xSz
gua
qDF
uwk
oXz
@@ -181905,7 +181875,7 @@ jcv
rpr
dzw
sxR
skb
nOR
oAV
ccF
uWi
@@ -181936,7 +181906,7 @@ sUb
amL
qQc
oxL
fJQ
sGc
mlM
bxG
nDR
@@ -184506,9 +184476,9 @@ sNQ
sPK
gYO
pMk
ePS
nRP
pmM
ePS
nRP
pMk
dfE
gvm
@@ -185288,7 +185258,7 @@ niF
rQt
kvt
syv
qHW
wXJ
ybW
eah
syv
+1 -6
View File
@@ -1033,12 +1033,7 @@
layer = 4
},
/obj/effect/turf_decal/box,
/obj/structure/fluff{
desc = "What, you think the water just magically soaks into the metallic flooring?";
icon = 'icons/obj/mining_zones/survival_pod.dmi';
icon_state = "fan_tiny";
name = "shower drain"
},
/obj/structure/fluff/shower_drain,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"Dy" = (
+14
View File
@@ -25,6 +25,7 @@
qdel(src)
return
..()
/**
* Empty terrariums are created when a preserved terrarium in a lavaland seed vault is activated.
*/
@@ -34,6 +35,7 @@
icon = 'icons/obj/mining_zones/spawners.dmi'
icon_state = "terrarium_open"
density = TRUE
/**
* Empty sleepers are created by a good few ghost roles in lavaland.
*/
@@ -51,6 +53,7 @@
/obj/structure/fluff/empty_sleeper/syndicate
icon_state = "sleeper_s-open"
/**
* Empty cryostasis sleepers are created when a malfunctioning cryostasis sleeper in a lavaland shelter is activated.
*/
@@ -75,6 +78,17 @@
deconstructible = FALSE
layer = EDGED_TURF_LAYER
/**
* shower drain placed usually under showers just so it looks like something picks the water up.
*/
/obj/structure/fluff/shower_drain
name = "shower drain"
desc = "Ew, I think I see a hairball."
icon = 'icons/obj/mining_zones/survival_pod.dmi'
icon_state = "fan_tiny"
plane = FLOOR_PLANE
layer = LOW_OBJ_LAYER
/**
* A variety of statue in disrepair; parts are broken off and a gemstone is missing
*/