diff --git a/_maps/RandomZLevels/away_mission/TheBeach.dmm b/_maps/RandomZLevels/away_mission/TheBeach.dmm
index 6877eb4b35..80a649bcc8 100644
--- a/_maps/RandomZLevels/away_mission/TheBeach.dmm
+++ b/_maps/RandomZLevels/away_mission/TheBeach.dmm
@@ -1001,6 +1001,20 @@
/obj/item/clothing/glasses/heat,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
+"np" = (
+/obj/machinery/shower{
+ dir = 8
+ },
+/obj/effect/turf_decal/sand,
+/turf/open/floor/plasteel/white,
+/area/awaymission/beach)
+"Vi" = (
+/obj/machinery/shower{
+ dir = 4
+ },
+/obj/effect/turf_decal/sand,
+/turf/open/floor/plasteel/white,
+/area/awaymission/beach)
(1,1,1) = {"
aa
@@ -7892,10 +7906,10 @@ ak
ak
ak
ak
-ak
-ak
-ak
-ak
+Vi
+Vi
+Vi
+Vi
ak
ba
ba
@@ -8213,10 +8227,10 @@ ak
ak
ak
ak
-ak
-ak
-ak
-ak
+np
+np
+np
+np
ak
ba
ba
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index b2478c540c..92f9ff0c53 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -1648,19 +1648,12 @@
/turf/open/floor/plating,
/area/maintenance/starboard)
"acx" = (
-/obj/effect/decal/cleanable/blood/old,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
-/obj/effect/landmark/xeno_spawn,
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/maintenance/starboard)
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel/freezer,
+/area/commons/toilet/restrooms)
"acy" = (
/obj/machinery/door/airlock/external{
name = "External Airlock";
@@ -5799,9 +5792,6 @@
/turf/open/floor/plating,
/area/security/brig)
"ajd" = (
-/obj/item/kirbyplants{
- icon_state = "plant-22"
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
@@ -5812,6 +5802,7 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
+/obj/structure/closet/crate/bin,
/turf/open/floor/plasteel,
/area/hallway/primary/port/fore)
"aje" = (
@@ -6470,12 +6461,10 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/structure/cable/white{
- icon_state = "2-8"
- },
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/structure/chair,
/turf/open/floor/plasteel{
heat_capacity = 1e+006
},
@@ -6491,6 +6480,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/structure/chair,
/turf/open/floor/plasteel{
heat_capacity = 1e+006
},
@@ -6506,6 +6496,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/structure/cable/white{
+ icon_state = "2-8"
+ },
/turf/open/floor/plasteel{
heat_capacity = 1e+006
},
@@ -7140,26 +7133,17 @@
"ald" = (
/obj/structure/sign/nanotrasen,
/turf/closed/wall,
-/area/commons/toilet/restrooms)
+/area/service/lawoffice)
"ale" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock{
- name = "Primary Restroom"
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/cable/white{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel/freezer,
-/area/commons/toilet/restrooms)
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/service/lawoffice)
"alf" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall,
-/area/commons/toilet/restrooms)
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/service/lawoffice)
"alg" = (
/turf/closed/wall/r_wall,
/area/command/teleporter)
@@ -7616,35 +7600,29 @@
/turf/open/floor/plasteel,
/area/hallway/primary/port/fore)
"alT" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/regular,
/obj/structure/extinguisher_cabinet{
pixel_x = -26
},
+/obj/item/kirbyplants{
+ icon_state = "plant-22"
+ },
/obj/machinery/newscaster{
pixel_y = 32
},
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel/freezer,
-/area/commons/toilet/restrooms)
+/turf/open/floor/wood,
+/area/service/lawoffice)
"alU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/delivery,
-/obj/structure/cable/white{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel/freezer,
-/area/commons/toilet/restrooms)
+/turf/open/floor/wood,
+/area/service/lawoffice)
"alV" = (
-/obj/structure/urinal{
- pixel_y = 28
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
},
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel/freezer,
-/area/commons/toilet/restrooms)
+/obj/structure/window/reinforced/spawner/east,
+/obj/structure/chair,
+/turf/open/floor/wood,
+/area/service/lawoffice)
"alW" = (
/obj/structure/urinal{
pixel_y = 28
@@ -7652,12 +7630,9 @@
/turf/open/floor/plasteel/freezer,
/area/commons/toilet/restrooms)
"alX" = (
-/obj/structure/closet/crate/bin,
-/obj/machinery/light_switch{
- pixel_y = 24
- },
-/turf/open/floor/plasteel/freezer,
-/area/commons/toilet/restrooms)
+/obj/machinery/vending/wardrobe/law_wardrobe,
+/turf/open/floor/wood,
+/area/service/lawoffice)
"alY" = (
/obj/machinery/shieldwallgen,
/obj/machinery/button/door{
@@ -8145,50 +8120,31 @@
/turf/open/floor/plasteel,
/area/security/brig)
"amO" = (
-/obj/structure/mirror{
- pixel_x = -26
- },
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel/freezer,
-/area/commons/toilet/restrooms)
+/turf/open/floor/wood,
+/area/service/lawoffice)
"amP" = (
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -26
- },
-/obj/machinery/light/small,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
+/turf/open/floor/wood,
+/area/service/lawoffice)
+"amQ" = (
+/obj/structure/table/wood,
+/obj/structure/window/reinforced/spawner/east,
+/obj/structure/window/reinforced/spawner,
+/obj/item/clipboard,
+/obj/item/folder/red,
+/turf/open/floor/wood,
+/area/service/lawoffice)
+"amR" = (
/obj/structure/cable/white{
icon_state = "1-4"
},
-/turf/open/floor/plasteel/freezer,
-/area/commons/toilet/restrooms)
-"amQ" = (
-/obj/structure/cable/white{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/freezer,
-/area/commons/toilet/restrooms)
-"amR" = (
-/obj/machinery/airalarm{
- dir = 1;
- pixel_y = -22
- },
-/obj/machinery/light/small,
-/obj/structure/cable/white{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/freezer,
-/area/commons/toilet/restrooms)
+/turf/open/floor/wood,
+/area/service/lawoffice)
"amS" = (
/obj/machinery/camera{
- c_tag = "Locker Room Toilets";
+ c_tag = "Law Office";
dir = 8
},
/obj/machinery/power/apc{
@@ -8200,8 +8156,11 @@
/obj/structure/cable/white{
icon_state = "0-8"
},
-/turf/open/floor/plasteel/freezer,
-/area/commons/toilet/restrooms)
+/obj/structure/rack,
+/obj/item/storage/briefcase,
+/obj/item/storage/briefcase,
+/turf/open/floor/wood,
+/area/service/lawoffice)
"amT" = (
/obj/structure/table/reinforced,
/obj/item/stack/cable_coil/white,
@@ -8667,15 +8626,15 @@
/turf/open/floor/plasteel,
/area/hallway/primary/port/fore)
"anJ" = (
-/obj/machinery/door/airlock{
- name = "Toilet Unit"
+/obj/structure/chair{
+ dir = 4
},
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = -24
},
-/turf/open/floor/plasteel/freezer,
-/area/commons/toilet/restrooms)
+/turf/open/floor/wood,
+/area/service/lawoffice)
"anK" = (
/obj/structure/closet/secure_closet/engineering_chief,
/obj/effect/turf_decal/tile/neutral{
@@ -9244,40 +9203,30 @@
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"aoC" = (
-/obj/effect/decal/cleanable/vomit/old,
-/obj/structure/toilet{
- dir = 8
+/obj/structure/chair{
+ dir = 4
},
-/obj/machinery/newscaster{
- pixel_x = -32
- },
-/obj/machinery/light/small,
-/turf/open/floor/plasteel/freezer,
-/area/commons/toilet/restrooms)
+/turf/open/floor/wood,
+/area/service/lawoffice)
"aoD" = (
-/obj/structure/toilet{
- dir = 8
- },
-/obj/machinery/newscaster{
- pixel_x = -32
- },
/obj/machinery/light/small,
-/obj/effect/landmark/blobstart,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel/freezer,
-/area/commons/toilet/restrooms)
+/obj/structure/table/wood,
+/obj/structure/window/reinforced/spawner/west,
+/obj/item/folder/blue,
+/turf/open/floor/carpet/green/airless,
+/area/service/lawoffice)
"aoE" = (
-/obj/structure/toilet{
- dir = 8
+/obj/machinery/airalarm{
+ dir = 1;
+ pixel_y = -22
},
-/obj/machinery/newscaster{
- pixel_x = -32
+/obj/structure/filingcabinet/employment,
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = 24
},
-/obj/machinery/light/small,
-/obj/effect/landmark/start/assistant,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel/freezer,
-/area/commons/toilet/restrooms)
+/turf/open/floor/wood,
+/area/service/lawoffice)
"aoF" = (
/obj/structure/table/reinforced,
/obj/item/stock_parts/cell/high,
@@ -12446,8 +12395,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/white/corner,
/area/hallway/primary/starboard/fore)
"atq" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -13151,8 +13099,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/white/corner,
/area/hallway/primary/starboard/fore)
"auq" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible,
@@ -13814,23 +13761,23 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/white/corner,
/area/hallway/primary/starboard/fore)
"avv" = (
-/obj/machinery/shieldgen,
-/obj/effect/turf_decal/stripes/line{
- dir = 9
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = -12;
+ pixel_y = 2
},
-/turf/open/floor/plasteel,
-/area/maintenance/starboard)
-"avw" = (
-/obj/machinery/shieldgen,
-/obj/effect/turf_decal/stripes/line{
- dir = 5
+/obj/structure/mirror{
+ pixel_x = -26
},
-/turf/open/floor/plasteel,
-/area/maintenance/starboard)
+/obj/machinery/airalarm{
+ pixel_y = 23
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel/freezer,
+/area/commons/toilet/restrooms)
"avx" = (
/obj/machinery/atmospherics/pipe/simple/yellow/visible,
/obj/machinery/computer/atmos_control/tank/oxygen_tank{
@@ -14542,11 +14489,9 @@
},
/area/hallway/primary/starboard/fore)
"awz" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/maintenance/starboard)
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/plasteel/freezer,
+/area/commons/toilet/restrooms)
"awA" = (
/turf/open/floor/engine/o2,
/area/engineering/atmos)
@@ -14918,21 +14863,37 @@
/turf/open/floor/plating,
/area/maintenance/starboard/central)
"axf" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
+/obj/structure/table,
+/obj/effect/turf_decal/bot,
+/obj/structure/bedsheetbin/towel,
+/obj/structure/sign/poster/official/cleanliness{
+ pixel_y = -32
},
-/turf/open/floor/plasteel,
-/area/maintenance/starboard)
+/obj/machinery/newscaster{
+ pixel_x = -32
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_x = -26;
+ pixel_y = -26
+ },
+/turf/open/floor/plasteel/freezer,
+/area/commons/toilet/restrooms)
"axg" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/turf_decal/stripes/line{
- dir = 6
+/obj/machinery/light/small,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
},
-/obj/item/wrench,
-/obj/item/wirecutters,
-/turf/open/floor/plasteel,
-/area/maintenance/starboard)
+/obj/effect/turf_decal/bot,
+/obj/machinery/light_switch{
+ pixel_x = 8;
+ pixel_y = -24
+ },
+/turf/open/floor/plasteel/freezer,
+/area/commons/toilet/restrooms)
"axh" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance{
@@ -25739,7 +25700,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/structure/rack,
+/obj/machinery/shieldgen,
/turf/open/floor/plasteel,
/area/maintenance/port/aft)
"aOu" = (
@@ -25925,6 +25886,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating,
/area/maintenance/port/aft)
"aOJ" = (
@@ -27992,6 +27956,7 @@
/obj/machinery/light/small{
dir = 8
},
+/obj/machinery/shieldgen,
/turf/open/floor/plasteel,
/area/maintenance/port/aft)
"aSg" = (
@@ -30048,7 +30013,6 @@
/turf/open/floor/plasteel,
/area/maintenance/port/aft)
"aVS" = (
-/obj/structure/bookcase/random/fiction,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -30059,6 +30023,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/structure/bookcase/random/nonfiction,
/turf/open/floor/plasteel/dark,
/area/service/library)
"aVT" = (
@@ -30068,7 +30033,6 @@
/turf/open/floor/plasteel/dark,
/area/service/library)
"aVU" = (
-/obj/structure/bookcase/random/adult,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -30079,10 +30043,11 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/structure/bookcase/random/reference,
/turf/open/floor/plasteel/dark,
/area/service/library)
"aVV" = (
-/obj/structure/bookcase/random/adult,
+/obj/structure/bookcase/random/religion,
/turf/open/floor/plasteel/dark,
/area/service/library)
"aVW" = (
@@ -30814,11 +30779,12 @@
/turf/closed/wall,
/area/service/library)
"aXg" = (
-/obj/structure/bookcase/random/nonfiction,
+/obj/structure/sign/painting{
+ pixel_y = -32
+ },
/turf/open/floor/plasteel/dark,
/area/service/library)
"aXh" = (
-/obj/structure/bookcase/random/nonfiction,
/obj/machinery/light,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -30847,7 +30813,6 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"aXj" = (
-/obj/structure/bookcase/random/reference,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -30858,10 +30823,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/turf/open/floor/plasteel/dark,
-/area/service/library)
-"aXk" = (
-/obj/structure/bookcase/random/reference,
+/obj/structure/sign/painting{
+ pixel_y = -32
+ },
/turf/open/floor/plasteel/dark,
/area/service/library)
"aXl" = (
@@ -32195,7 +32159,8 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
-/obj/structure/bookcase{
+/obj/structure/bookcase/random/adult{
+ desc = "Oh whoa, what's this?";
name = "Forbidden Knowledge"
},
/turf/open/floor/wood,
@@ -36129,6 +36094,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
+/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"bfs" = (
@@ -36910,74 +36876,24 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/effect/turf_decal/sand,
+/obj/effect/turf_decal/sand,
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/dark,
/area/maintenance/starboard/aft)
"bgv" = (
-/obj/machinery/biogenerator,
-/obj/item/wrench,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/weather,
+/obj/effect/turf_decal/weather,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/maintenance/starboard/aft)
-"bgw" = (
-/obj/item/kirbyplants{
- icon_state = "plant-22"
- },
-/obj/machinery/airalarm{
- pixel_y = 24
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/maintenance/starboard/aft)
-"bgx" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/reagent_containers/food/snacks/grown/tomato,
-/obj/item/seeds/tea,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/maintenance/starboard/aft)
-"bgy" = (
-/obj/item/kirbyplants{
- icon_state = "plant-21";
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/maintenance/starboard/aft)
-"bgz" = (
-/obj/machinery/seed_extractor,
-/obj/item/reagent_containers/glass/bucket,
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/maintenance/starboard/aft)
-"bgA" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/poppy,
-/obj/item/reagent_containers/food/snacks/grown/cherries,
-/obj/item/shovel/spade,
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
+/obj/structure/bedsheetbin/towel,
+/obj/structure/table/wood/poker,
/turf/open/floor/plasteel/dark,
/area/maintenance/starboard/aft)
"bgB" = (
@@ -37329,32 +37245,26 @@
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
"bhj" = (
+/obj/effect/turf_decal/sand/plating,
/obj/structure/sink{
dir = 8;
pixel_x = -12;
pixel_y = 2
},
-/obj/structure/sign/warning/nosmoking{
+/obj/structure/sign/poster/ripped{
pixel_x = -32
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"bhk" = (
-/turf/open/floor/plating,
-/area/maintenance/starboard)
"bhm" = (
-/obj/effect/landmark/xeno_spawn,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/yellowsiding,
/area/maintenance/starboard/aft)
"bhn" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 11
+/obj/machinery/light/floor,
+/turf/open/floor/plasteel/yellowsiding/corner{
+ dir = 8;
+ icon_state = "yellowcornersiding"
},
-/obj/structure/sign/departments/botany{
- pixel_x = 32
- },
-/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"bho" = (
/obj/machinery/door/airlock/silver{
@@ -37724,77 +37634,11 @@
},
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
-"bhT" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/harebell,
-/obj/item/reagent_containers/food/snacks/grown/watermelon,
-/obj/item/cultivator,
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/maintenance/starboard/aft)
-"bhU" = (
-/obj/item/kirbyplants{
- icon_state = "plant-21";
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/maintenance/starboard/aft)
-"bhV" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/reagent_containers/food/snacks/grown/wheat,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/maintenance/starboard/aft)
-"bhW" = (
-/obj/machinery/light/small,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
"bhX" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/reagent_containers/food/snacks/grown/tea,
-/obj/item/hatchet,
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
+/obj/machinery/pool/filter{
+ pixel_y = 16
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/maintenance/starboard/aft)
-"bhY" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/tower,
-/obj/item/reagent_containers/glass/bottle/nutrient/rh,
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
+/turf/open/pool,
/area/maintenance/starboard/aft)
"bhZ" = (
/obj/machinery/light_switch{
@@ -39501,6 +39345,12 @@
},
/turf/open/floor/plasteel/dark,
/area/hallway/secondary/exit)
+"boD" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/closed/wall,
+/area/commons/toilet/restrooms)
"boE" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/dark/visible{
@@ -39537,6 +39387,9 @@
/obj/machinery/meter/atmos,
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"bsq" = (
+/turf/closed/mineral/random/labormineral,
+/area/maintenance/starboard/aft)
"bsv" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/white{
@@ -40477,6 +40330,7 @@
/obj/structure/cable/white{
icon_state = "0-8"
},
+/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating{
icon_state = "panelscorched"
},
@@ -40557,6 +40411,15 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/science/mixing)
+"bRf" = (
+/obj/structure/sign/warning/securearea,
+/turf/closed/wall,
+/area/command/gateway)
+"bVs" = (
+/obj/structure/girder,
+/obj/effect/turf_decal/sand/plating,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"bYE" = (
/obj/structure/sign/warning/fire,
/obj/machinery/atmospherics/pipe/simple/general/visible{
@@ -40576,6 +40439,13 @@
dir = 1
},
/area/engineering/atmos)
+"caJ" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plating,
+/area/maintenance/starboard)
"ccy" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -40695,6 +40565,10 @@
},
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
+"cGA" = (
+/obj/machinery/pool/controller,
+/turf/open/floor/wood,
+/area/maintenance/starboard/aft)
"cRz" = (
/obj/machinery/button/door{
id = "supplybridge";
@@ -40719,6 +40593,18 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard)
+"cUd" = (
+/obj/structure/cable/white{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc/highcap/ten_k{
+ areastring = "/area/command/gateway";
+ dir = 1;
+ name = "Gateway APC";
+ pixel_y = 23
+ },
+/turf/open/floor/plasteel,
+/area/command/gateway)
"cWv" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/closed/wall/r_wall,
@@ -40824,6 +40710,10 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
+"dvB" = (
+/obj/structure/sink/puddle,
+/turf/open/floor/plating/asteroid,
+/area/maintenance/port/aft)
"dFV" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
@@ -40852,6 +40742,20 @@
},
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
+"dMx" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/plasteel,
+/area/command/gateway)
+"dQg" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit)
"dQC" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -40869,6 +40773,12 @@
},
/turf/open/floor/plasteel,
/area/service/bar/atrium)
+"dSq" = (
+/turf/open/floor/plasteel/yellowsiding{
+ dir = 4;
+ icon_state = "yellowsiding"
+ },
+/area/maintenance/starboard/aft)
"dXv" = (
/obj/item/transfer_valve{
pixel_x = -5
@@ -40910,6 +40820,11 @@
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"ekG" = (
+/turf/open/floor/wood{
+ icon_state = "wood-broken"
+ },
+/area/maintenance/starboard/aft)
"emA" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -40918,6 +40833,11 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/white{
+ icon_state = "2-8"
+ },
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"eva" = (
@@ -41034,6 +40954,20 @@
},
/turf/open/floor/plasteel/dark,
/area/engineering/atmos)
+"eOg" = (
+/obj/structure/closet/crate{
+ icon_state = "crateopen"
+ },
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
+ name = "2maintenance loot spawner"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/item/storage/box,
+/turf/open/floor/plasteel,
+/area/maintenance/starboard)
"eOs" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
@@ -41135,6 +41069,11 @@
/obj/machinery/status_display/ai,
/turf/closed/wall,
/area/commons/lounge)
+"fgZ" = (
+/obj/structure/girder/reinforced,
+/obj/effect/turf_decal/sand/plating,
+/turf/open/floor/plating/airless,
+/area/asteroid/nearstation)
"fjs" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
@@ -41168,6 +41107,12 @@
},
/turf/open/floor/plasteel,
/area/science/mixing)
+"fmq" = (
+/obj/structure/table/wood,
+/obj/structure/window/reinforced/spawner/west,
+/obj/item/flashlight/lamp/green,
+/turf/open/floor/carpet/green/airless,
+/area/service/lawoffice)
"fnp" = (
/obj/machinery/air_sensor/atmos/nitrous_tank,
/turf/open/floor/engine/n2o,
@@ -41177,6 +41122,19 @@
/obj/item/wrench,
/turf/open/space,
/area/space/nearstation)
+"foP" = (
+/obj/structure/chair/stool/bar,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/wood{
+ icon_state = "wood-broken"
+ },
+/area/maintenance/starboard/aft)
+"fpH" = (
+/obj/item/seeds/harebell,
+/turf/open/space/basic,
+/area/space)
"fsl" = (
/obj/docking_port/stationary{
dir = 2;
@@ -41279,6 +41237,22 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
+"fNN" = (
+/obj/machinery/hydroponics/soil,
+/obj/item/seeds/tea,
+/obj/machinery/light/small,
+/turf/open/floor/plating/asteroid,
+/area/maintenance/port/aft)
+"fRe" = (
+/turf/open/floor/plating/airless{
+ icon_state = "platingdmg3"
+ },
+/area/asteroid/nearstation)
+"fWh" = (
+/turf/open/floor/wood{
+ icon_state = "wood-broken5"
+ },
+/area/maintenance/starboard/aft)
"fWz" = (
/obj/machinery/door/airlock/external{
name = "External Docking Port";
@@ -41404,6 +41378,22 @@
},
/turf/open/floor/plating,
/area/science/mixing)
+"gIT" = (
+/obj/machinery/door/airlock/maintenance_hatch{
+ name = "Maintenance Hatch";
+ req_access_txt = "12"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/port/aft)
"gLD" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
@@ -41424,8 +41414,13 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel,
+/obj/structure/sign/departments/restroom{
+ pixel_x = 32
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white/corner,
/area/hallway/primary/starboard/fore)
"gNH" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
@@ -41447,6 +41442,18 @@
},
/turf/open/floor/plasteel,
/area/service/bar/atrium)
+"gRe" = (
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/command/gateway)
+"gSu" = (
+/turf/open/floor/plasteel/yellowsiding{
+ dir = 8;
+ icon_state = "yellowsiding"
+ },
+/area/maintenance/starboard/aft)
"gSv" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -41484,6 +41491,15 @@
},
/turf/open/floor/plasteel/dark,
/area/engineering/atmos)
+"gWt" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/broken{
+ dir = 1;
+ icon_state = "tube-broken"
+ },
+/turf/open/floor/carpet/green/airless,
+/area/maintenance/starboard/aft)
"gZk" = (
/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 10
@@ -41503,11 +41519,13 @@
/turf/closed/mineral/random/labormineral,
/area/science/test_area)
"hiR" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
- },
-/turf/open/floor/plating,
+/obj/machinery/light/floor,
+/turf/open/floor/plasteel/yellowsiding/corner,
/area/maintenance/starboard/aft)
+"hkI" = (
+/obj/machinery/gateway/centerstation,
+/turf/open/floor/plasteel/dark,
+/area/command/gateway)
"hpr" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=3.2-AtriumSW";
@@ -41538,6 +41556,11 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall,
/area/maintenance/starboard/aft)
+"hsR" = (
+/obj/machinery/door/airlock/shuttle/glass,
+/obj/machinery/door/firedoor/closed,
+/turf/open/floor/wood,
+/area/maintenance/starboard/aft)
"hsV" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -41581,6 +41604,14 @@
},
/turf/open/floor/plasteel,
/area/service/bar/atrium)
+"hGN" = (
+/obj/machinery/light,
+/obj/structure/closet/secure_closet/exile,
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/turf/open/floor/plasteel/dark,
+/area/command/gateway)
"hIu" = (
/obj/structure/cable/white{
icon_state = "4-8"
@@ -41694,6 +41725,15 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"hYy" = (
+/obj/structure/lattice,
+/turf/open/floor/plating/asteroid,
+/area/maintenance/starboard/aft)
+"hZH" = (
+/turf/open/floor/plating/airless{
+ icon_state = "platingdmg2"
+ },
+/area/asteroid/nearstation)
"iaa" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/navbeacon{
@@ -41760,6 +41800,11 @@
/obj/machinery/air_sensor/atmos/carbon_tank,
/turf/open/floor/engine/co2,
/area/engineering/atmos)
+"isT" = (
+/turf/open/floor/wood{
+ icon_state = "wood-broken2"
+ },
+/area/maintenance/starboard/aft)
"ixk" = (
/obj/machinery/atmospherics/pipe/simple/green/visible,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -41773,6 +41818,9 @@
},
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
+"iGT" = (
+/turf/closed/wall,
+/area/service/lawoffice)
"iIj" = (
/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped{
dir = 4
@@ -41827,14 +41875,43 @@
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/space/nearstation)
+"iSq" = (
+/turf/open/floor/plating/asteroid/airless,
+/area/maintenance/starboard/aft)
+"iSy" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/item/toy/poolnoodle/red,
+/turf/open/floor/wood,
+/area/maintenance/starboard/aft)
"iUq" = (
/obj/machinery/status_display,
/turf/closed/wall,
/area/service/library)
+"iUJ" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/command/gateway)
"iUO" = (
/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix,
/turf/open/floor/engine,
/area/science/mixing)
+"iVs" = (
+/obj/machinery/computer/gateway_control{
+ dir = 4;
+ icon_state = "computer"
+ },
+/obj/effect/turf_decal/delivery,
+/obj/machinery/camera{
+ c_tag = "Gateway";
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/command/gateway)
"iVw" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable/white{
@@ -41856,6 +41933,11 @@
/obj/machinery/atmospherics/pipe/simple/supply/visible,
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"iYt" = (
+/obj/structure/chair/office/dark,
+/obj/effect/landmark/start/lawyer,
+/turf/open/floor/carpet/green/airless,
+/area/service/lawoffice)
"iZQ" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input,
/turf/open/floor/engine/co2,
@@ -41910,6 +41992,18 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/science/xenobiology)
+"jeI" = (
+/turf/open/floor/plasteel/yellowsiding{
+ dir = 1;
+ icon_state = "yellowsiding"
+ },
+/area/maintenance/starboard/aft)
+"jkc" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood/airless{
+ icon_state = "wood-broken7"
+ },
+/area/asteroid/nearstation)
"jkl" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
@@ -41966,6 +42060,10 @@
},
/turf/open/floor/plasteel/dark,
/area/hallway/primary/starboard)
+"jrd" = (
+/obj/machinery/pool/drain,
+/turf/open/pool,
+/area/maintenance/starboard/aft)
"jsD" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior,
@@ -41985,6 +42083,10 @@
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"juY" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/wood,
+/area/maintenance/starboard/aft)
"jwi" = (
/obj/structure/sign/directions/engineering{
dir = 8;
@@ -42097,6 +42199,31 @@
},
/turf/open/floor/plasteel,
/area/science/mixing)
+"jMP" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 5
+ },
+/turf/open/floor/wood{
+ icon_state = "wood-broken2"
+ },
+/area/maintenance/starboard/aft)
+"jOJ" = (
+/obj/effect/turf_decal/bot_white,
+/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/structure/cable/white{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/command/gateway)
"jRe" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -42139,12 +42266,26 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/engineering/atmos)
+"kbe" = (
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = 24
+ },
+/turf/open/floor/plasteel,
+/area/command/gateway)
"kcN" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
dir = 4
},
/turf/open/floor/plating/asteroid/airless,
/area/asteroid/nearstation)
+"kdd" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable/white{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"kit" = (
/obj/machinery/portable_atmospherics/canister/toxins,
/obj/machinery/light/small{
@@ -42179,6 +42320,13 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/science/mixing)
+"krX" = (
+/obj/machinery/light/floor,
+/turf/open/floor/plasteel/yellowsiding/corner{
+ dir = 4;
+ icon_state = "yellowcornersiding"
+ },
+/area/maintenance/starboard/aft)
"kwF" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
@@ -42201,6 +42349,18 @@
},
/turf/open/floor/plasteel/dark,
/area/engineering/atmos)
+"kyS" = (
+/obj/structure/chair/stool/bar,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
+/turf/open/floor/wood,
+/area/maintenance/starboard/aft)
+"kAD" = (
+/obj/structure/table/wood,
+/obj/machinery/chem_dispenser/drinks/beer,
+/turf/open/floor/wood,
+/area/maintenance/starboard/aft)
"kCG" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 9
@@ -42235,6 +42395,10 @@
},
/turf/open/floor/plasteel/dark,
/area/engineering/atmos)
+"kIL" = (
+/obj/structure/grille/broken,
+/turf/open/floor/plating/airless,
+/area/asteroid/nearstation)
"kKd" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/external{
@@ -42252,6 +42416,10 @@
},
/turf/open/floor/plasteel,
/area/cargo/miningdock)
+"kKr" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood/airless,
+/area/asteroid/nearstation)
"kPi" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -42267,9 +42435,14 @@
},
/turf/open/floor/plasteel,
/area/science/mixing)
+"kQz" = (
+/turf/open/floor/plasteel,
+/area/command/gateway)
"kRV" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 5
+/obj/effect/turf_decal/sand/plating,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable/white{
+ icon_state = "2-8"
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
@@ -42280,6 +42453,13 @@
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"kUu" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/wood,
+/area/maintenance/starboard/aft)
+"lcW" = (
+/turf/open/floor/wood,
+/area/maintenance/starboard/aft)
"lmq" = (
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/turf/open/floor/plating,
@@ -42290,6 +42470,22 @@
},
/turf/closed/wall/r_wall,
/area/science/mixing)
+"loB" = (
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/obj/machinery/light_switch{
+ pixel_x = 32;
+ pixel_y = 24
+ },
+/obj/effect/landmark/start/lawyer,
+/turf/open/floor/wood,
+/area/service/lawoffice)
+"loX" = (
+/obj/structure/table/wood,
+/obj/item/storage/fancy/cigarettes/cigars/havana,
+/turf/open/floor/wood,
+/area/maintenance/starboard/aft)
"lqz" = (
/obj/machinery/atmospherics/pipe/manifold/yellow/visible,
/obj/effect/decal/cleanable/dirt,
@@ -42301,6 +42497,10 @@
dir = 1
},
/area/engineering/atmos)
+"lqJ" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/service/lawoffice)
"lrg" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
@@ -42480,6 +42680,23 @@
},
/turf/open/floor/plasteel,
/area/science/mixing)
+"mia" = (
+/obj/effect/turf_decal/bot_white,
+/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/light{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/command/gateway)
"mkF" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
@@ -42506,6 +42723,9 @@
},
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
+"msl" = (
+/turf/closed/wall/rust,
+/area/command/gateway)
"msG" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -42524,6 +42744,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/science/mixing)
+"myQ" = (
+/turf/closed/wall/mineral/titanium,
+/area/maintenance/starboard/aft)
"mDx" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -42592,6 +42815,15 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
+"mZm" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit)
"nbT" = (
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 1;
@@ -42602,6 +42834,16 @@
},
/turf/open/floor/plasteel,
/area/science/mixing)
+"ncG" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/item/wrench,
+/obj/item/wirecutters,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/starboard)
"ndg" = (
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
@@ -42625,6 +42867,20 @@
},
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
+"nio" = (
+/obj/structure/pool/ladder{
+ dir = 1;
+ icon_state = "ladder";
+ pixel_y = -24
+ },
+/turf/open/pool,
+/area/maintenance/starboard/aft)
+"nqr" = (
+/obj/item/kirbyplants{
+ icon_state = "plant-22"
+ },
+/turf/open/space/basic,
+/area/space)
"nty" = (
/obj/machinery/button/massdriver{
id = "toxinsdriver";
@@ -42636,10 +42892,21 @@
},
/turf/open/floor/plasteel,
/area/science/mixing)
+"nvk" = (
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/maintenance/starboard/aft)
"nwY" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/hallway/primary/starboard/fore)
+"nBu" = (
+/obj/structure/chair/stool/bar,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/maintenance/starboard/aft)
"nFG" = (
/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
dir = 8
@@ -42647,6 +42914,10 @@
/obj/machinery/meter,
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"nIf" = (
+/obj/effect/turf_decal/sand/plating,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"nKi" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "Maintenance Hatch";
@@ -42719,6 +42990,12 @@
/obj/machinery/atmospherics/pipe/simple/yellow/visible,
/turf/closed/wall/r_wall,
/area/engineering/atmos)
+"ogx" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood{
+ icon_state = "wood-broken"
+ },
+/area/asteroid/nearstation)
"ogL" = (
/obj/structure/sign/warning/vacuum/external{
pixel_y = -32
@@ -42742,6 +43019,9 @@
dir = 1
},
/area/engineering/atmos)
+"omB" = (
+/turf/closed/wall,
+/area/asteroid/nearstation)
"ooX" = (
/obj/machinery/smartfridge/organ/preloaded{
pixel_y = 2
@@ -42849,6 +43129,13 @@
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"oIA" = (
+/obj/machinery/light/floor,
+/turf/open/floor/plasteel/yellowsiding/corner{
+ dir = 1;
+ icon_state = "yellowcornersiding"
+ },
+/area/maintenance/starboard/aft)
"oIG" = (
/obj/structure/sign/warning/fire,
/turf/closed/wall/r_wall,
@@ -42899,12 +43186,36 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
+"oXj" = (
+/obj/structure/toilet{
+ dir = 8
+ },
+/obj/machinery/door/window/westright,
+/obj/effect/decal/cleanable/egg_smudge,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel/freezer,
+/area/commons/toilet/restrooms)
"oXz" = (
/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 5
},
/turf/open/floor/plasteel,
/area/science/mixing)
+"par" = (
+/obj/structure/cable/white{
+ icon_state = "1-8"
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/structure/cable/white{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/command/gateway)
"pbT" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
@@ -42925,6 +43236,20 @@
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output,
/turf/open/floor/engine/vacuum,
/area/engineering/atmos)
+"pcD" = (
+/obj/effect/turf_decal/bot_white,
+/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
+ },
+/turf/open/floor/plasteel/dark,
+/area/command/gateway)
"pdX" = (
/obj/machinery/portable_atmospherics/canister,
/obj/item/radio/intercom{
@@ -42937,6 +43262,15 @@
},
/turf/open/floor/plasteel/dark,
/area/science/mixing)
+"pix" = (
+/turf/open/floor/wood{
+ icon_state = "wood-broken7"
+ },
+/area/maintenance/starboard/aft)
+"pjh" = (
+/obj/machinery/vending/boozeomat/pubby_maint,
+/turf/open/floor/wood,
+/area/maintenance/starboard/aft)
"pjU" = (
/obj/structure/grille,
/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
@@ -42968,6 +43302,13 @@
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
+"pmx" = (
+/obj/effect/turf_decal/sand/plating,
+/obj/structure/cable/white{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"pmK" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 8
@@ -43016,6 +43357,10 @@
},
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
+"puc" = (
+/obj/structure/bed,
+/turf/open/floor/wood,
+/area/maintenance/starboard/aft)
"pvX" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/orange/visible,
@@ -43048,7 +43393,6 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"pEt" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/power/apc{
areastring = "/area/hallway/primary/starboard/fore";
dir = 8;
@@ -43062,6 +43406,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 8
+ },
/turf/open/floor/plasteel{
heat_capacity = 1e+006
},
@@ -43107,6 +43454,25 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/mixing)
+"pML" = (
+/obj/machinery/shower{
+ dir = 1
+ },
+/obj/structure/curtain,
+/obj/structure/window/spawner/north,
+/obj/structure/sign/poster/official/no_erp{
+ pixel_x = 32
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel/freezer,
+/area/commons/toilet/restrooms)
+"pMQ" = (
+/obj/structure/cable/white{
+ icon_state = "1-4"
+ },
+/obj/item/reagent_containers/glass/bottle/nutrient/rh,
+/turf/open/floor/plating/asteroid/airless,
+/area/maintenance/port/aft)
"pNE" = (
/obj/structure/grille,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
@@ -43119,6 +43485,12 @@
/obj/structure/grille,
/turf/open/space/basic,
/area/space/nearstation)
+"qab" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood/airless{
+ icon_state = "wood-broken5"
+ },
+/area/asteroid/nearstation)
"qcg" = (
/obj/structure/window/reinforced{
dir = 4
@@ -43167,6 +43539,28 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
+"qeO" = (
+/obj/machinery/door/airlock/command{
+ name = "Gateway";
+ req_access_txt = "62"
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel,
+/area/command/gateway)
+"qgg" = (
+/obj/machinery/seed_extractor,
+/obj/structure/cable/white{
+ icon_state = "0-8"
+ },
+/obj/structure/cable/white{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating/asteroid/airless,
+/area/maintenance/port/aft)
"qgC" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{
dir = 4
@@ -43181,6 +43575,11 @@
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel,
/area/science/mixing)
+"qjS" = (
+/obj/structure/table/reinforced,
+/obj/machinery/light,
+/turf/open/floor/wood,
+/area/maintenance/starboard/aft)
"qnA" = (
/turf/open/floor/plating,
/area/science/mixing)
@@ -43225,6 +43624,13 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"qFj" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"qFw" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
@@ -43273,6 +43679,13 @@
/obj/machinery/meter,
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"qRz" = (
+/obj/machinery/newscaster{
+ pixel_x = 32
+ },
+/obj/machinery/photocopier,
+/turf/open/floor/wood,
+/area/service/lawoffice)
"qTa" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
@@ -43282,6 +43695,13 @@
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"qUQ" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/food/drinks/shaker,
+/turf/open/floor/wood{
+ icon_state = "wood-broken6"
+ },
+/area/maintenance/starboard/aft)
"qUW" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
@@ -43295,6 +43715,27 @@
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"ria" = (
+/obj/effect/turf_decal/bot_white/right,
+/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
+ },
+/turf/open/floor/plasteel/dark,
+/area/command/gateway)
+"rih" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/white/corner,
+/area/hallway/primary/starboard/fore)
"rjQ" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/turf/open/floor/plasteel,
@@ -43311,6 +43752,15 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
+"rmZ" = (
+/obj/structure/chair/stool/bar,
+/turf/open/floor/wood{
+ icon_state = "wood-broken5"
+ },
+/area/maintenance/starboard/aft)
+"rwH" = (
+/turf/closed/wall/mineral/titanium,
+/area/asteroid/nearstation)
"rzn" = (
/obj/machinery/status_display,
/turf/closed/wall,
@@ -43370,6 +43820,13 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input,
/turf/open/floor/engine/vacuum,
/area/engineering/atmos)
+"rVP" = (
+/obj/machinery/airalarm{
+ pixel_y = 23
+ },
+/obj/item/extinguisher,
+/turf/open/floor/plasteel,
+/area/command/gateway)
"sak" = (
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/tile/blue{
@@ -43390,19 +43847,42 @@
/mob/living/simple_animal/opossum,
/turf/open/floor/plating,
/area/maintenance/starboard)
+"sdk" = (
+/obj/structure/table/wood,
+/obj/item/lighter,
+/turf/open/floor/wood,
+/area/maintenance/starboard/aft)
"sdL" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/hydroponics/soil,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/weather,
+/obj/effect/turf_decal/weather,
/turf/open/floor/plasteel/dark,
/area/maintenance/starboard/aft)
"sdX" = (
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
+"sjr" = (
+/obj/item/reagent_containers/food/snacks/grown/wheat,
+/turf/open/space/basic,
+/area/space)
+"slf" = (
+/obj/machinery/door/poddoor/shutters{
+ id = "stationawaygate";
+ name = "Gateway Access Shutters"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel,
+/area/command/gateway)
"soC" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -43537,8 +44017,16 @@
/turf/closed/wall/rust,
/area/cargo/miningdock)
"syS" = (
-/turf/closed/wall/rust,
-/area/commons/toilet/restrooms)
+/obj/structure/table/wood,
+/obj/item/paper_bin,
+/obj/item/pen/fountain,
+/obj/machinery/requests_console{
+ department = "Law office";
+ name = "Lawyer RC";
+ pixel_y = -30
+ },
+/turf/open/floor/carpet/green/airless,
+/area/service/lawoffice)
"syT" = (
/turf/closed/wall/r_wall/rust,
/area/ai_monitored/command/storage/eva)
@@ -43555,6 +44043,8 @@
/turf/closed/wall/rust,
/area/service/bar/atrium)
"sAY" = (
+/obj/structure/easel,
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plating{
icon_state = "panelscorched"
},
@@ -43594,10 +44084,6 @@
},
/turf/open/floor/plasteel,
/area/maintenance/starboard)
-"sBW" = (
-/obj/structure/sign/warning/vacuum,
-/turf/closed/wall/rust,
-/area/maintenance/starboard)
"sCr" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -43607,30 +44093,6 @@
icon_state = "platingdmg2"
},
/area/maintenance/port/central)
-"sCt" = (
-/obj/structure/easel,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/maintenance/starboard)
-"sCQ" = (
-/obj/structure/closet/crate{
- icon_state = "crateopen"
- },
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 2;
- name = "2maintenance loot spawner"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/sign/poster/contraband/random{
- pixel_x = 32
- },
-/obj/item/storage/box,
-/turf/open/floor/plasteel,
-/area/maintenance/starboard)
"sDl" = (
/turf/closed/wall/rust,
/area/commons/dorms)
@@ -43668,19 +44130,20 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard)
-"sEm" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+"sEn" = (
/obj/structure/cable/white{
icon_state = "1-8"
},
-/turf/open/floor/plating,
-/area/maintenance/starboard)
-"sEn" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/structure/cable/white{
+ icon_state = "4-8"
},
/turf/open/floor/plating,
/area/maintenance/starboard)
+"sEq" = (
+/obj/item/reagent_containers/glass/bottle/nutrient/ez,
+/turf/open/floor/plating/asteroid/airless,
+/area/asteroid/nearstation)
"sEG" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -43746,9 +44209,13 @@
/turf/open/floor/plasteel/dark,
/area/maintenance/starboard)
"sEQ" = (
-/obj/structure/sign/warning/securearea,
-/turf/closed/wall,
-/area/maintenance/starboard)
+/obj/structure/rack,
+/obj/item/radio,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/command/gateway)
"sFn" = (
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/stripes/line{
@@ -43903,43 +44370,23 @@
/turf/open/floor/plasteel/dark,
/area/maintenance/starboard)
"sFX" = (
-/obj/structure/table,
/obj/machinery/light/small{
dir = 8
},
-/obj/item/clothing/suit/hazardvest{
- desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
- name = "emergency lifejacket"
- },
-/obj/item/clothing/suit/hazardvest{
- desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
- name = "emergency lifejacket"
- },
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/tile/neutral{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"sFY" = (
-/obj/structure/table,
-/obj/effect/turf_decal/stripes/line,
-/obj/item/crowbar,
-/obj/item/crowbar,
-/obj/item/tank/internals/emergency_oxygen,
-/obj/item/tank/internals/emergency_oxygen,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
+/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"sGy" = (
/obj/machinery/door/firedoor,
@@ -43985,6 +44432,7 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white/corner{
dir = 1
},
@@ -44046,10 +44494,12 @@
/turf/open/floor/plating,
/area/maintenance/starboard)
"sHf" = (
-/obj/machinery/firealarm{
- dir = 4;
- pixel_x = -24
- },
+/obj/structure/table,
+/obj/item/crowbar,
+/obj/item/crowbar,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"sHz" = (
@@ -44188,15 +44638,13 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"sIy" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/effect/turf_decal/tile/red{
dir = 8
},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"sIB" = (
@@ -44242,6 +44690,17 @@
/turf/open/floor/plasteel/dark,
/area/hallway/secondary/exit)
"sIR" = (
+/obj/structure/table,
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
/obj/structure/cable/white{
icon_state = "1-2"
},
@@ -44573,19 +45032,6 @@
"sLf" = (
/turf/closed/wall/rust,
/area/service/chapel/main)
-"sLg" = (
-/obj/item/kirbyplants{
- icon_state = "plant-22"
- },
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/maintenance/starboard/aft)
"sLm" = (
/turf/closed/wall/rust,
/area/hallway/secondary/entry)
@@ -46010,18 +46456,18 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/door/airlock/maintenance_hatch{
- name = "Maintenance Hatch";
- req_access_txt = "12"
- },
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/maintenance/starboard)
+/obj/machinery/door/airlock{
+ name = "Primary Restroom"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/freezer,
+/area/commons/toilet/restrooms)
"sOL" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -46141,9 +46587,6 @@
icon_state = "panelscorched"
},
/area/maintenance/starboard/aft)
-"sPY" = (
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
"sSy" = (
/obj/structure/window/reinforced{
dir = 4
@@ -46151,9 +46594,24 @@
/obj/structure/flora/ausbushes/ppflowers,
/turf/open/floor/grass,
/area/hallway/secondary/entry)
+"sTH" = (
+/obj/machinery/hydroponics/soil,
+/obj/item/seeds/tower,
+/turf/open/floor/plating/asteroid,
+/area/maintenance/port/aft)
"sVt" = (
/turf/closed/wall/r_wall,
/area/science/mixing)
+"sYi" = (
+/obj/structure/table/reinforced,
+/turf/open/floor/wood{
+ icon_state = "wood-broken5"
+ },
+/area/maintenance/starboard/aft)
+"sZH" = (
+/obj/item/reagent_containers/glass/bucket,
+/turf/open/floor/plating/asteroid,
+/area/maintenance/port/aft)
"tac" = (
/obj/structure/grille,
/obj/machinery/meter,
@@ -46170,6 +46628,12 @@
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"tfP" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood/airless{
+ icon_state = "wood-broken"
+ },
+/area/asteroid/nearstation)
"tgm" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
@@ -46189,6 +46653,24 @@
"tin" = (
/turf/open/floor/engine/vacuum,
/area/science/mixing)
+"tjk" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/carpet/green/airless,
+/area/asteroid/nearstation)
+"tkH" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Courtroom"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel,
+/area/service/lawoffice)
"ttp" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable/white{
@@ -46217,6 +46699,16 @@
dir = 1
},
/area/engineering/atmos)
+"twy" = (
+/obj/structure/table/reinforced,
+/obj/machinery/chem_dispenser/drinks{
+ dir = 1;
+ icon_state = "soda_dispenser"
+ },
+/turf/open/floor/wood{
+ icon_state = "wood-broken6"
+ },
+/area/maintenance/starboard/aft)
"tFk" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -46397,6 +46889,12 @@
heat_capacity = 1e+006
},
/area/hallway/primary/starboard)
+"uqZ" = (
+/obj/structure/table/wood,
+/turf/open/floor/wood{
+ icon_state = "wood-broken2"
+ },
+/area/maintenance/starboard/aft)
"uuj" = (
/obj/machinery/plantgenes{
pixel_y = 6
@@ -46491,12 +46989,21 @@
},
/turf/open/floor/plasteel/dark,
/area/engineering/gravity_generator)
+"uCY" = (
+/turf/open/pool,
+/area/maintenance/starboard/aft)
"uDp" = (
/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 5
},
/turf/open/floor/plating/asteroid/airless,
/area/asteroid/nearstation)
+"uDz" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/maintenance/starboard/aft)
"uEu" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 6
@@ -46511,6 +47018,35 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"uIq" = (
+/obj/effect/turf_decal/bot_white/left,
+/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
+ },
+/turf/open/floor/plasteel/dark,
+/area/command/gateway)
+"uMi" = (
+/obj/machinery/door/airlock/security{
+ name = "Law Office";
+ req_access_txt = "38"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/service/lawoffice)
"uSs" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/machinery/atmospherics/pipe/simple/green/visible{
@@ -46632,6 +47168,17 @@
},
/turf/open/floor/plasteel/dark,
/area/engineering/atmos)
+"vmV" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable/white,
+/turf/open/floor/wood{
+ icon_state = "wood-broken4"
+ },
+/area/maintenance/starboard/aft)
+"vna" = (
+/obj/item/wrench,
+/turf/open/space/basic,
+/area/space)
"voi" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -46727,6 +47274,18 @@
},
/turf/open/floor/engine/vacuum,
/area/science/mixing)
+"vDy" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"vGQ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -46782,6 +47341,10 @@
},
/turf/open/floor/plasteel,
/area/science/mixing)
+"vTk" = (
+/obj/item/hatchet,
+/turf/open/space/basic,
+/area/space)
"vVA" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
@@ -46835,13 +47398,15 @@
/area/science/mixing)
"wbV" = (
/obj/effect/turf_decal/delivery,
-/obj/machinery/hydroponics/soil,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
+/obj/effect/turf_decal/weather,
+/obj/effect/turf_decal/weather,
+/obj/structure/closet/athletic_mixed,
/turf/open/floor/plasteel/dark,
/area/maintenance/starboard/aft)
"wdt" = (
@@ -46860,6 +47425,12 @@
},
/turf/open/floor/plasteel/dark,
/area/hallway/primary/aft)
+"wkn" = (
+/obj/machinery/hydroponics/soil,
+/obj/item/shovel/spade,
+/obj/item/cultivator,
+/turf/open/floor/plating/asteroid,
+/area/maintenance/port/aft)
"wkG" = (
/obj/structure/lattice/catwalk,
/turf/open/floor/plating/airless,
@@ -46883,17 +47454,36 @@
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"wtA" = (
+/obj/structure/fluff/broken_flooring{
+ dir = 8;
+ icon_state = "plating"
+ },
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
"wvy" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible,
/obj/machinery/meter,
/turf/open/floor/plasteel,
/area/science/mixing)
+"wvA" = (
+/obj/machinery/biogenerator,
+/obj/structure/cable/white{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating/asteroid,
+/area/maintenance/port/aft)
"wwT" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5
},
/turf/open/floor/plasteel,
/area/science/mixing)
+"wDb" = (
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space)
"wOe" = (
/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/airlock/research{
@@ -46977,10 +47567,13 @@
/turf/open/floor/plasteel/dark,
/area/engineering/atmos)
"xdr" = (
-/obj/structure/barricade/wooden,
+/obj/effect/turf_decal/sand/plating,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
},
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"xej" = (
@@ -47004,6 +47597,16 @@
},
/turf/open/floor/plasteel,
/area/science/mixing)
+"xpX" = (
+/obj/structure/toilet{
+ dir = 8
+ },
+/obj/structure/window/spawner/north,
+/obj/machinery/door/window/westright,
+/obj/effect/turf_decal/bot,
+/obj/effect/landmark/blobstart,
+/turf/open/floor/plasteel/freezer,
+/area/commons/toilet/restrooms)
"xrf" = (
/obj/machinery/light{
dir = 8
@@ -47143,12 +47746,46 @@
/obj/structure/grille,
/turf/closed/wall/r_wall,
/area/engineering/atmos)
+"xMv" = (
+/obj/structure/lattice,
+/obj/structure/fluff/broken_flooring{
+ dir = 8;
+ icon_state = "plating"
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
+"xMZ" = (
+/turf/closed/wall,
+/area/command/gateway)
"xPz" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 9
},
/turf/open/floor/plating/asteroid/airless,
/area/asteroid/nearstation)
+"xTs" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/commons/toilet/restrooms";
+ dir = 8;
+ name = "Restrooms APC";
+ pixel_x = -25;
+ pixel_y = 3
+ },
+/obj/structure/cable/white{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard)
+"xWb" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/command/gateway)
"xZO" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/public/glass{
@@ -47234,6 +47871,19 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/port/aft)
+"ygB" = (
+/obj/machinery/door/airlock/maintenance_hatch{
+ name = "Maintenance Hatch";
+ req_access_txt = "12"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard)
"ygE" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -47260,6 +47910,16 @@
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
+"yin" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating/asteroid,
+/area/maintenance/port/aft)
+"ykL" = (
+/obj/structure/chair/stool/bar,
+/turf/open/floor/wood,
+/area/maintenance/starboard/aft)
"ylr" = (
/obj/machinery/door/airlock/external{
name = "External Airlock";
@@ -78265,9 +78925,9 @@ aqo
aqo
bbd
aKm
-aad
-aad
-aad
+wvA
+bVs
+wkn
aad
aad
aad
@@ -78521,12 +79181,12 @@ ylr
aSG
jXc
aME
-aKm
-aad
-aad
-aad
-aad
-aad
+aLv
+yin
+dvB
+sZH
+sTH
+bVs
aad
aad
aad
@@ -78779,9 +79439,9 @@ aqo
aqo
bbd
aKm
-aac
-aac
-aad
+qgg
+pMQ
+fNN
aKm
aKm
aKm
@@ -79037,8 +79697,8 @@ ghr
jBh
aKm
aKm
-aKm
-aKm
+gIT
+aLv
aKm
aOs
aSf
@@ -79291,10 +79951,10 @@ aUQ
bvg
aKm
jlZ
-atE
+vDy
aOI
-aPQ
-aPQ
+qFj
+kdd
aPQ
aPQ
aPQ
@@ -83399,7 +84059,7 @@ aBn
aDf
aVV
aVQ
-aXk
+aXg
ajG
aOZ
bey
@@ -84132,10 +84792,10 @@ aqy
ajf
ake
ald
-oyD
-syS
-oyD
-oyD
+iGT
+tkH
+iGT
+lqJ
apI
apI
arP
@@ -84388,7 +85048,7 @@ aid
aqw
ajg
akf
-oyD
+iGT
alT
amO
anJ
@@ -84648,8 +85308,8 @@ akg
ale
alU
amP
-oyD
-oyD
+aoC
+aoC
sAc
aqU
arR
@@ -84905,7 +85565,7 @@ akh
alf
alV
amQ
-anJ
+fmq
aoD
apI
aqV
@@ -85159,10 +85819,10 @@ ahG
aix
ajj
aki
-oyD
-alW
+uMi
+loB
amR
-oyD
+iYt
syS
apI
aqW
@@ -85416,10 +86076,10 @@ swC
abw
ajk
akj
-oyD
+iGT
alX
amS
-anJ
+qRz
aoE
apI
aqX
@@ -92882,7 +93542,7 @@ aup
avu
atp
gMe
-arj
+rih
arj
sEJ
aBa
@@ -93135,11 +93795,11 @@ nwY
sOF
sOG
atq
-aRz
-aRz
+oyD
+oyD
sOK
-aRz
-aRz
+boD
+oyD
bli
azU
aBb
@@ -93392,11 +94052,11 @@ aqj
aRz
asr
bfp
-aRz
+oyD
avv
acx
axf
-aRz
+oyD
aRz
sEK
sJN
@@ -93649,11 +94309,11 @@ aqk
aRz
ass
aTR
-sJN
-avw
+oyD
+alW
awz
axg
-aRz
+oyD
sEl
sEL
aXb
@@ -93906,11 +94566,11 @@ aql
aRz
ast
bfo
-aRz
-aRz
-aRz
-sJN
-aRz
+oyD
+oXj
+xpX
+pML
+oyD
bfp
aSD
aRz
@@ -93952,20 +94612,20 @@ sdL
bhj
wbV
sOM
-aad
-aad
-aad
+bsq
+iSq
+bsq
bfP
bfP
bjc
bfP
bfP
-aad
-aad
-aad
-aad
-aad
-aad
+myQ
+rwH
+fgZ
+aac
+aac
+aac
aaa
aaa
aaa
@@ -94162,13 +94822,13 @@ ape
aqm
sJN
sAY
-acw
-aXJ
-aSC
-aXJ
-bai
-aXb
-sEm
+caJ
+oyD
+oyD
+oyD
+oyD
+oyD
+sGY
aRz
sFn
sFR
@@ -94206,22 +94866,22 @@ beQ
emA
xdr
bgu
-sPY
-bhT
-sOM
-aad
+pmx
+myQ
+aRy
+aRy
+aRy
+aRy
+aRy
+hYy
+nIf
+nIf
+lcW
+myQ
+ogx
bvg
+aKo
aac
-aad
-aac
-aac
-aac
-aad
-aad
-aac
-aac
-aac
-aad
aaa
aaa
aaa
@@ -94419,12 +95079,12 @@ apf
aqn
aRz
abO
-bfp
-aSD
-sCt
-sCQ
-sDq
-aSD
+acw
+aXJ
+aXJ
+xTs
+aXJ
+aXJ
sEn
sEN
sFo
@@ -94464,20 +95124,20 @@ bfr
hso
bgv
kRV
-bhU
-aRy
-bvg
-aac
-aaa
-aaa
-aaa
-aaa
-aac
-aad
-aad
-aad
-aad
-aac
+vmV
+kUu
+iSy
+kUu
+kUu
+kUu
+jMP
+lcW
+fWh
+lcW
+hsR
+kKr
+tfP
+kKr
aac
aaa
aaa
@@ -94678,11 +95338,11 @@ aRz
abN
acy
aRz
-sJN
-aRz
-aRz
-aRz
+ncG
+eOg
+sDq
aRz
+bfp
aRz
sFp
sFT
@@ -94719,23 +95379,23 @@ aRy
aRy
aRy
mgV
-bgw
+myQ
hiR
-bhV
-aRy
-bvg
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aac
-aad
-aad
-aac
-aac
-aaa
+dSq
+dSq
+dSq
+dSq
+krX
+ekG
+nBu
+nvk
+lcW
+twy
+myQ
+tjk
+tjk
+tjk
+sdX
aaa
aaa
aaa
@@ -94934,13 +95594,13 @@ aqp
aRz
bvh
sBx
+xMZ
+xMZ
+xMZ
+bRf
+xMZ
+ygB
aRz
-aad
-aad
-aah
-aad
-aad
-aSD
sFq
sFU
aRz
@@ -94976,23 +95636,23 @@ bes
bes
bes
mgV
-bgx
+aRy
bhm
-bhW
-sON
-aac
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+uCY
+uCY
+uCY
+uCY
+jeI
+lcW
+foP
+uqZ
+lcW
+qUQ
+myQ
+tjk
+tjk
+tjk
+sdX
aaa
aaa
aaa
@@ -95191,14 +95851,14 @@ amD
amC
amC
sBy
-sBW
-aad
-aac
-bvg
-aad
-aad
-sJN
-aRz
+xMZ
+ria
+pcD
+uIq
+iVs
+iUJ
+xMZ
+xMZ
aRz
aSD
sHd
@@ -95233,22 +95893,22 @@ bet
bet
bet
lMu
-bgy
-sPY
-bhX
aRy
-bvg
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bhm
+bhX
+jrd
+uCY
+nio
+jeI
+juY
+kyS
+kAD
+pix
+qjS
+myQ
+gWt
+tjk
+tjk
aaa
aaa
aaa
@@ -95448,15 +96108,15 @@ aqq
ark
amC
sOJ
-bvg
-aac
-aac
-aae
-aac
-aad
-aRz
+xMZ
+mia
+hkI
+jOJ
+gRe
+par
+hGN
+xMZ
aXK
-bhk
sGA
sHe
aRz
@@ -95490,22 +96150,22 @@ vCu
tin
tin
vxf
-bgz
-sPY
-sLg
aRy
-bvg
-aac
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+bhm
+uCY
+uCY
+uCY
+uCY
+jeI
+lcW
+rmZ
+sdk
+lcW
+sYi
+myQ
+tjk
+tjk
+wtA
aaa
aaa
aaa
@@ -95705,15 +96365,15 @@ aqr
arl
amC
bvg
-aac
-aac
-aaa
-aae
-aac
-aac
+xMZ
+uIq
+pcD
+ria
+kQz
+xWb
sEQ
+bRf
aRz
-sJN
atq
aRz
aRz
@@ -95747,27 +96407,27 @@ fDZ
hNT
bkf
lMu
-bgA
+myQ
bhn
-bhY
-sON
-aad
-aac
-aac
+gSu
+gSu
+gSu
+gSu
+oIA
+lcW
+ykL
+loX
+lcW
+pjh
+myQ
+tjk
+hZH
+aaa
aaa
aaa
aaa
aaa
aaa
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
jFP
jFP
jFP
@@ -95962,19 +96622,19 @@ aqs
arm
syD
aac
-aaa
-aaa
-aaa
-aae
-aaa
-aac
-bvg
-sFs
+xMZ
+xMZ
+xMZ
+xMZ
+xMZ
+cUd
+dMx
+slf
sFX
sGC
sHf
-sHB
-blM
+mZm
+dQg
sIy
blZ
sHB
@@ -96005,26 +96665,26 @@ jsD
low
lMu
sON
-sOM
-sOM
-sOM
-aad
-aad
-aad
-aad
+myQ
+cGA
+puc
+puc
+puc
+lcW
+lcW
+lcW
+lcW
+isT
+lcW
+hsR
+jkc
+fRe
+aaa
+aaa
aaa
aaa
aaa
aaa
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
jFP
jFP
jFP
@@ -96223,10 +96883,10 @@ aaa
aaa
aaa
aae
-aae
-bvg
-bvg
-sFs
+xMZ
+rVP
+kbe
+qeO
sFY
sGD
bsS
@@ -96262,26 +96922,26 @@ iUO
svX
eWo
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aac
-aac
-aac
+omB
+myQ
+aRy
+aRy
+aRy
+aRy
+aRy
+lcW
+lcW
+uDz
+lcW
+myQ
+kKr
+qab
+sdX
+aaa
+aaa
+aaa
aaa
aaa
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
jFP
jFP
jFP
@@ -96480,10 +97140,10 @@ aaf
aaf
aae
aae
-axW
-sDP
-azb
-axW
+xMZ
+msl
+xMZ
+xMZ
axW
axW
azb
@@ -96521,24 +97181,24 @@ jRe
aad
aad
aad
+sEq
+aac
aad
aad
-aad
-aad
-aad
-aad
-aad
+aRy
+myQ
+aRy
+myQ
+aRy
+myQ
+rwH
+rwH
+kIL
+xMv
+aaa
+aaa
aaa
aaa
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
jFP
jFP
jFP
@@ -96782,20 +97442,20 @@ aad
aad
aad
aad
-aad
+omB
aad
aaa
aaa
aaa
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
uXD
jFP
jFP
@@ -97044,15 +97704,15 @@ aac
aaa
aaa
aaa
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
+aaa
+aaa
+wDb
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
jFP
jFP
jFP
@@ -97300,16 +97960,16 @@ aad
aaa
aaa
aaa
+wDb
+aaa
+sjr
+aaa
+aaa
+aaa
+vna
+aaa
+aaa
aaa
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
jFP
jFP
jFP
@@ -97554,19 +98214,19 @@ aad
aad
aad
aaa
+vTk
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+fpH
+aaa
aaa
aaa
aaa
aaa
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
jFP
jFP
jFP
@@ -97812,18 +98472,18 @@ aaa
aaa
aaa
aaa
+wDb
+aaa
+aaa
+nqr
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
jFP
jFP
jFP
@@ -98072,15 +98732,15 @@ aaa
aaa
aaa
aaa
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
jFP
jFP
jFP
@@ -98329,15 +98989,15 @@ aaa
aaa
aaa
aaa
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
jFP
jFP
jFP
@@ -98586,15 +99246,15 @@ aaa
aaa
aaa
aaa
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
-jFP
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
jFP
jFP
jFP
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 0972252bf6..536d5f4aa3 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -40675,6 +40675,7 @@
/obj/machinery/light/small{
dir = 1
},
+/obj/machinery/space_heater,
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
@@ -45447,15 +45448,15 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/engineering/main)
"bYS" = (
@@ -45468,15 +45469,15 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/engineering/main)
"bYT" = (
@@ -45492,15 +45493,15 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
/obj/structure/cable{
icon_state = "1-2"
},
@@ -45520,15 +45521,15 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/engineering/main)
"bYV" = (
@@ -45539,6 +45540,12 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -45551,15 +45558,15 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -45578,15 +45585,15 @@
/obj/machinery/firealarm{
pixel_y = 29
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/engineering/main)
"bYY" = (
@@ -47272,6 +47279,10 @@
dir = 4;
light_color = "#e8eaff"
},
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 22
+ },
/turf/open/floor/plasteel/dark,
/area/engineering/main)
"cfk" = (
@@ -53466,10 +53477,6 @@
},
/area/maintenance/department/engine)
"dEy" = (
-/obj/machinery/airalarm{
- dir = 1;
- pixel_y = -22
- },
/obj/structure/reflector/double/anchored{
dir = 9
},
@@ -55355,6 +55362,10 @@
/obj/machinery/power/rad_collector/anchored,
/turf/open/floor/engine,
/area/engineering/supermatter)
+"hKX" = (
+/obj/machinery/space_heater,
+/turf/open/floor/plating,
+/area/maintenance/department/security/brig)
"hMx" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/turf/open/floor/plating{
@@ -60884,6 +60895,10 @@
/obj/item/pen,
/turf/open/floor/plasteel/dark,
/area/science/explab)
+"tCJ" = (
+/obj/machinery/space_heater,
+/turf/open/floor/plating,
+/area/maintenance/department/crew_quarters/bar)
"tCP" = (
/obj/docking_port/stationary/public_mining_dock,
/turf/open/floor/plating,
@@ -80222,7 +80237,7 @@ aiu
xuv
aoe
ajD
-ajD
+hKX
aiu
apB
aiu
@@ -91030,7 +91045,7 @@ aKT
aLH
aNf
aKT
-aLL
+tCJ
aQO
aRO
aSH
@@ -99781,7 +99796,7 @@ aPY
bau
aLf
aFi
-aFi
+aMA
beI
beI
bgD
@@ -107236,7 +107251,7 @@ aaa
aEl
aTx
aFi
-aFi
+aMA
aEj
bhz
lEn
diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm
index c900a33d06..f9b4c36c9c 100644
--- a/code/__DEFINES/loadout.dm
+++ b/code/__DEFINES/loadout.dm
@@ -59,7 +59,7 @@
#define LOADOUT_CATEGORY_UNLOCKABLE "Unlockable"
//how many prosthetics can we have
-#define MAXIMUM_LOADOUT_PROSTHETICS 2
+#define MAXIMUM_LOADOUT_PROSTHETICS 4
//what limbs can be amputated or be prosthetic
#define LOADOUT_ALLOWED_LIMB_TARGETS list(BODY_ZONE_L_ARM,BODY_ZONE_R_ARM,BODY_ZONE_L_LEG,BODY_ZONE_R_LEG)
diff --git a/code/datums/components/crafting/glassware/lens_crafting.dm b/code/datums/components/crafting/glassware/lens_crafting.dm
index 8907522946..7b650989a8 100644
--- a/code/datums/components/crafting/glassware/lens_crafting.dm
+++ b/code/datums/components/crafting/glassware/lens_crafting.dm
@@ -1,15 +1,15 @@
//This file is for crafting using a lens!
/obj/item/glasswork/glass_base/lens
- name = "Optical lens"
- desc = "Good for selling or crafting, by itself its useless"
+ name = "optical lens"
+ desc = "A glass lens. Useless by itself, but may prove useful in making something with a focus."
icon = 'icons/obj/glass_ware.dmi'
icon_state = "glass_optics"
//Laser pointers - 2600
/obj/item/glasswork/glass_base/laserpointer_shell
- name = "Laser pointer assembly"
- desc = "Good for selling or crafting, by itself its useless. Needs a power capactor."
+ name = "laser pointer assembly"
+ desc = "An empty hull of a laser pointer. It's missing a capacitor."
icon_state = "laser_case"
icon = 'icons/obj/glass_ware.dmi'
next_step = /obj/item/glasswork/glass_base/laserpointer_shell_1
@@ -21,8 +21,8 @@
qdel(src)
/obj/item/glasswork/glass_base/laserpointer_shell_1
- name = "Laser pointer assembly"
- desc = "Good for selling or crafting, by itself its useless. Needs a glass lens."
+ name = "powered laser pointer assembly"
+ desc = "A laser pointer hull with a capacitor inside of it. It's missing a lens."
icon_state = "laser_wire"
icon_state = "laser_case"
next_step = /obj/item/glasswork/glass_base/laserpointer_shell_2
@@ -34,8 +34,8 @@
qdel(src)
/obj/item/glasswork/glass_base/laserpointer_shell_2
- name = "Laser pointer assembly"
- desc = "Good for selling or crafting, by itself its useless. Needs to be screwed together."
+ name = "near-complete laser pointer assembly"
+ desc = "A laser pointer hull with a capacitor and a lens inside of it. It needs to be screwed together."
icon_state = "laser_wire"
icon_state = "laser_case"
next_step = /obj/item/laser_pointer/blue/handmade
@@ -50,8 +50,8 @@
//NERD SHIT - 5000
/obj/item/glasswork/glass_base/glasses_frame
- name = "Glasses Frame"
- desc = "Good for crafting a pare of glasses, by itself its useless. Just add a pare of lens."
+ name = "glasses frame"
+ desc = "A pair of glasses without the lenses. You could probably add them yourself, though."
icon = 'icons/obj/glass_ware.dmi'
icon_state = "frames"
next_step = /obj/item/glasswork/glass_base/glasses_frame_1
@@ -64,8 +64,8 @@
qdel(src)
/obj/item/glasswork/glass_base/glasses_frame_1
- name = "Glasses Frame"
- desc = "Good for crafting a pare of glasses, by itself its useless. Just add a the other lens."
+ name = "glasses frame"
+ desc = "A pair of shoddily-assembled glasses with only one lens. You could probably add the second one yourself, though."
icon = 'icons/obj/glass_ware.dmi'
icon_state = "frames_1"
next_step = /obj/item/glasswork/glass_base/glasses_frame_2
@@ -78,8 +78,8 @@
qdel(src)
/obj/item/glasswork/glass_base/glasses_frame_2
- name = "Glasses Frame"
- desc = "Good for crafting a pare of glasses, by itself its useless. Just adjust the pices into the frame with a screwdriver."
+ name = "glasses frame"
+ desc = "A pair of hastily-assembled unfitted glasses with both lenses intact. Use a screwdriver to fit them."
icon = 'icons/obj/glass_ware.dmi'
icon_state = "frames_2"
next_step = /obj/item/glasswork/glasses
@@ -92,7 +92,7 @@
qdel(src)
/obj/item/glasswork/glasses
- name = "Handmade Glasses"
- desc = "Handmade glasses that have not been polished at all making them useless. Selling them could still be worth a few credits."
+ name = "handmade glasses"
+ desc = "A pair of poorly-assembled glasses clearly produced by someone with no qualifications in making glasses. They're smudged, ugly, and don't even fit you. They might be worth some money, though."
icon = 'icons/obj/glass_ware.dmi'
icon_state = "frames_2"
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index c67bbb8a4d..8aa265d39f 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -172,15 +172,13 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
/// bumper object, the thing that starts actual teleport
var/obj/effect/gateway_portal_bumper/portal
/// Visual object for handling the viscontents
- /// DISABLED DUE TO BYOND BUG CAUSING STACK OVERFLOWS OF ANY HUMAN INSTANTIATION NEAR AN ACTIVATED GATEWAY.
- /// Probably due to it referencing each other through the gateway (there's a deep loop, maybe BYOND isn't catching something when it usually would)
- // var/obj/effect/gateway_portal_effect/portal_visuals
+ var/obj/effect/gateway_portal_effect/portal_visuals
/obj/machinery/gateway/Initialize()
generate_destination()
update_icon()
- // portal_visuals = new
- // vis_contents += portal_visuals
+ portal_visuals = new
+ vis_contents += portal_visuals
return ..()
/obj/machinery/gateway/proc/generate_destination()
@@ -197,7 +195,7 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
if(use_power == ACTIVE_POWER_USE)
use_power = IDLE_POWER_USE
update_icon()
- // portal_visuals.reset_visuals()
+ portal_visuals.reset_visuals()
/obj/machinery/gateway/process()
if((stat & (NOPOWER)) && use_power)
@@ -205,12 +203,6 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
deactivate()
return
-/obj/machinery/gateway/update_icon_state()
- if(target)
- icon_state = "on_old"
- else
- icon_state = "portal_frame"
-
/obj/machinery/gateway/safe_throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = MOVE_FORCE_STRONG, gentle = FALSE)
return
@@ -223,7 +215,7 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
return
target = D
target.activate(destination)
- // portal_visuals.setup_visuals(target)
+ portal_visuals.setup_visuals(target)
generate_bumper()
use_power = ACTIVE_POWER_USE
update_icon()
@@ -365,6 +357,8 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
animate(get_filter("portal_ripple"), time = 1.3 SECONDS, loop = -1, easing = LINEAR_EASING, radius = 32)
- var/turf/center_turf = our_destination.get_target_turf()
+ /// DISABLED DUE TO BYOND BUG CAUSING STACK OVERFLOWS OF ANY HUMAN INSTANTIATION NEAR AN ACTIVATED GATEWAY.
+ /// Probably due to it referencing each other through the gateway (there's a deep loop, maybe BYOND isn't catching something when it usually would)
+ //var/turf/center_turf = our_destination.get_target_turf()
- vis_contents += block(locate(center_turf.x - 1, center_turf.y - 1, center_turf.z), locate(center_turf.x + 1, center_turf.y + 1, center_turf.z))
+ //vis_contents += block(locate(center_turf.x - 1, center_turf.y - 1, center_turf.z), locate(center_turf.x + 1, center_turf.y + 1, center_turf.z))
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 7377913c15..f650a935ea 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -497,6 +497,72 @@
/obj/item/reagent_containers/food/drinks/bottle/grenadine/empty
list_reagents = null
+/obj/item/reagent_containers/food/drinks/bottle/blank //Don't let players print these from a lathe, bottles should be obtained in mass from the bar only.
+ name = "glass bottle"
+ desc = "This blank bottle is unyieldingly anonymous, offering no clues to it's contents."
+ icon_state = "glassbottle"
+ volume = 90
+ spillable = TRUE
+ obj_flags = UNIQUE_RENAME
+
+/obj/item/reagent_containers/food/drinks/bottle/blank/update_icon()
+ ..()
+ add_overlay("[initial(icon_state)]shine")
+
+/obj/item/reagent_containers/food/drinks/bottle/blank/Initialize()
+ . = ..()
+ update_icon()
+
+/obj/item/reagent_containers/food/drinks/bottle/blank/get_part_rating()
+ return reagents.maximum_volume
+
+/obj/item/reagent_containers/food/drinks/bottle/blank/on_reagent_change(changetype)
+ update_icon()
+
+/obj/item/reagent_containers/food/drinks/bottle/blank/update_overlays()
+ . = ..()
+ if(!cached_icon)
+ cached_icon = icon_state
+
+ if(reagents.total_volume)
+ var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "[cached_icon]10", color = mix_color_from_reagents(reagents.reagent_list))
+
+ var/percent = round((reagents.total_volume / volume) * 100)
+ switch(percent)
+ if(0 to 9)
+ filling.icon_state = "[cached_icon]0"
+ if(10 to 19)
+ filling.icon_state = "[cached_icon]10"
+ if(20 to 29)
+ filling.icon_state = "[cached_icon]20"
+ if(30 to 39)
+ filling.icon_state = "[cached_icon]30"
+ if(40 to 49)
+ filling.icon_state = "[cached_icon]40"
+ if(50 to 59)
+ filling.icon_state = "[cached_icon]50"
+ if(60 to 69)
+ filling.icon_state = "[cached_icon]60"
+ if(70 to 79)
+ filling.icon_state = "[cached_icon]70"
+ if(80 to 89)
+ filling.icon_state = "[cached_icon]80"
+ if(90 to INFINITY)
+ filling.icon_state = "[cached_icon]90"
+ . += filling
+
+/obj/item/reagent_containers/food/drinks/bottle/blank/small
+ name = "small glass bottle"
+ desc = "This small bottle is unyieldingly anonymous, offering no clues to it's contents."
+ icon_state = "glassbottlesmall"
+ volume = 60
+
+/obj/item/reagent_containers/food/drinks/bottle/blank/pitcher
+ name = "glass pitcher"
+ desc = "This is a pitcher for large amounts of liquid of any kind."
+ icon_state = "unipitcher"
+ volume = 120
+
////////////////////////// MOLOTOV ///////////////////////
/obj/item/reagent_containers/food/drinks/bottle/molotov
name = "molotov cocktail"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm
index 3834eb9231..b5ba7f0732 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm
@@ -436,13 +436,27 @@
/datum/sprite_accessory/tails/human/shark
name = "Shark"
- icon_state = "shark"
+ icon_state = "carp"
color_src = MATRIXED
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
matrixed_sections = MATRIX_RED
/datum/sprite_accessory/tails_animated/human/shark
name = "Shark"
+ icon_state = "carp"
+ color_src = MATRIXED
+ icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+ matrixed_sections = MATRIX_RED
+
+/datum/sprite_accessory/tails/human/sharkalt
+ name = "Shark (alt)"
+ icon_state = "shark"
+ color_src = MATRIXED
+ icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+ matrixed_sections = MATRIX_RED
+
+/datum/sprite_accessory/tails_animated/human/sharkalt
+ name = "Shark (alt)"
icon_state = "shark"
color_src = MATRIXED
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
@@ -897,11 +911,21 @@
/datum/sprite_accessory/tails/mam_tails/shark
name = "Shark"
- icon_state = "shark"
+ icon_state = "carp"
matrixed_sections = MATRIX_RED
/datum/sprite_accessory/tails_animated/mam_tails_animated/shark
name = "Shark"
+ icon_state = "carp"
+ matrixed_sections = MATRIX_RED
+
+/datum/sprite_accessory/tails/mam_tails/sharkalt
+ name = "Shark (alt)"
+ icon_state = "shark"
+ matrixed_sections = MATRIX_RED
+
+/datum/sprite_accessory/tails_animated/mam_tails_animated/sharkalt
+ name = "Shark (alt)"
icon_state = "shark"
matrixed_sections = MATRIX_RED
diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index 7dfe19f635..630a3629cf 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -245,6 +245,36 @@
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+/datum/design/emptybottle
+ name = "Glass Bottle"
+ desc = "A small, empty bottle for storing liquids."
+ id = "emptyglassbottle"
+ build_type = PROTOLATHE
+ materials = list(/datum/material/glass = 400)
+ build_path = /obj/item/reagent_containers/food/drinks/bottle/blank/small
+ category = list("Equipment")
+ departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
+/datum/design/largeemptybottle
+ name = "Large Glass Bottle"
+ desc = "A large, empty bottle for storing liquids."
+ id = "largeemptyglassbottle"
+ build_type = PROTOLATHE
+ materials = list(/datum/material/glass = 2000)
+ build_path = /obj/item/reagent_containers/food/drinks/bottle/blank
+ category = list("Equipment")
+ departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
+/datum/design/emptypitcher
+ name = "Pitcher"
+ desc = "A large Pitcher to hold vast amounts of liquid."
+ id = "emptypitcher"
+ build_type = PROTOLATHE
+ materials = list(/datum/material/glass = 3600)
+ build_path = /obj/item/reagent_containers/food/drinks/bottle/blank/pitcher
+ category = list("Equipment")
+ departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
/datum/design/air_horn
name = "Air Horn"
desc = "Damn son, where'd you find this?"
diff --git a/code/modules/research/techweb/nodes/export_nodes.dm b/code/modules/research/techweb/nodes/export_nodes.dm
index cbdedef113..5259fc1bfa 100644
--- a/code/modules/research/techweb/nodes/export_nodes.dm
+++ b/code/modules/research/techweb/nodes/export_nodes.dm
@@ -14,8 +14,8 @@
/datum/techweb_node/bottle_exports
id = "bottle_exports"
- display_name = "Legal Bottling"
+ display_name = "Advanced Bottling"
prereq_ids = list("blueprinted_bottles")
- description = "New bottles for printing and selling."
- design_ids = list("minikeg", "blooddrop", "slim_gold", "white_bloodmoon", "greenroad")
+ description = "New bottles for printing, storage and selling."
+ design_ids = list("minikeg", "blooddrop", "slim_gold", "white_bloodmoon", "greenroad", "emptyglassbottle", "largeemptyglassbottle", "emptypitcher")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 250)
diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm
index 5ec0987111..87f2a0940b 100644
--- a/code/modules/vending/boozeomat.dm
+++ b/code/modules/vending/boozeomat.dm
@@ -5,6 +5,9 @@
icon_deny = "boozeomat-deny"
products = list(/obj/item/reagent_containers/food/drinks/drinkingglass = 30,
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 12,
+ /obj/item/reagent_containers/food/drinks/bottle/blank = 5,
+ /obj/item/reagent_containers/food/drinks/bottle/blank/small = 10,
+ /obj/item/reagent_containers/food/drinks/bottle/blank/pitcher = 2,
/obj/item/reagent_containers/food/drinks/bottle/gin = 5,
/obj/item/reagent_containers/food/drinks/bottle/whiskey = 5,
/obj/item/reagent_containers/food/drinks/bottle/tequila = 5,
diff --git a/html/changelog.html b/html/changelog.html
index 2df7e322a6..4352f18441 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,44 @@
-->
+
22 August 2021
+
zeroisthebiggay updated:
+
+ - trillby can't spell pair
+
+
+
20 August 2021
+
EmeraldSundisk updated:
+
+ - Adds a law office/courtroom to OmegaStation
+ - Adds a gateway to OmegaStation
+ - Adds a pool/maintenance bar to OmegaStation
+ - Removes the original maintenance garden in OmegaStation tweak: Relocates the bathrooms to the starboard hall tweak: Modifies port quarter maintenance to include some affected items
+
+
Putnam3145 updated:
+
+ - Beach now has showers
+
+
TripleShades updated:
+
+ - At least four or five space heaters spread across Pubby Station Maints
+ - Missing decal in Pubby Station engineering
+ - Moved an atmos alarm in the SM emitter chamber so it wont be destroyed
+
+
WanderingFox95 updated:
+
+ - Empty bottles and pitchers are available to the bartender now.
+ - They even come with 10 different fillstates!
+ - Better Shark Tails, dodododododo~
+ - The old ones are now listed as carp tails.
+
+
+
18 August 2021
+
timothyteakettle updated:
+
+ - lets you select 4 prosthetic limbs instead of only 2
+
+
16 August 2021
BlueWildrose updated:
@@ -444,78 +482,6 @@
- vore is 0.1% less shitcode
-
- 20 June 2021
- Arturlang updated:
-
- - Port's TG's nanite storage modification programs from the bepis
- - Fixes infective nanite progreams not syncing cloud ID.
- - Add's off icons for nanite machinery
- - Fixes antitox nanites runtiming on simplemobs
- - Updates the nanite dermal button icon set
- - Adds the ability to select the logic for nanite rules
- - Nanite programs with triggers won't ignore rules.
- - Coagluating nanite program research no longer has the wrong name tweak: Nanite program's have better descriptions now tweak: Nanite subdermal ID's now also include pulled ID's for simplemobs
- - Nanite voice sensors should properly work now.
- - Fixes nanite comm remote, now they should actually work
-
- EmeraldSundisk updated:
-
- - Adds ColorMates to Snow Taxi tweak: Slight adjustments near the arrival shuttle landing zone
- - Removes an undesired corporate entity
-
- Nanotrasen Structual Engineering Division updated:
-
- - Added lables to the atmos tanks on Metastation.
- - Adjusted Pubbystation's emitter room wall layout to prevent light-breakage on startup of emitters.
- - Removed frestanding sink and showers from Metastation science airlock, and Deltastation Xenobio. Added an emergency shower next to the kill room.
- - Removed a leftover pipe in Metastation security hallway.
-
- bunny232 updated:
-
- - Pressure tanks other then air tanks start with gas!
-
- keronshb updated:
-
- - Adds the Space Dragon midround event
- - Space Dragon sounds
- - Space Dragon + effects
- - Added Spacewalk trait
- - Gibs the original owner if they are turned into a Space Dragon with the traitor panel
- - logging for Space Dragon creation
-
- kiwedespars updated:
-
- - a downside to wheely heelies ((made it actually detrimental))
-
- zeroisthebiggay updated:
-
- - beltslot sprites for various items
- - resprite for telebaton
-
-
- 19 June 2021
- keronshb updated:
-
- - Ling Bone Gauntlets work again
-
-
- 17 June 2021
- Vynzill updated:
-
- - ability to change crafted armwrap sprite to alternate one.
- - extended armwrap icon and sprite
-
- timothyteakettle updated:
-
- - fixes an oversight causing embed jostling to do 2x as much damage as it should
-
-
- 16 June 2021
- silicons updated:
-