diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 1392648ae89..674bd74c750 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -944,7 +944,7 @@ light_color = COLOR_STEEL /obj/machinery/vending/dinnerware/plastic - name = "Utensil Vendor" + name = "utensil vendor" desc = "A kitchen and restaurant utensil vendor." products = list( /obj/item/material/kitchen/utensil/fork/plastic = 12, @@ -957,6 +957,16 @@ /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup = 6 ) +/obj/machinery/vending/dinnerware/bar + name = "utensil vendor" + desc = "A bar utensil vendor." + products = list( + /obj/item/reagent_containers/food/drinks/drinkingglass = 12, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/carafe = 3, + /obj/item/reagent_containers/food/drinks/pitcher = 3, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup = 6 + ) + /obj/machinery/vending/sovietsoda name = "BODA" desc = "An old sweet water vending machine, how did this end up here?" diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index 610ab2e4428..35c93eb37e3 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -1,54 +1,3 @@ -/* -/obj/structure/sign/double/barsign - icon = 'icons/obj/barsigns.dmi' - icon_state = "empty" - anchored = 1 - var/cult = 0 - req_access = list(access_bar) //Has to initalize at first, this is updated by instance's req_access - -/obj/structure/sign/double/barsign/proc/get_valid_states(initial=1) - . = icon_states(icon) - . -= "on" - . -= "narsiebistro" - . -= "empty" - if(initial) - . -= "Off" - -/obj/structure/sign/double/barsign/examine(mob/user) - ..() - switch(icon_state) - if("Off") - to_chat(user, "It appears to be switched off.") - if("narsiebistro") - to_chat(user, "It shows a picture of a large black and red being. Spooky!") - if("on", "empty") - to_chat(user, "The lights are on, but there's no picture.") - else - to_chat(user, "It says '[icon_state]'") - -/obj/structure/sign/double/barsign/Initialize() - . = ..() - icon_state = pick(get_valid_states()) - -/obj/structure/sign/double/barsign/attackby(obj/item/I, mob/user) - if(cult) - return ..() - - var/obj/item/card/id/card = I.GetID() - if(istype(card)) - if(check_access(card)) - var/sign_type = input(user, "What would you like to change the barsign to?") as null|anything in get_valid_states(0) - if(!sign_type) - return - icon_state = sign_type - to_chat(user, "You change the barsign.") - else - to_chat(user, "Access denied.") - return - - return ..() - */ - /obj/structure/sign/double/barsign icon = 'icons/obj/barsigns.dmi' icon_state = "Off" @@ -59,12 +8,6 @@ var/cult = 0 var/choice_types = /singleton/sign/double/bar -/obj/structure/sign/double/barsign/kitchensign - icon = 'icons/obj/kitchensigns.dmi' - icon_state = "Off" - req_access = list(access_kitchen) - choice_types = /singleton/sign/double/kitchen - /obj/structure/sign/double/barsign/attackby(obj/item/I, mob/user) if(cult) return ..() @@ -79,6 +22,38 @@ return ..() +/obj/structure/sign/double/barsign/proc/get_sign_choices() + var/list/sign_choices = GET_SINGLETON_SUBTYPE_MAP(choice_types) + return sign_choices + +/obj/structure/sign/double/barsign/proc/set_sign() + var/list/sign_choices = get_sign_choices() + + var/list/sign_index = list() + for(var/sign in sign_choices) + var/singleton/sign/double/B = GET_SINGLETON(sign) + sign_index["[B.name]"] = B + + var/sign_choice = input("What should the sign be changed to?") as null|anything in sign_index + if(!sign_choice) + return + var/singleton/sign/double/signselect = sign_index[sign_choice] + + name = signselect.name + desc = signselect.desc + desc_extended = signselect.desc_extended + icon_state = signselect.icon_state + update_icon() + +/obj/structure/sign/double/barsign/kitchensign + icon = 'icons/obj/kitchensigns.dmi' + icon_state = "Off" + req_access = list(access_kitchen) + choice_types = /singleton/sign/double/kitchen + +/obj/structure/sign/double/barsign/kitchensign/mirrored // Visible from the other end of the sign. + pixel_x = -32 + /singleton/sign/double var/name = "Holographic Projector" var/icon_state = "Off" @@ -185,27 +160,4 @@ name = "City Alive" icon_state = "City Alive" desc = "City Alive is another popular restaurant chain, originating from Eridani I. It is famous for its light shows." - desc_extended = "City Alive is a high class restaurant chain, dotted all over Eridani I and III. Especially on Eridani I they are also famous for their light shows in the evenings. These lights look like pulsating veins, making the city seem alive, especially when observed from orbit." - -/obj/structure/sign/double/barsign/proc/get_sign_choices() - var/list/sign_choices = GET_SINGLETON_SUBTYPE_MAP(choice_types) - return sign_choices - -/obj/structure/sign/double/barsign/proc/set_sign() - var/list/sign_choices = get_sign_choices() - - var/list/sign_index = list() - for(var/sign in sign_choices) - var/singleton/sign/double/B = GET_SINGLETON(sign) - sign_index["[B.name]"] = B - - var/sign_choice = input("What should the sign be changed to?") as null|anything in sign_index - if(!sign_choice) - return - var/singleton/sign/double/signselect = sign_index[sign_choice] - - name = signselect.name - desc = signselect.desc - desc_extended = signselect.desc_extended - icon_state = signselect.icon_state - update_icon() + desc_extended = "City Alive is a high class restaurant chain, dotted all over Eridani I and III. Especially on Eridani I they are also famous for their light shows in the evenings. These lights look like pulsating veins, making the city seem alive, especially when observed from orbit." \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 0883f8af9cc..1d4c78be75a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -1,31 +1,23 @@ +// +// Freezer +// /obj/structure/closet/secure_closet/freezer + name = "freezer" + desc = "A freezer." icon_state = "freezer" door_anim_squish = 0.22 door_anim_angle = 123 -/obj/structure/closet/secure_closet/freezer/kitchen - name = "kitchen cabinet" - req_access = list(access_kitchen) - -/obj/structure/closet/secure_closet/freezer/kitchen/fill() - for(var/i = 0, i < 2, i++) - new /obj/item/reagent_containers/food/condiment/flour(src) - new /obj/item/reagent_containers/food/condiment/sugar(src) - new /obj/item/reagent_containers/food/condiment/shaker/spacespice(src) - -/obj/structure/closet/secure_closet/freezer/kitchen/mining - req_access = list() - +// Meat Freezer /obj/structure/closet/secure_closet/freezer/meat - name = "meat fridge" + name = "meat freezer" /obj/structure/closet/secure_closet/freezer/meat/fill() ..() for(var/i = 0, i < 8, i++) - new /obj/item/reagent_containers/food/snacks/meat/monkey(src) + new /obj/item/reagent_containers/food/snacks/meat(src) -// this is enough meat to do 10 grill batches -/obj/structure/closet/secure_closet/freezer/meat/super_meat/fill() +/obj/structure/closet/secure_closet/freezer/meat/super_meat/fill() // This is enough meat to do 10 grill batches. for(var/i = 0, i < 30, i++) new /obj/item/reagent_containers/food/snacks/meat(src) var/obj/item/reagent_containers/food/condiment/shaker/spacespice/SS = new(src) @@ -38,8 +30,22 @@ P.pixel_x = 6 P.pixel_y = 8 +// Chicken and Fish Freezer +/obj/structure/closet/secure_closet/freezer/chicken_and_fish + name = "chicken and fish freezer" + +/obj/structure/closet/secure_closet/freezer/chicken_and_fish/fill() + ..() + // 6 Chicken Fillets + for(var/i = 0, i < 6, i++) + new /obj/item/reagent_containers/food/snacks/meat/chicken(src) + // 6 Fish Fillets + for(var/i = 0, i < 6, i++) + new /obj/item/reagent_containers/food/snacks/fish/fishfillet(src) + /obj/structure/closet/secure_closet/freezer/fridge name = "refrigerator" + desc = "A refrigerator." /obj/structure/closet/secure_closet/freezer/fridge/fill() ..() @@ -50,6 +56,19 @@ for(var/i = 0, i < 2, i++) new /obj/item/storage/box/fancy/egg_box(src) +/obj/structure/closet/secure_closet/freezer/kitchen + name = "kitchen cabinet" + desc = "A cabinet." + req_access = list(access_kitchen) + +/obj/structure/closet/secure_closet/freezer/kitchen/fill() + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_containers/food/condiment/flour(src) + new /obj/item/reagent_containers/food/condiment/sugar(src) + new /obj/item/reagent_containers/food/condiment/shaker/spacespice(src) + +/obj/structure/closet/secure_closet/freezer/kitchen/mining + req_access = list() /obj/structure/closet/secure_closet/freezer/money name = "freezer" @@ -62,4 +81,4 @@ new /obj/random/spacecash(src) for(var/i = 0, i < rand(6,9), i++) - new /obj/random/coin(src) + new /obj/random/coin(src) \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index b9cd2c959cb..61e328774ce 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -198,10 +198,10 @@ desc = "How could you do this? You monster!" /mob/living/simple_animal/chicken - name = "\improper chicken" + name = "chicken" desc = "Hopefully the eggs are good this season." icon = 'icons/mob/npc/livestock.dmi' - icon_state = null + icon_state = "chicken_white" // Overridden in Initialize(). This is for map visibility. icon_living = null icon_dead = null speak = list("Cluck!","BWAAAAARK BWAK BWAK BWAK!","Bwaak bwak.") diff --git a/html/changelogs/service_fixes.yml b/html/changelogs/service_fixes.yml new file mode 100644 index 00000000000..ce30c6cfbfe --- /dev/null +++ b/html/changelogs/service_fixes.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - maptweak: "Fixed some mapping oversights in the service area." \ No newline at end of file diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index f7fb256552a..5e91b004d00 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -2049,12 +2049,11 @@ /area/maintenance/hangar/port) "bCN" = ( /obj/machinery/vending/hydronutrients, -/obj/effect/floor_decal/spline/plain, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "bCU" = ( /obj/effect/decal/cleanable/dirt, @@ -4355,7 +4354,6 @@ "dtb" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/ywflowers, -/mob/living/simple_animal/chicken, /turf/simulated/floor/grass/alt, /area/horizon/hydroponics/lower) "dtN" = ( @@ -4841,6 +4839,7 @@ /obj/machinery/light/small{ dir = 4 }, +/mob/living/simple_animal/chicken, /turf/simulated/floor/grass/alt, /area/horizon/hydroponics/lower) "dNa" = ( @@ -5571,7 +5570,7 @@ /obj/machinery/door/airlock/maintenance{ req_access = list(12) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hydroponics/lower) "etT" = ( /obj/structure/lattice, @@ -7155,15 +7154,12 @@ "fyR" = ( /obj/structure/closet/secure_closet/hydroponics, /obj/item/watertank, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/alarm{ dir = 4; pixel_x = -28 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "fzA" = ( /obj/structure/sign/nosmoking_1{ @@ -10727,13 +10723,10 @@ pixel_y = 7 }, /obj/item/reagent_containers/glass/bucket, -/obj/effect/floor_decal/spline/plain{ - dir = 6 - }, /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "ifw" = ( /obj/machinery/door/airlock/external{ @@ -10962,7 +10955,7 @@ "iqk" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "irA" = ( /obj/machinery/atmospherics/binary/pump{ @@ -17704,7 +17697,10 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky{ + pixel_x = -9; + pixel_y = -8 + }, /turf/simulated/floor/exoplanet/water/shallow, /area/horizon/stairwell/bridge) "nLL" = ( @@ -17812,9 +17808,8 @@ /area/outpost/mining_main/refinery) "nOi" = ( /obj/machinery/seed_storage/garden, -/obj/effect/floor_decal/spline/plain, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "nOM" = ( /obj/structure/disposalpipe/segment{ @@ -22356,10 +22351,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "rtC" = ( /obj/effect/decal/cleanable/dirt, @@ -23358,12 +23350,11 @@ "snA" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/reagent_containers/glass/bucket, -/obj/effect/floor_decal/spline/plain, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "snD" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ @@ -23418,13 +23409,16 @@ /turf/simulated/floor/tiled/full, /area/horizon/stairwell/central) "spL" = ( -/obj/effect/floor_decal/spline/plain, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green/diagonal, +/obj/effect/floor_decal/spline/plain/cee{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "spQ" = ( /obj/structure/bed/stool/chair/shuttle{ @@ -28053,9 +28047,6 @@ /obj/effect/floor_decal/corner/green{ dir = 5 }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, /obj/effect/floor_decal/spline/plain/corner{ dir = 8 }, @@ -28068,6 +28059,12 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/floor_decal/spline/plain/corner{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain/corner{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "vSS" = ( @@ -30351,23 +30348,17 @@ "xyG" = ( /obj/structure/closet/secure_closet/hydroponics, /obj/item/watertank, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/camera/network/service{ c_tag = "Service- Hydroponics Lower"; dir = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "xzd" = ( /obj/structure/table/stone/marble, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, /obj/machinery/firealarm/west, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "xAf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -54870,7 +54861,7 @@ snA pdL vLJ acw -mdL +nRy olu fKB bpl diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index f485f23cba9..0ea21f06e02 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -202,6 +202,15 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) +"aec" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/lino/grey, +/area/horizon/bar) "aem" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 @@ -275,10 +284,6 @@ /obj/machinery/newscaster{ pixel_x = -32 }, -/obj/machinery/alarm{ - pixel_y = 28; - req_one_access = list(24,11,55) - }, /turf/simulated/floor/tiled/dark, /area/horizon/bar/backroom) "ahm" = ( @@ -313,9 +318,6 @@ /area/rnd/xenobiology) "aib" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/camera/network/service{ - c_tag = "Service - Deck 2 - Bar Backroom" - }, /obj/item/bedsheet/mime, /obj/structure/bed/padded, /turf/simulated/floor/carpet, @@ -774,7 +776,7 @@ icon_state = "1-2" }, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_two/fore) "asB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -800,9 +802,6 @@ /obj/effect/floor_decal/corner/green/full{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "asO" = ( @@ -1145,9 +1144,6 @@ /turf/simulated/floor/tiled/full, /area/hallway/engineering) "ayo" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/grass/alt, @@ -1321,7 +1317,7 @@ dir = 10 }, /turf/simulated/floor/tiled/dark, -/area/horizon/kitchen) +/area/horizon/stairwell/bridge) "aAx" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/rnd/xenobiology/xenoflora) @@ -1981,11 +1977,6 @@ /turf/simulated/floor/tiled, /area/security/checkpoint2) "aSg" = ( -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -21; - pixel_y = -12 - }, /obj/machinery/power/apc{ dir = 8; name = "west bump"; @@ -1994,6 +1985,9 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/freezer{ name = "cooled tiles"; temperature = 253.15 @@ -2125,9 +2119,9 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/vending/hydronutrients, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, +/obj/machinery/seed_extractor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "aUh" = ( /obj/machinery/chemical_dispenser/full{ @@ -2547,14 +2541,6 @@ }, /turf/simulated/floor/tiled, /area/medical/first_responder) -"bdT" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/machinery/icecream_vat, -/turf/simulated/floor/tiled/white, -/area/horizon/kitchen) "bee" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -2657,12 +2643,10 @@ /area/maintenance/wing/starboard) "bhj" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -25 + pixel_x = -32 }, -/obj/effect/floor_decal/corner/green/full, -/obj/effect/floor_decal/spline/plain, -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/effect/floor_decal/corner/green{ + dir = 9 }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) @@ -3016,9 +3000,6 @@ /area/hallway/engineering) "bpC" = ( /obj/effect/floor_decal/corner/green/diagonal, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -3028,25 +3009,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/firealarm/south, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/washroom/central) "bpF" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/meat/chicken, -/obj/item/reagent_containers/food/snacks/meat/chicken, -/obj/item/reagent_containers/food/snacks/meat/chicken, -/obj/item/reagent_containers/food/snacks/meat/chicken, -/obj/item/reagent_containers/food/snacks/meat/chicken, -/obj/item/reagent_containers/food/snacks/meat/chicken, -/obj/item/reagent_containers/food/snacks/fish/fishfillet, -/obj/item/reagent_containers/food/snacks/fish/fishfillet, -/obj/item/reagent_containers/food/snacks/fish/fishfillet, -/obj/item/reagent_containers/food/snacks/fish/fishfillet, -/obj/item/reagent_containers/food/snacks/fish/fishfillet, -/obj/item/reagent_containers/food/snacks/fish/fishfillet, -/obj/item/reagent_containers/food/snacks/fish/fishfillet, -/obj/item/reagent_containers/food/snacks/fish/fishfillet, -/obj/item/reagent_containers/food/snacks/fish/fishfillet, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/closet/secure_closet/freezer/chicken_and_fish, /turf/simulated/floor/tiled/freezer{ name = "cooled tiles"; temperature = 253.15 @@ -3196,9 +3167,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "buz" = ( -/obj/structure/bed/stool/chair/office/light{ - dir = 8 - }, +/obj/structure/bed/stool/chair/office/light, /obj/effect/floor_decal/corner/green/full{ dir = 8 }, @@ -3212,13 +3181,15 @@ dir = 4; id = "shutters_deck2_hydroponicsdesk"; name = "Desk Shutter"; - pixel_x = -35; - pixel_y = -5 + pixel_x = -25; + pixel_y = -7 }, -/obj/machinery/light_switch{ +/obj/machinery/button/remote/blast_door{ dir = 4; - pixel_x = -24; - pixel_y = -9 + id = "shutters_deck2_hydroponicswindows"; + name = "Window Shutters"; + pixel_x = -35; + pixel_y = -7 }, /turf/simulated/floor/tiled, /area/horizon/hydroponics) @@ -3343,6 +3314,11 @@ /area/horizon/hydroponics) "byq" = ( /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/obj/machinery/door/blast/shutters/open{ + id = "shutters_deck2_hydroponicswindows"; + dir = 8; + name = "Window Shutter" + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "byv" = ( @@ -3795,16 +3771,19 @@ /turf/simulated/floor/tiled, /area/engineering/locker_room) "bHs" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/shutters/open{ + dir = 4; + id = "shutters_deck2_hydroponicswindowssafety"; + name = "Viewing Shutter" }, -/obj/effect/floor_decal/spline/plain, -/obj/effect/landmark/start{ - name = "Chef" +/obj/effect/landmark/entry_point/port{ + name = "port, hydroponics" }, -/turf/simulated/floor/tiled/white, -/area/horizon/kitchen) +/obj/structure/window/shuttle/scc_space_ship/cardinal, +/turf/simulated/floor/plating, +/area/horizon/hydroponics) "bHG" = ( /obj/effect/floor_decal/corner/brown/full{ dir = 8 @@ -4016,13 +3995,13 @@ req_access = list(35) }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/horizon/hydroponics) "bOI" = ( /obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ id = "Bar_Private_Lounge" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/bar) "bOR" = ( /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, @@ -4466,9 +4445,8 @@ "bXR" = ( /obj/effect/floor_decal/corner/green/full, /obj/effect/floor_decal/spline/plain{ - dir = 8 + dir = 10 }, -/obj/effect/floor_decal/spline/plain/corner, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "bYf" = ( @@ -4652,11 +4630,8 @@ /turf/simulated/floor/tiled, /area/engineering/locker_room) "cbK" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/horizon/kitchen/hallway) +/turf/template_noop, +/area/horizon/exterior) "ccl" = ( /obj/effect/floor_decal/corner/green{ dir = 5 @@ -4737,6 +4712,9 @@ dir = 5 }, /obj/structure/disposalpipe/segment, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/wood, /area/horizon/bar) "cei" = ( @@ -4774,22 +4752,12 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "cfc" = ( -/obj/structure/table/stone/marble, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "bar_shutter"; - name = "Bar Shutter" +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/effect/floor_decal/spline/plain/corner{ + dir = 1 }, -/obj/item/flame/candle{ - pixel_x = -11; - pixel_y = 16 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/horizon/bar) +/turf/simulated/floor/tiled/white, +/area/horizon/kitchen) "cfp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -4879,13 +4847,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/structure/cable/green{ icon_state = "1-8" }, /obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "chj" = ( @@ -5010,13 +4976,10 @@ dir = 8 }, /turf/simulated/floor/lino/grey, -/area/horizon/kitchen/hallway) +/area/horizon/crew_quarters/lounge/bar) "cku" = ( -/obj/structure/grille/diagonal{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/kitchenspike, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/freezer{ name = "cooled tiles"; temperature = 253.15 @@ -5319,13 +5282,15 @@ /turf/simulated/floor/tiled, /area/horizon/security/brig) "cwO" = ( -/obj/effect/landmark/entry_point/fore{ - name = "fore, kitchen freezer" +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -24; + pixel_y = -23 + }, +/turf/simulated/floor/tiled/freezer{ + name = "cooled tiles"; + temperature = 253.15 }, -/obj/structure/grille/diagonal, -/obj/structure/window/shuttle/scc_space_ship, -/obj/machinery/door/firedoor, -/turf/simulated/floor/reinforced, /area/horizon/kitchen/freezer) "cwQ" = ( /obj/effect/floor_decal/corner/green/full{ @@ -5416,6 +5381,9 @@ /obj/random/arcade, /obj/random/arcade, /obj/random/arcade, +/obj/structure/railing/mapped{ + dir = 4 + }, /turf/simulated/floor/wood, /area/horizon/bar) "cAb" = ( @@ -5463,7 +5431,11 @@ /obj/effect/floor_decal/corner/green{ dir = 10 }, -/obj/structure/sign/double/barsign/kitchensign{ +/obj/machinery/camera/network/second_deck{ + c_tag = "Second Deck - Dinner Entrance 2"; + dir = 1 + }, +/obj/structure/sign/double/barsign/kitchensign/mirrored{ pixel_y = -32 }, /turf/simulated/floor/tiled, @@ -5497,7 +5469,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "cDD" = ( /obj/structure/table/standard, @@ -5639,9 +5612,6 @@ dir = 5 }, /obj/effect/floor_decal/spline/plain/corner, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -5651,6 +5621,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/spline/plain/corner{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain/corner{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "cJu" = ( @@ -5894,22 +5870,20 @@ /turf/simulated/floor/tiled/full, /area/horizon/security/brig) "cOk" = ( -/obj/structure/table/stone/marble, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/door/window/northleft{ - name = "Hydroponics"; + name = "Hydroponics Desk"; req_access = list(35) }, /obj/machinery/door/firedoor, +/obj/structure/table/reinforced, +/obj/machinery/door/window/southleft{ + name = "Hydroponics Desk" + }, /obj/machinery/door/blast/shutters{ dir = 2; id = "shutters_deck2_hydroponicsdesk"; name = "Hydroponics Desk Shutter" }, -/obj/item/paper_bin, -/obj/item/pen, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "cOn" = ( @@ -5986,7 +5960,7 @@ /obj/structure/lattice/catwalk, /obj/structure/railing/mapped, /turf/simulated/open/airless, -/area/template_noop) +/area/horizon/exterior) "cQd" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 6 @@ -6158,19 +6132,8 @@ }, /turf/simulated/floor/tiled/white, /area/horizon/kitchen) -"cUZ" = ( -/obj/machinery/floor_light/dance, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/horizon/crew_quarters/lounge/bar) "cVb" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/spline/plain, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -6183,7 +6146,15 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/white, +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = 32 + }, +/obj/structure/table/stone/marble, +/obj/item/device/destTagger, +/obj/item/stack/packageWrap, +/obj/item/device/hand_labeler, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "cVe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6208,15 +6179,11 @@ "cWf" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -29 - }, /obj/machinery/camera/network/service{ c_tag = "Service- Hydroponics 2"; dir = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "cWj" = ( /obj/structure/window/shuttle/scc_space_ship, @@ -6259,10 +6226,7 @@ name = "Horizon Dining Hall" }, /obj/machinery/door/firedoor, -/obj/effect/floor_decal/spline/fancy/wood/cee{ - dir = 1 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/full, /area/horizon/crew_quarters/lounge/bar) "cXh" = ( /obj/structure/disposalpipe/segment{ @@ -6378,14 +6342,6 @@ /turf/simulated/floor/tiled/dark/cooled, /area/turret_protected/ai) "dat" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 8; - id_tag = "dinerbolt"; - name = "Kitchen" - }, -/obj/effect/floor_decal/spline/plain{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -6393,12 +6349,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 8 - }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/horizon/kitchen/hallway) +/turf/simulated/floor/tiled/full, +/area/horizon/crew_quarters/lounge/bar) "day" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6505,11 +6458,10 @@ /turf/simulated/floor/tiled, /area/horizon/security/brig) "ddX" = ( -/obj/structure/reagent_dispensers/cookingoil, -/turf/simulated/floor/tiled/freezer{ - name = "cooled tiles"; - temperature = 253.15 +/obj/effect/landmark/entry_point/fore{ + name = "fore, kitchen" }, +/turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/kitchen/freezer) "def" = ( /obj/effect/floor_decal/corner_wide/green{ @@ -6632,8 +6584,8 @@ /obj/machinery/chemical_dispenser/coffeemaster/full{ pixel_y = 5 }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 1 }, /turf/simulated/floor/wood, /area/horizon/bar) @@ -7858,12 +7810,6 @@ dir = 8 }, /obj/structure/window/shuttle/scc_space_ship, -/obj/machinery/door/blast/shutters/open{ - name = "Bar Viewing Shutters"; - id = "bar_viewing_shutters"; - dir = 2 - }, -/obj/machinery/door/firedoor, /obj/effect/floor_decal/spline/plain{ dir = 1 }, @@ -7999,12 +7945,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/alarm{ - pixel_y = 28; - req_one_access = list(24,11,55) +/obj/machinery/orderterminal{ + pixel_y = 32 + }, +/obj/machinery/camera/network/service{ + c_tag = "Dinner - Kitchen Service" }, /turf/simulated/floor/lino/grey, -/area/horizon/kitchen/hallway) +/area/horizon/crew_quarters/lounge/bar) "dRk" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/corner/green{ @@ -8514,6 +8462,14 @@ }, /turf/simulated/floor/reinforced, /area/horizon/grauwolf) +"efy" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/horizon/crew_quarters/lounge/bar) "efz" = ( /obj/item/hullbeacon/red, /obj/structure/sign/securearea{ @@ -8737,7 +8693,7 @@ /obj/machinery/media/jukebox/audioconsole{ anchored = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/crew_quarters/lounge/bar) "emN" = ( /obj/structure/lattice/catwalk/indoor/grate/old, @@ -9006,7 +8962,7 @@ icon_state = "4-8" }, /turf/simulated/floor/lino/grey, -/area/horizon/kitchen/hallway) +/area/horizon/crew_quarters/lounge/bar) "esX" = ( /obj/structure/cable{ icon_state = "4-8" @@ -9070,13 +9026,11 @@ /turf/simulated/floor/tiled, /area/engineering/locker_room) "euT" = ( -/obj/structure/table/standard, -/turf/simulated/floor/tiled/dark, +/obj/machinery/chemical_dispenser, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "evi" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, /obj/structure/disposalpipe/junction{ dir = 2; icon_state = "pipe-j2" @@ -9200,8 +9154,8 @@ /turf/template_noop, /area/template_noop) "exU" = ( -/obj/effect/floor_decal/corner/grey{ - dir = 6 +/obj/effect/floor_decal/corner/grey/full{ + dir = 4 }, /turf/simulated/floor/lino/grey, /area/horizon/bar) @@ -9267,6 +9221,7 @@ c_tag = "Service - Deck 2 - Dining Hall 1"; dir = 4 }, +/obj/machinery/firealarm/west, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "eAw" = ( @@ -9467,12 +9422,6 @@ dir = 8 }, /obj/structure/window/shuttle/scc_space_ship, -/obj/machinery/door/blast/shutters/open{ - name = "Bar Viewing Shutters"; - id = "bar_viewing_shutters"; - dir = 2 - }, -/obj/machinery/door/firedoor, /obj/effect/floor_decal/spline/fancy/wood/cee{ dir = 4 }, @@ -9730,7 +9679,8 @@ /area/maintenance/wing/port) "eOl" = ( /obj/machinery/appliance/cooker/stove, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "eOs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -9858,12 +9808,6 @@ dir = 1 }, /obj/structure/window/shuttle/scc_space_ship, -/obj/machinery/door/blast/shutters/open{ - name = "Bar Viewing Shutters"; - id = "bar_viewing_shutters"; - dir = 2 - }, -/obj/machinery/door/firedoor, /obj/effect/floor_decal/spline/plain{ dir = 1 }, @@ -9876,10 +9820,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/lino/grey, /area/horizon/bar) "eTf" = ( @@ -9889,12 +9835,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/starboard) -"eTQ" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/turf/simulated/floor/reinforced/airless, -/area/template_noop) "eUa" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10322,7 +10262,6 @@ /area/horizon/security/office) "fdh" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/spline/plain/corner, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -10400,15 +10339,15 @@ /obj/effect/floor_decal/spline/plain/corner{ dir = 4 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "fei" = ( /obj/effect/floor_decal/corner/green{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; @@ -10416,6 +10355,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "fek" = ( @@ -10477,7 +10417,7 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/horizon/bar) "feC" = ( /turf/simulated/floor/reinforced, @@ -10539,9 +10479,9 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "fgd" = ( -/obj/machinery/seed_extractor, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, +/obj/machinery/seed_storage/garden, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "fgC" = ( /obj/machinery/newscaster{ @@ -10568,11 +10508,8 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 4 - }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 + dir = 5 }, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) @@ -10685,16 +10622,25 @@ /turf/simulated/floor/tiled/full, /area/hallway/primary/central_one) "fkr" = ( -/obj/structure/grille, +/obj/structure/table/stone/marble, /obj/machinery/door/firedoor, -/obj/structure/window/shuttle/scc_space_ship, -/obj/machinery/door/blast/shutters/open{ - name = "kitchen window shutter"; - id = "kitchen_window_shutters"; - dir = 2 +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "bar_shutter"; + name = "Bar Shutter" }, -/turf/simulated/floor/plating, -/area/horizon/kitchen) +/obj/item/flame/candle{ + pixel_x = -11; + pixel_y = 16 + }, +/obj/item/glass_jar{ + desc = "A small empty jar that is mostly used for giving a tip."; + name = "tip jar"; + pixel_x = 2; + pixel_y = 18 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/bar) "fkF" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -10731,20 +10677,13 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/security/office) "fln" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/floor_decal/corner/grey{ - dir = 5 - }, -/obj/structure/table/stone/marble, -/obj/machinery/reagentgrinder{ - pixel_x = 4; - pixel_y = 18 - }, /obj/machinery/alarm{ pixel_y = 28; req_one_access = list(24,11,55) }, -/turf/simulated/floor/lino/grey, +/obj/structure/table/stone/marble, +/obj/item/reagent_containers/food/drinks/teapot, +/turf/simulated/floor/tiled/dark/full, /area/horizon/bar) "flS" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ @@ -10763,7 +10702,7 @@ dir = 6 }, /turf/simulated/floor/tiled/dark, -/area/horizon/kitchen) +/area/horizon/stairwell/bridge) "fmV" = ( /obj/structure/cable{ icon_state = "1-2" @@ -11350,6 +11289,12 @@ /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 4 }, +/obj/machinery/button/remote/blast_door{ + name = "Viewing Shutters"; + id = "lounge_window_shutters"; + pixel_y = -37; + dir = 1 + }, /obj/machinery/light, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) @@ -11651,15 +11596,8 @@ /turf/simulated/floor/tiled/full, /area/hallway/engineering) "fKe" = ( -/obj/effect/floor_decal/corner/green/full{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -25 - }, +/obj/machinery/vending/snack, +/obj/effect/floor_decal/industrial/hatch/grey, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "fKi" = ( @@ -11903,7 +11841,7 @@ dir = 4 }, /turf/simulated/floor/lino/grey, -/area/horizon/kitchen/hallway) +/area/horizon/crew_quarters/lounge/bar) "fPb" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -12310,15 +12248,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/hor) -"fZr" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -29 - }, -/turf/simulated/floor/tiled/dark, -/area/horizon/hydroponics) "fZz" = ( /obj/structure/cable{ icon_state = "0-2" @@ -12345,14 +12274,11 @@ /turf/simulated/floor/tiled/dark, /area/horizon/zta) "fZC" = ( -/obj/machinery/floor_light/dance, /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/wood, +/obj/machinery/floor_light/dance/alternate, +/turf/simulated/floor/tiled/dark/full, /area/horizon/crew_quarters/lounge/bar) "fZI" = ( /obj/structure/cable/yellow{ @@ -12633,9 +12559,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "gfI" = ( @@ -12879,6 +12802,11 @@ dir = 8 }, /obj/machinery/disposal/small/north, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -9; + pixel_y = -24 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "giH" = ( @@ -13019,8 +12947,6 @@ /turf/simulated/open/airless, /area/horizon/exterior) "gmt" = ( -/obj/machinery/chemical_dispenser, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light{ dir = 1 }, @@ -13030,7 +12956,13 @@ name = "Hydroponics Requests Console"; pixel_y = 30 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/standard, +/obj/item/paper_bin, +/obj/item/pen, +/obj/structure/extinguisher_cabinet{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "gmE" = ( /obj/structure/table/standard, @@ -13335,7 +13267,8 @@ name = "north bump"; pixel_y = 24 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "gst" = ( /obj/structure/cable{ @@ -13466,7 +13399,8 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, /area/horizon/kitchen/freezer) "gun" = ( /obj/effect/floor_decal/industrial/warning{ @@ -13559,11 +13493,7 @@ /obj/machinery/smartfridge/drinks{ opacity = 1 }, -/obj/effect/floor_decal/spline/plain, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/bar) "gwP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -13899,8 +13829,9 @@ req_one_access = list(35,28) }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, -/area/horizon/kitchen) +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, +/area/horizon/hydroponics) "gDR" = ( /obj/effect/floor_decal/corner/green{ dir = 10 @@ -13941,7 +13872,7 @@ /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "gEB" = ( /obj/structure/cable{ @@ -14083,7 +14014,6 @@ /area/engineering/engine_monitoring/tesla) "gGP" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/spline/plain, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -14097,6 +14027,9 @@ name = "east bump"; pixel_x = 24 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/horizon/kitchen) "gGX" = ( @@ -14140,7 +14073,7 @@ dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 + dir = 4 }, /turf/simulated/floor/wood, /area/horizon/bar) @@ -14494,7 +14427,7 @@ "gQD" = ( /obj/machinery/smartfridge/drying_rack, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "gQV" = ( /obj/structure/cable{ @@ -14513,13 +14446,18 @@ /area/engineering/lobby) "gRh" = ( /obj/machinery/door/firedoor, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_two/fore) "gRr" = ( -/obj/machinery/seed_storage/garden, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, +/obj/machinery/biogenerator{ + icon_state = "biogen-empty" + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "gRU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -14614,19 +14552,12 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/smes) -"gTy" = ( -/obj/structure/lattice/catwalk, -/obj/effect/landmark/entry_point/port{ - name = "port, hydroponics" - }, -/turf/simulated/open/airless, -/area/template_noop) "gUn" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp/green, /obj/machinery/button/switch/windowtint{ id = "Bar_Private_Lounge"; - pixel_x = 6; + pixel_x = 9; pixel_y = 24 }, /turf/simulated/floor/carpet/red, @@ -14764,7 +14695,7 @@ /obj/machinery/newscaster{ pixel_y = -32 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "gYm" = ( /obj/effect/floor_decal/corner/mauve/diagonal, @@ -15140,7 +15071,7 @@ /area/medical/reception) "hiH" = ( /obj/structure/table/stone/marble, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "hiR" = ( /obj/effect/floor_decal/corner_wide/yellow{ @@ -15222,11 +15153,6 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/zta) -"hkJ" = ( -/obj/item/hullbeacon/red, -/obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/reinforced/airless, -/area/template_noop) "hlu" = ( /obj/machinery/papershredder, /obj/structure/railing/mapped{ @@ -15302,10 +15228,12 @@ /obj/effect/floor_decal/corner/green{ dir = 9 }, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/newscaster{ + pixel_x = -32 }, -/obj/machinery/disposal/small/east, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "hnD" = ( @@ -15645,7 +15573,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/horizon/kitchen) +/area/horizon/stairwell/bridge) "hte" = ( /obj/machinery/computer/telescience{ starting_crystals = 4 @@ -15923,7 +15851,13 @@ /turf/simulated/floor/tiled/white, /area/medical/ors) "hBz" = ( -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/horizon/hydroponics) "hBJ" = ( /obj/structure/cable/green{ @@ -15988,10 +15922,6 @@ /area/operations/mail_room) "hCo" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/alarm{ - pixel_y = 28; - req_one_access = list(24,11,55) - }, /obj/structure/window/reinforced{ dir = 8 }, @@ -16189,14 +16119,15 @@ /turf/simulated/floor/tiled, /area/engineering/storage_eva) "hFM" = ( -/obj/machinery/camera/network/second_deck{ - c_tag = "Second Deck - Dinner Entrance 2"; - dir = 8 +/obj/effect/floor_decal/corner/grey{ + dir = 10 }, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ywflowers, -/turf/simulated/floor/grass/alt, -/area/horizon/hallway/deck_two/fore) +/obj/machinery/light, +/obj/structure/weapon_rack/double{ + pixel_y = -32 + }, +/turf/simulated/floor/lino/grey, +/area/horizon/bar) "hFU" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -16212,8 +16143,8 @@ }, /obj/machinery/light_switch{ dir = 4; - pixel_x = -21; - pixel_y = 20 + pixel_x = -24; + pixel_y = 23 }, /turf/simulated/floor/wood, /area/horizon/library) @@ -16341,7 +16272,7 @@ /obj/structure/railing/mapped{ dir = 1 }, -/turf/simulated/floor/tiled/ramp/bottom{ +/turf/simulated/floor/tiled/ramp{ dir = 8 }, /area/horizon/crew_quarters/lounge/bar) @@ -16451,7 +16382,7 @@ dir = 4 }, /obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 + dir = 1 }, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) @@ -16494,13 +16425,13 @@ /turf/simulated/floor/tiled, /area/horizon/security/holding_cell_b) "hPC" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/item/hullbeacon/red, -/obj/effect/landmark/entry_point/fore{ - name = "fore, dining hall" +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/obj/machinery/door/blast/shutters/open{ + id = "shutters_deck2_hydroponicswindows"; + name = "Window Shutter" }, -/turf/simulated/floor/reinforced/airless, -/area/template_noop) +/turf/simulated/floor/tiled/dark/full, +/area/horizon/hydroponics) "hPH" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ @@ -16542,15 +16473,12 @@ /turf/simulated/floor/tiled/dark/full, /area/turbolift/scc_ship/cargo_lift) "hQI" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" }, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) @@ -16577,14 +16505,11 @@ /turf/simulated/floor/plating/cooled, /area/turret_protected/ai) "hSp" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/bee_smoker, -/obj/item/beehive_assembly, -/obj/item/bee_pack, -/obj/item/bee_net, -/obj/item/honey_frame, -/obj/item/honey_frame, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/honey_extractor{ + density = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "hSr" = ( /obj/structure/cable{ @@ -16718,7 +16643,6 @@ /turf/simulated/open, /area/operations/office) "hUW" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/door/airlock/glass_service{ name = "Kitchen"; req_access = list(28) @@ -16736,7 +16660,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/full, /area/horizon/kitchen) "hVj" = ( /obj/effect/landmark{ @@ -16800,7 +16724,7 @@ pixel_x = -6; pixel_y = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "hYt" = ( /obj/machinery/requests_console{ @@ -16947,13 +16871,9 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "idL" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/effect/floor_decal/spline/plain, /obj/machinery/floor_light/dance/alternate, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark/full, /area/horizon/crew_quarters/lounge/bar) "idS" = ( /obj/machinery/firealarm/north, @@ -16973,7 +16893,6 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/storage) "idX" = ( -/obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, /obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters/open{ @@ -16981,6 +16900,7 @@ id = "shutters_deck2_hydroponicswindowssafety"; name = "Viewing Shutter" }, +/obj/structure/window/shuttle/scc_space_ship/cardinal, /turf/simulated/floor/plating, /area/horizon/hydroponics) "idZ" = ( @@ -17694,24 +17614,12 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/structure/flora/pottedplant{ - desc = "A tag with the name 'Harvey, Ph.D.' has been taped to the rim of this strange fern's plant pot."; - icon_state = "plant-35"; - name = "Harvey" - }, /obj/effect/floor_decal/spline/plain{ dir = 9 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/camera/network/service{ - c_tag = "Dinner - Kitchen Service"; - pixel_x = -6 - }, -/obj/machinery/light{ - dir = 1 - }, /turf/simulated/floor/lino/grey, -/area/horizon/kitchen/hallway) +/area/horizon/crew_quarters/lounge/bar) "itX" = ( /turf/simulated/floor/wood, /area/chapel/main) @@ -17900,6 +17808,9 @@ /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "iAB" = ( @@ -17982,9 +17893,6 @@ /turf/simulated/floor/reinforced, /area/horizon/zta) "iCx" = ( -/obj/effect/floor_decal/spline/plain/cee{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -17997,10 +17905,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/spline/plain/corner{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/horizon/hydroponics/garden) "iCz" = ( /obj/structure/bed/stool/chair/office/dark, @@ -18061,8 +17966,9 @@ "iEi" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/ppflowers, -/obj/machinery/light{ - dir = 4 +/obj/machinery/camera/network/second_deck{ + c_tag = "Second Deck - Dinner Entrance 2"; + dir = 8 }, /turf/simulated/floor/grass/alt, /area/horizon/hallway/deck_two/fore) @@ -18158,7 +18064,7 @@ "iGG" = ( /obj/structure/stairs/north, /turf/simulated/floor/tiled/dark, -/area/horizon/kitchen) +/area/horizon/stairwell/bridge) "iGY" = ( /obj/structure/cable{ icon_state = "4-8" @@ -18229,21 +18135,19 @@ /turf/simulated/floor/tiled/full, /area/hallway/engineering) "iIx" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 6 - }, -/obj/effect/floor_decal/spline/plain/corner{ - dir = 4 - }, /obj/machinery/camera/network/service{ c_tag = "Service - Deck 2 - Bar Starboard"; dir = 8 }, /obj/machinery/button/remote/blast_door{ id = "bar_viewing_shutters"; - name = "bar viewing shutters"; + name = "Viewing Shutters"; pixel_x = 25; - pixel_y = -4 + pixel_y = -7; + dir = 8 + }, +/obj/effect/floor_decal/spline/plain/cee{ + dir = 4 }, /turf/simulated/floor/lino/grey, /area/horizon/bar) @@ -18416,8 +18320,7 @@ }, /obj/structure/sink/kitchen{ dir = 4; - name = "sink"; - pixel_x = -20 + pixel_x = -21 }, /turf/simulated/floor/lino/grey, /area/horizon/bar) @@ -18475,9 +18378,6 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port) "iNu" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -19896,14 +19796,10 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/security/armoury) "jvu" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/landmark/entry_point/starboard{ - name = "starboard, bar" - }, -/turf/simulated/floor/reinforced/airless, -/area/template_noop) +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, +/area/horizon/hallway/deck_two/fore) "jvI" = ( /obj/effect/landmark{ name = "Observer-Start" @@ -20193,13 +20089,13 @@ /area/turret_protected/ai_upload_foyer) "jDZ" = ( /obj/effect/floor_decal/spline/fancy/wood, -/obj/machinery/disposal/small/north, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "jEq" = ( @@ -20249,10 +20145,13 @@ /obj/structure/disposalpipe/segment, /obj/machinery/button/remote/blast_door{ id = "bar_shutter"; - name = "bar shutters"; - pixel_x = -28; - pixel_y = 8; - req_access = list(25) + name = "Desk Shutters"; + pixel_x = -25; + req_access = list(25); + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -20283,17 +20182,11 @@ /turf/simulated/floor/carpet/rubber, /area/server) "jFo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/floor_light/dance, /obj/effect/floor_decal/spline/plain{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/wood, +/obj/machinery/floor_light/dance/alternate, +/turf/simulated/floor/tiled/dark/full, /area/horizon/crew_quarters/lounge/bar) "jFu" = ( /obj/structure/cable{ @@ -20334,15 +20227,19 @@ /area/horizon/library) "jGa" = ( /obj/structure/railing/mapped, -/obj/structure/flora/pottedplant{ - icon_state = "plant-28" - }, /obj/effect/floor_decal/spline/plain{ dir = 6 }, /obj/machinery/firealarm/east, +/obj/structure/flora/pottedplant{ + icon_state = "plant-28" + }, +/obj/machinery/camera/network/service{ + c_tag = "Service - Deck 2 - Dining Hall 2"; + dir = 8 + }, /turf/simulated/floor/lino/grey, -/area/horizon/kitchen/hallway) +/area/horizon/crew_quarters/lounge/bar) "jHd" = ( /obj/structure/ship_weapon_dummy, /turf/template_noop, @@ -20372,6 +20269,9 @@ dir = 8 }, /obj/structure/grille, +/obj/effect/landmark/entry_point/starboard{ + name = "starboard, bar" + }, /turf/simulated/floor/plating, /area/horizon/bar) "jHX" = ( @@ -20710,11 +20610,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/button/remote/blast_door{ - name = "lounge window shutters"; - id = "lounge_window_shutters"; - pixel_y = 32 - }, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "jPr" = ( @@ -20867,12 +20762,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/vending/dinnerware{ - density = 0; - pixel_y = 24 +/obj/machinery/vending/dinnerware/plastic{ + pixel_y = 24; + density = 0 }, /turf/simulated/floor/lino/grey, -/area/horizon/kitchen/hallway) +/area/horizon/crew_quarters/lounge/bar) "jUs" = ( /obj/machinery/atmospherics/unary/freezer{ icon_state = "freezer" @@ -20997,14 +20892,14 @@ /turf/simulated/open, /area/maintenance/wing/starboard) "jWh" = ( -/obj/structure/table/stone/marble, -/obj/item/device/destTagger, -/obj/item/device/hand_labeler, -/obj/item/stack/packageWrap, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/horizon/kitchen) "jWj" = ( /obj/effect/floor_decal/corner_wide/paleblue{ @@ -21302,12 +21197,14 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "keG" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/effect/landmark/entry_point/port{ + name = "port, kitchen" }, -/obj/item/hullbeacon/red, -/turf/simulated/floor/reinforced/airless, -/area/template_noop) +/obj/structure/window/shuttle/scc_space_ship/cardinal, +/turf/simulated/floor/plating, +/area/horizon/stairwell/bridge) "kfw" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -21365,8 +21262,13 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/security/head_of_security) "kgp" = ( -/turf/simulated/floor/reinforced/airless, -/area/template_noop) +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, +/area/horizon/hallway/deck_two/fore) "kgH" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/effect/floor_decal/spline/plain, @@ -21389,10 +21291,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/effect/floor_decal/spline/plain/cee{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/bar) "kgT" = ( /obj/machinery/light{ @@ -21522,12 +21421,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/security/brig) -"klg" = ( -/obj/structure/grille/diagonal, -/obj/structure/window/shuttle/scc_space_ship, -/obj/machinery/door/firedoor, -/turf/simulated/floor/reinforced, -/area/horizon/kitchen/freezer) "klv" = ( /obj/effect/floor_decal/corner/paleblue/full{ dir = 4 @@ -21766,13 +21659,6 @@ "kuh" = ( /turf/simulated/open/airless, /area/template_noop) -"kum" = ( -/obj/effect/floor_decal/corner/grey{ - dir = 10 - }, -/obj/machinery/light, -/turf/simulated/floor/lino/grey, -/area/horizon/bar) "kur" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -21803,20 +21689,6 @@ /obj/effect/floor_decal/industrial/hatch/grey, /turf/simulated/floor/tiled, /area/horizon/security/brig) -"kvc" = ( -/obj/structure/grille/diagonal{ - dir = 1 - }, -/obj/machinery/door/blast/shutters/open{ - name = "kitchen window shutter"; - id = "kitchen_window_shutters"; - dir = 2 - }, -/obj/structure/window/shuttle/scc_space_ship, -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/corner/grey/diagonal, -/turf/simulated/floor/tiled/white, -/area/horizon/kitchen) "kvd" = ( /obj/structure/grille/diagonal{ dir = 4 @@ -21860,6 +21732,12 @@ }, /turf/simulated/floor/tiled, /area/engineering/lobby) +"kvN" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_two/fore) "kvZ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -21971,7 +21849,7 @@ "kze" = ( /obj/machinery/smartfridge/secure, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "kzl" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ @@ -22023,6 +21901,12 @@ /obj/item/device/flashlight/lamp, /turf/simulated/floor/carpet, /area/medical/psych) +"kBe" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_two/fore) "kBY" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -22201,7 +22085,8 @@ /area/horizon/exterior) "kHj" = ( /obj/machinery/door/airlock/maintenance{ - req_one_access = list(12,25) + req_one_access = list(12,25); + name = "Bar Maintenance" }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -22210,7 +22095,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/bar) "kHn" = ( /obj/machinery/door/firedoor, @@ -22239,6 +22124,17 @@ /obj/item/stock_parts/micro_laser, /turf/simulated/floor/tiled/white, /area/rnd/research) +"kHv" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/structure/window/shuttle/scc_space_ship/cardinal, +/obj/machinery/door/blast/shutters/open{ + name = "Viewing Shutter"; + id = "kitchen_window_shutters"; + dir = 2 + }, +/turf/simulated/floor/plating, +/area/horizon/kitchen/freezer) "kHx" = ( /obj/machinery/door/airlock/engineering{ name = "Engineering Substation"; @@ -22319,6 +22215,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "kKO" = ( @@ -22457,13 +22354,13 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "kPz" = ( -/obj/structure/closet/secure_closet/freezer/meat, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/freezer{ - name = "cooled tiles"; - temperature = 253.15 - }, -/area/horizon/kitchen/freezer) +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/closet/chefcloset, +/obj/item/device/nanoquikpay, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/effect/floor_decal/spline/plain/corner, +/turf/simulated/floor/tiled/white, +/area/horizon/kitchen) "kPA" = ( /obj/machinery/light/small{ dir = 4 @@ -23609,13 +23506,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/operations/office) -"ltv" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/item/hullbeacon/red, -/turf/simulated/floor/reinforced/airless, -/area/template_noop) "ltG" = ( /obj/machinery/status_display{ pixel_y = -32 @@ -23708,9 +23598,6 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "lvM" = ( -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1 - }, /turf/simulated/floor/wood, /area/horizon/bar) "lwD" = ( @@ -23763,15 +23650,21 @@ /turf/simulated/floor/tiled, /area/horizon/security/hallway) "lzC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/corner/green{ + dir = 1 + }, +/obj/effect/floor_decal/spline/plain/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "lzM" = ( @@ -24258,12 +24151,8 @@ /area/rnd/hallway) "lLl" = ( /obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/window/eastleft{ +/obj/machinery/door/window/southright{ name = "Bar Access"; - dir = 2; req_access = list(25) }, /obj/machinery/door/blast/shutters{ @@ -24271,7 +24160,7 @@ id = "bar_shutter"; name = "Bar Shutter" }, -/turf/simulated/floor/lino/grey, +/turf/simulated/floor/tiled/dark/full, /area/horizon/bar) "lLn" = ( /obj/structure/table/standard, @@ -24456,9 +24345,6 @@ /area/hallway/primary/central_one) "lQh" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, /obj/structure/disposalpipe/sortjunction/flipped{ dir = 2; name = "Kitchen"; @@ -24831,20 +24717,14 @@ /area/turret_protected/ai) "lYV" = ( /obj/structure/table/stone/marble, -/obj/item/glass_jar{ - desc = "A small empty jar that is mostly used for giving a tip."; - name = "tip jar"; - pixel_x = 2; - pixel_y = 18 +/obj/machinery/requests_console{ + department = "Kitchen"; + departmentType = 1; + name = "Kitchen Requests Console"; + pixel_y = -32 }, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/shutters{ - dir = 8; - id = "bar_shutter"; - name = "Bar Shutter" - }, -/turf/simulated/floor/tiled/dark, -/area/horizon/bar) +/turf/simulated/floor/tiled/dark/full, +/area/horizon/kitchen) "lYZ" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/effect/floor_decal/spline/plain{ @@ -24925,6 +24805,15 @@ "maq" = ( /turf/simulated/floor/tiled/ramp, /area/maintenance/wing/starboard) +"max" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/freezer{ + name = "cooled tiles"; + temperature = 253.15 + }, +/area/horizon/kitchen/freezer) "maP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -24950,7 +24839,7 @@ "maV" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "mbi" = ( /obj/item/modular_computer/console/preset/security/armory{ @@ -25168,7 +25057,6 @@ /area/horizon/security/head_of_security) "mgg" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/spline/plain/corner, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -25182,6 +25070,11 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/light_switch{ + pixel_x = -24; + pixel_y = 23; + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/horizon/kitchen) "mgs" = ( @@ -25281,13 +25174,11 @@ /area/medical/reception) "miM" = ( /obj/effect/floor_decal/corner/grey/full, -/obj/structure/weapon_rack/double{ - pixel_y = -32 - }, /obj/structure/disposalpipe/trunk{ dir = 8 }, /obj/machinery/disposal/small/north, +/obj/machinery/firealarm/south, /turf/simulated/floor/lino/grey, /area/horizon/bar) "miP" = ( @@ -25298,7 +25189,6 @@ id = "bar_shutter"; name = "Bar Shutter" }, -/obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark, /area/horizon/bar) "mjb" = ( @@ -25312,9 +25202,6 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/far) "mjl" = ( -/obj/machinery/honey_extractor{ - density = 1 - }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/alarm{ pixel_y = 28 @@ -25322,16 +25209,22 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/closet/crate/hydroponics{ + name = "beekeeping crate" + }, +/obj/item/bee_smoker, +/obj/item/bee_net, +/obj/item/beehive_assembly, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/bee_pack, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "mjp" = ( -/obj/structure/table/stone/marble, /obj/item/crowbar/red, /obj/item/material/hatchet/butch, /obj/item/material/hook, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +/obj/structure/table/standard, /obj/machinery/light{ dir = 4 }, @@ -25556,12 +25449,6 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/engineering/engine_room) "mqN" = ( -/obj/structure/mirror{ - pixel_y = 36 - }, -/obj/structure/sink{ - pixel_y = 28 - }, /obj/effect/floor_decal/corner/green/diagonal, /obj/machinery/alarm{ dir = 4; @@ -25570,6 +25457,8 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/machinery/recharge_station, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/washroom/central) "mqR" = ( @@ -25693,9 +25582,10 @@ /turf/simulated/floor/tiled, /area/engineering/lobby) "mtP" = ( -/obj/machinery/alarm/freezer{ +/obj/structure/sink/kitchen{ dir = 4; - pixel_x = -32 + name = "sink"; + pixel_x = -21 }, /turf/simulated/floor/tiled/freezer{ name = "cooled tiles"; @@ -25716,18 +25606,18 @@ pixel_x = 10; pixel_y = 25 }, +/obj/machinery/camera/network/service{ + c_tag = "Service - Deck 2 - Bar Private Lounge" + }, /turf/simulated/floor/wood, /area/horizon/bar) "muz" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/sink/kitchen{ dir = 4; - pixel_x = -20 + pixel_x = -21 }, /obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/spline/plain/corner{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/horizon/kitchen) "muK" = ( @@ -25943,9 +25833,9 @@ /obj/item/reagent_containers/food/drinks/milk, /obj/item/reagent_containers/food/drinks/soymilk, /obj/item/reagent_containers/food/drinks/soymilk, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/firealarm/east, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "myG" = ( /obj/machinery/lapvend, @@ -26103,10 +25993,7 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/effect/floor_decal/spline/fancy/wood/cee{ - dir = 1 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/full, /area/horizon/crew_quarters/lounge/bar) "mDQ" = ( /obj/structure/cable/green{ @@ -26484,11 +26371,13 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/security/office) "mLU" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "dinerbolt"; + name = "Kitchen" }, -/turf/simulated/floor/reinforced/airless, -/area/template_noop) +/turf/simulated/floor/tiled/full, +/area/horizon/crew_quarters/lounge/bar) "mMf" = ( /obj/effect/floor_decal/corner_wide/blue{ dir = 9 @@ -26632,7 +26521,7 @@ /area/horizon/bar) "mOH" = ( /obj/structure/railing/mapped, -/turf/simulated/floor/tiled/ramp/bottom{ +/turf/simulated/floor/tiled/ramp{ dir = 8 }, /area/horizon/crew_quarters/lounge/bar) @@ -27148,7 +27037,6 @@ /area/maintenance/wing/starboard/far) "naE" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/spline/plain, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -27158,6 +27046,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/effect/landmark/start{ + name = "Chef" + }, /turf/simulated/floor/tiled/white, /area/horizon/kitchen) "naN" = ( @@ -27538,7 +27432,6 @@ /obj/effect/floor_decal/corner/green{ dir = 6 }, -/obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "nio" = ( @@ -27620,9 +27513,6 @@ /area/operations/office) "njB" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, /obj/effect/floor_decal/spline/plain/corner{ dir = 8 }, @@ -27632,6 +27522,7 @@ dir = 2; icon_state = "pipe-c" }, +/obj/effect/floor_decal/spline/plain/corner, /turf/simulated/floor/tiled/white, /area/horizon/kitchen) "njF" = ( @@ -27785,7 +27676,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "nmF" = ( /obj/effect/floor_decal/spline/plain{ @@ -27797,7 +27688,6 @@ /turf/simulated/floor/carpet/rubber, /area/engineering/engine_monitoring/tesla) "nmG" = ( -/obj/effect/floor_decal/spline/plain, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -27928,14 +27818,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/structure/sign/double/barsign{ dir = 4; pixel_x = -64 }, /obj/effect/floor_decal/corner/green/full, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "npL" = ( @@ -28470,10 +28358,11 @@ /turf/simulated/floor/tiled, /area/operations/lobby) "nFQ" = ( -/obj/machinery/floor_light/dance, -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/wood, -/area/horizon/crew_quarters/lounge/bar) +/obj/effect/landmark/entry_point/fore{ + name = "fore, kitchen freezer" + }, +/turf/template_noop, +/area/template_noop) "nFT" = ( /obj/machinery/atmospherics/binary/pump/high_power{ dir = 8; @@ -28563,7 +28452,7 @@ }, /obj/structure/lattice/catwalk, /turf/simulated/open/airless, -/area/template_noop) +/area/horizon/exterior) "nJq" = ( /obj/machinery/door/airlock/multi_tile/glass{ name = "Deck 2 Elevator" @@ -28574,11 +28463,9 @@ /turf/simulated/floor/tiled/full, /area/hallway/primary/central_one) "nJs" = ( -/obj/machinery/biogenerator{ - icon_state = "biogen-empty" - }, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, +/obj/machinery/vending/hydronutrients, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "nJy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -28938,11 +28825,9 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/starboard) "nUh" = ( -/obj/machinery/vending/dinnerware, -/obj/effect/floor_decal/spline/plain/cee{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/grey, +/obj/machinery/vending/dinnerware/bar, +/turf/simulated/floor/tiled/dark/full, /area/horizon/bar) "nUN" = ( /turf/simulated/wall/r_wall, @@ -29116,7 +29001,7 @@ pixel_x = -6; pixel_y = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "nZZ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -29188,13 +29073,13 @@ /turf/simulated/floor/carpet/rubber, /area/engineering/engine_monitoring/tesla) "obi" = ( +/obj/effect/floor_decal/corner/green/diagonal, /obj/structure/mirror{ pixel_y = 36 }, /obj/structure/sink{ pixel_y = 28 }, -/obj/effect/floor_decal/corner/green/diagonal, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/washroom/central) "obr" = ( @@ -29576,15 +29461,6 @@ }, /turf/simulated/floor/tiled, /area/operations/lobby) -"ojz" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/landmark/entry_point/starboard{ - name = "starboard, bar lounge" - }, -/turf/simulated/floor/reinforced/airless, -/area/template_noop) "ojK" = ( /obj/structure/shuttle_part/scc_space_ship{ icon_state = "d3-3-f" @@ -29661,6 +29537,10 @@ /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "omA" = ( @@ -29846,6 +29726,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -25 }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/dark, /area/horizon/bar/backroom) "oqN" = ( @@ -29916,9 +29797,6 @@ /area/turret_protected/ai_upload_foyer) "otr" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, /turf/simulated/floor/wood, /area/horizon/bar) "otw" = ( @@ -30823,7 +30701,7 @@ dir = 8 }, /turf/simulated/floor/lino/grey, -/area/horizon/kitchen/hallway) +/area/horizon/crew_quarters/lounge/bar) "oRF" = ( /obj/structure/foamedmetal, /turf/simulated/floor/plating, @@ -30891,10 +30769,6 @@ "oTa" = ( /turf/simulated/floor/tiled, /area/maintenance/aux_atmospherics/deck_2/starboard/wing) -"oTg" = ( -/obj/machinery/floor_light/dance/alternate, -/turf/simulated/floor/wood, -/area/horizon/crew_quarters/lounge/bar) "oTE" = ( /obj/machinery/light{ dir = 4 @@ -30927,13 +30801,12 @@ "oTR" = ( /obj/machinery/chem_master, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "oUt" = ( /turf/simulated/wall, /area/medical/first_responder) "oUu" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -30944,7 +30817,12 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "oUZ" = ( @@ -31182,19 +31060,18 @@ /area/horizon/kitchen) "pac" = ( /obj/effect/floor_decal/corner/green/diagonal, -/obj/machinery/firealarm/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/bed/handrail{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/washroom/central) "paf" = ( @@ -31700,6 +31577,15 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology) +"pmm" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/horizon/bar) "pmK" = ( /obj/machinery/atmospherics/binary/pump{ dir = 4; @@ -31792,10 +31678,6 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/machinery/camera/network/service{ - c_tag = "Service - Deck 2 - Bar Private Lounge"; - dir = 4 - }, /obj/structure/bed/stool/bar/padded/red, /turf/simulated/floor/wood, /area/horizon/bar) @@ -31836,6 +31718,9 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/horizon/bar) "prh" = ( @@ -31945,17 +31830,6 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/far) -"pvb" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/effect/landmark/start{ - name = "Chef" - }, -/obj/machinery/light, -/turf/simulated/floor/tiled/white, -/area/horizon/kitchen) "pvt" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -32223,9 +32097,6 @@ }, /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_monitoring/tesla) -"pED" = ( -/turf/simulated/wall, -/area/horizon/kitchen/hallway) "pEQ" = ( /obj/structure/foamedmetal, /turf/simulated/floor/plating, @@ -32335,16 +32206,13 @@ name = "Kitchen Desk Shutter" }, /turf/simulated/floor/tiled/dark, -/area/horizon/kitchen/hallway) +/area/horizon/kitchen) "pGD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/floor_decal/spline/plain{ dir = 1 }, /obj/machinery/floor_light/dance/alternate, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark/full, /area/horizon/crew_quarters/lounge/bar) "pGJ" = ( /obj/machinery/light{ @@ -32429,16 +32297,23 @@ /obj/effect/floor_decal/spline/plain{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/machinery/floor_light/dance/alternate, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark/full, /area/horizon/crew_quarters/lounge/bar) "pIE" = ( -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/tiled, -/area/horizon/hallway/deck_two/fore) +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/shutters/open{ + name = "Bar Viewing Shutters"; + id = "bar_viewing_shutters"; + dir = 8 + }, +/obj/effect/landmark/entry_point/starboard{ + name = "starboard, bar lounge" + }, +/turf/simulated/floor/plating, +/area/horizon/bar) "pIV" = ( /obj/machinery/power/tesla_coil, /obj/structure/cable/yellow, @@ -32511,11 +32386,8 @@ /turf/simulated/floor/tiled, /area/hallway/engineering) "pKz" = ( -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1 - }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 + dir = 9 }, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) @@ -32980,7 +32852,8 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "pVY" = ( /obj/structure/cable/orange{ @@ -33052,13 +32925,9 @@ /turf/simulated/floor/plating, /area/engineering/aft_airlock) "pYK" = ( -/obj/machinery/vending/cola, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/item/device/radio/intercom{ - dir = 4; - pixel_x = -21 - }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/vending/coffee, +/obj/effect/floor_decal/industrial/hatch/grey, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_two/fore) "pYU" = ( /obj/structure/lattice/catwalk/indoor/grate, @@ -33240,7 +33109,7 @@ "qcs" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, -/area/horizon/kitchen) +/area/horizon/stairwell/bridge) "qdf" = ( /obj/effect/floor_decal/spline/plain{ dir = 10 @@ -33352,12 +33221,9 @@ /obj/effect/floor_decal/corner/green{ dir = 9 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/light{ - dir = 8 +/obj/machinery/disposal/small/east, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) @@ -33484,9 +33350,9 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/wing/starboard/far) "qhf" = ( -/obj/machinery/vending/snack, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, +/obj/machinery/vending/zora, +/obj/effect/floor_decal/industrial/hatch/grey, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_two/fore) "qhz" = ( /obj/structure/cable/green{ @@ -33649,26 +33515,13 @@ /turf/simulated/floor/tiled/full, /area/horizon/security/office) "qlX" = ( -/obj/effect/floor_decal/corner/green/diagonal, -/obj/structure/toilet{ - dir = 1; - pixel_y = -1 - }, -/obj/machinery/button/remote/airlock{ - dir = 4; - id = "central_stall_1"; - name = "Stall Door Lock"; - pixel_x = -24; - specialfunctions = 4 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/bed/handrail{ - dir = 4 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/effect/floor_decal/spline/plain, +/obj/effect/landmark/start{ + name = "Chef" }, /turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/washroom/central) +/area/horizon/kitchen) "qmy" = ( /obj/item/modular_computer/console/preset/engineering, /obj/effect/floor_decal/industrial/outline/yellow, @@ -33719,21 +33572,11 @@ /turf/simulated/floor/tiled, /area/horizon/hydroponics/garden) "qnB" = ( -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -29 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, /obj/structure/table/stone/marble, /obj/machinery/appliance/mixer/candy{ pixel_y = 8 }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "qnE" = ( /obj/structure/lattice/catwalk, @@ -33749,14 +33592,20 @@ /turf/simulated/open, /area/maintenance/wing/starboard) "qoy" = ( -/obj/effect/floor_decal/spline/plain/corner{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atm{ + pixel_y = 32 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, /turf/simulated/floor/lino/grey, -/area/horizon/kitchen/hallway) +/area/horizon/crew_quarters/lounge/bar) "qpB" = ( /obj/structure/railing/mapped{ dir = 4 @@ -33901,9 +33750,13 @@ dir = 8; pixel_x = 28 }, -/obj/structure/closet/chefcloset, -/obj/item/device/nanoquikpay, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/effect/floor_decal/spline/plain, +/obj/machinery/camera/network/service{ + c_tag = "Dinner - Kitchen 1"; + dir = 8 + }, +/turf/simulated/floor/tiled/white, /area/horizon/kitchen) "qtN" = ( /obj/effect/floor_decal/corner/paleblue{ @@ -33948,7 +33801,6 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/machinery/firealarm/south, /turf/simulated/floor/grass/alt, /area/horizon/hydroponics/garden) "quD" = ( @@ -34161,11 +34013,14 @@ /area/rnd/chemistry) "qyA" = ( /obj/effect/floor_decal/corner/green/diagonal, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/power/apc{ + pixel_y = -24 }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "0-8" }, /obj/structure/disposalpipe/segment{ dir = 8; @@ -34195,6 +34050,7 @@ "qzH" = ( /obj/machinery/light, /obj/effect/floor_decal/spline/plain, +/obj/machinery/firealarm/south, /turf/simulated/floor/tiled/dark, /area/horizon/bar) "qzR" = ( @@ -34354,7 +34210,7 @@ icon_state = "4-8" }, /turf/simulated/floor/lino/grey, -/area/horizon/kitchen/hallway) +/area/horizon/crew_quarters/lounge/bar) "qEd" = ( /obj/effect/floor_decal/corner_wide/yellow{ dir = 9 @@ -34765,12 +34621,13 @@ /obj/structure/table/rack, /obj/item/storage/toolbox/mechanical, /obj/machinery/firealarm/north, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "qPs" = ( -/obj/machinery/vending/coffee, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, +/obj/machinery/vending/mredispenser, +/obj/effect/floor_decal/industrial/hatch/grey, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_two/fore) "qPC" = ( /obj/effect/floor_decal/spline/fancy/wood, @@ -35088,7 +34945,7 @@ pixel_x = 3; pixel_y = -5 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "qVH" = ( /obj/effect/floor_decal/industrial/warning{ @@ -35106,6 +34963,9 @@ /area/rnd/xenobiology) "qVJ" = ( /obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "qVS" = ( @@ -35244,11 +35104,6 @@ }, /turf/simulated/floor/tiled, /area/medical/first_responder) -"rar" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/spline/plain/corner, -/turf/simulated/floor/tiled/white, -/area/horizon/kitchen) "rbe" = ( /obj/effect/floor_decal/corner/green/diagonal, /turf/simulated/floor/tiled, @@ -35310,9 +35165,6 @@ /area/engineering/lobby) "rcl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -35323,6 +35175,7 @@ name = "Hydroponics"; sortType = "Hydroponics" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "rcy" = ( @@ -35748,16 +35601,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) -"rnN" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/item/hullbeacon/red, -/obj/effect/landmark/entry_point/port{ - name = "port, kitchen" - }, -/turf/simulated/floor/reinforced/airless, -/area/template_noop) "rnO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -36196,7 +36039,7 @@ pixel_x = 3; pixel_y = -5 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "ryb" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ @@ -36260,7 +36103,7 @@ /obj/structure/railing/mapped, /obj/item/hullbeacon/red, /turf/simulated/open/airless, -/area/template_noop) +/area/horizon/exterior) "rzm" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ @@ -36318,6 +36161,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, +/obj/machinery/firealarm/west, /turf/simulated/floor/grass/alt, /area/horizon/hydroponics/garden) "rAw" = ( @@ -36333,15 +36177,6 @@ }, /turf/simulated/open/airless, /area/horizon/exterior) -"rBi" = ( -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 4 - }, -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/horizon/bar) "rBz" = ( /obj/effect/floor_decal/spline/fancy/wood/cee, /obj/structure/railing/mapped{ @@ -36508,8 +36343,8 @@ /obj/structure/table/stone/marble, /obj/machinery/chemical_dispenser/bar_soft/full{ dir = 8; - pixel_x = 5; - pixel_y = 4 + pixel_x = 4; + pixel_y = 3 }, /obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ @@ -36517,7 +36352,7 @@ name = "Kitchen Desk Shutter" }, /turf/simulated/floor/tiled/dark, -/area/horizon/kitchen/hallway) +/area/horizon/kitchen) "rGx" = ( /obj/structure/bed/stool/chair/office/light{ dir = 8 @@ -36573,6 +36408,9 @@ name = "sink"; pixel_x = 21 }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 32 + }, /turf/simulated/floor/tiled/white, /area/horizon/kitchen) "rHw" = ( @@ -36636,9 +36474,6 @@ /area/medical/psych) "rIZ" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, /turf/simulated/floor/wood, /area/horizon/bar) "rJn" = ( @@ -36980,6 +36815,9 @@ /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 }, +/obj/structure/railing/mapped{ + dir = 8 + }, /turf/simulated/floor/wood, /area/horizon/bar) "rRe" = ( @@ -36997,21 +36835,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/spline/fancy/wood/cee{ - dir = 4 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/full, /area/horizon/kitchen) "rRX" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, /obj/machinery/chem_master/condimaster{ pixel_y = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "rSv" = ( /obj/structure/cable{ @@ -37058,15 +36890,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/effect/floor_decal/spline/plain/corner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "rSE" = ( @@ -37177,12 +37009,6 @@ "rVg" = ( /turf/simulated/wall, /area/operations/office) -"rVv" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/template_noop) "rVL" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -37382,10 +37208,6 @@ pixel_x = 4; pixel_y = 16 }, -/obj/item/storage/box/gloves{ - pixel_x = 5; - pixel_y = -2 - }, /obj/item/reagent_containers/glass/beaker/large{ pixel_x = -9; pixel_y = 15 @@ -37394,10 +37216,11 @@ pixel_x = -9; pixel_y = 6 }, -/obj/machinery/light{ - dir = 4 +/obj/item/storage/box/gloves{ + pixel_x = 5; + pixel_y = -2 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "sbO" = ( /obj/machinery/power/smes/buildable{ @@ -37726,18 +37549,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/maintenance/aux_atmospherics/deck_2/starboard/wing) -"slk" = ( -/obj/effect/floor_decal/corner/green{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain/corner{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/horizon/hallway/deck_two/fore) "slm" = ( /turf/simulated/floor/wood, /area/horizon/library) @@ -37746,12 +37557,6 @@ dir = 1 }, /obj/structure/window/shuttle/scc_space_ship, -/obj/machinery/door/blast/shutters/open{ - name = "Bar Viewing Shutters"; - id = "bar_viewing_shutters"; - dir = 2 - }, -/obj/machinery/door/firedoor, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, @@ -38006,11 +37811,8 @@ /turf/simulated/floor/tiled/dark, /area/engineering/aft_airlock) "ssh" = ( -/obj/structure/grille/diagonal{ - dir = 8 - }, -/obj/structure/window/shuttle/scc_space_ship, -/obj/machinery/door/firedoor, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/reagent_dispensers/cookingoil, /turf/simulated/floor/tiled/freezer{ name = "cooled tiles"; temperature = 253.15 @@ -38183,14 +37985,8 @@ name = "Bar - Preparations"; req_access = list(25) }, -/obj/effect/floor_decal/corner/grey{ - dir = 9 - }, -/obj/effect/floor_decal/corner/grey{ - dir = 6 - }, /obj/machinery/door/firedoor, -/turf/simulated/floor/lino/grey, +/turf/simulated/floor/tiled/full, /area/horizon/bar) "sxl" = ( /obj/structure/table/standard, @@ -38287,12 +38083,17 @@ /turf/simulated/wall, /area/maintenance/aux_atmospherics/deck_2/starboard) "sBy" = ( -/obj/effect/floor_decal/corner/green{ - dir = 9 +/obj/structure/flora/ausbushes/sparsegrass, +/obj/machinery/portable_atmospherics/hydroponics/soil, +/obj/effect/floor_decal/spline/plain{ + dir = 8 }, -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/tiled, -/area/horizon/hallway/deck_two/fore) +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = -24 + }, +/turf/simulated/floor/grass/alt, +/area/horizon/hydroponics/garden) "sBE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/lino/grey, @@ -38421,10 +38222,14 @@ /obj/structure/closet/secure_closet/freezer, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "sGq" = ( +/obj/machinery/camera/network/service{ + c_tag = "Service - Deck 2 - Bar Backroom"; + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/horizon/bar/backroom) "sGG" = ( @@ -38544,8 +38349,8 @@ /turf/simulated/floor/tiled, /area/storage/primary) "sJq" = ( -/obj/machinery/floor_light/dance, -/turf/simulated/floor/wood, +/obj/machinery/floor_light/dance/alternate, +/turf/simulated/floor/tiled/dark/full, /area/horizon/crew_quarters/lounge/bar) "sJS" = ( /obj/structure/cable/orange{ @@ -38731,12 +38536,12 @@ /turf/simulated/floor/carpet/rubber, /area/engineering/engine_monitoring) "sOe" = ( +/obj/machinery/light{ + dir = 1 + }, /obj/effect/floor_decal/corner/grey{ dir = 5 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/table/stone/marble, -/obj/item/reagent_containers/food/drinks/teapot, /obj/machinery/requests_console{ department = "Bar"; departmentType = 1; @@ -38750,17 +38555,6 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, /area/horizon/library) -"sPp" = ( -/obj/structure/grille, -/obj/machinery/door/blast/shutters/open{ - name = "kitchen window shutter"; - id = "kitchen_window_shutters"; - dir = 2 - }, -/obj/structure/window/shuttle/scc_space_ship, -/obj/machinery/door/firedoor, -/turf/simulated/floor/reinforced/airless, -/area/horizon/kitchen) "sPK" = ( /obj/structure/table/stone/marble, /obj/item/storage/box/plasticbag{ @@ -38784,7 +38578,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "sPY" = ( /obj/structure/cable{ @@ -38864,10 +38658,8 @@ req_access = list(28) }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/freezer{ - name = "cooled tiles"; - temperature = 253.15 - }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, /area/horizon/kitchen/freezer) "sTu" = ( /obj/machinery/power/apc{ @@ -39123,7 +38915,7 @@ dir = 1 }, /turf/simulated/floor/tiled/dark, -/area/horizon/kitchen) +/area/horizon/stairwell/bridge) "sYS" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -25 @@ -39356,11 +39148,34 @@ /obj/effect/floor_decal/spline/plain/corner{ dir = 1 }, -/obj/machinery/media/jukebox/audioconsole/wall{ - pixel_y = -32 +/obj/machinery/light, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -24; + pixel_y = 7 }, -/obj/machinery/camera/network/service{ - c_tag = "Dinner - Kitchen 2"; +/obj/machinery/button/remote/blast_door{ + name = "Window Shutters"; + id = "kitchen_window_shutters"; + pixel_x = -25; + req_access = list(28); + dir = 4; + pixel_y = -4 + }, +/obj/machinery/button/remote/blast_door{ + name = "Desk Shutters"; + id = "shutters_deck2_kitchendesk"; + pixel_x = -35; + pixel_y = -4; + req_access = list(28); + dir = 4 + }, +/obj/machinery/button/remote/blast_door{ + name = "SmartHeater Shutter"; + id = "shutters_deck2_smartheater"; + pixel_x = -35; + pixel_y = 7; + req_access = list(28); dir = 4 }, /turf/simulated/floor/tiled/white, @@ -39511,7 +39326,7 @@ dir = 10 }, /turf/simulated/floor/lino/grey, -/area/horizon/kitchen/hallway) +/area/horizon/crew_quarters/lounge/bar) "tis" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/lattice/catwalk/indoor/grate, @@ -39568,7 +39383,7 @@ name = "Kitchen Desk Shutter" }, /turf/simulated/floor/tiled/dark, -/area/horizon/kitchen/hallway) +/area/horizon/kitchen) "tiG" = ( /obj/machinery/flasher{ id = "permflash" @@ -39640,25 +39455,23 @@ /turf/simulated/floor/tiled/dark, /area/rnd/strongroom) "tjS" = ( +/obj/structure/grille, /obj/machinery/door/firedoor, -/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/window/shuttle/scc_space_ship/cardinal, /obj/machinery/door/blast/shutters/open{ - name = "kitchen window shutter"; + name = "Viewing Shutter"; id = "kitchen_window_shutters"; dir = 2 }, -/obj/structure/grille/diagonal{ - dir = 1 - }, -/obj/effect/floor_decal/corner/grey/diagonal, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/plating, /area/horizon/kitchen) "tjT" = ( /obj/effect/floor_decal/corner/green{ dir = 6 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, /obj/structure/disposalpipe/segment{ dir = 8; @@ -39667,9 +39480,6 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "tki" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -39835,7 +39645,13 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/horizon/hydroponics) "tpy" = ( /obj/structure/sink/kitchen{ @@ -39849,12 +39665,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/ors) -"tqC" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/shuttle/scc_space_ship, -/turf/simulated/floor/plating, -/area/horizon/kitchen/freezer) "tqF" = ( /obj/structure/table/standard, /obj/item/reagent_containers/glass/beaker/large, @@ -39955,10 +39765,16 @@ /turf/simulated/floor/reinforced/airless, /area/template_noop) "tvk" = ( -/obj/structure/sink/kitchen{ +/obj/machinery/alarm/freezer{ dir = 4; - name = "sink"; - pixel_x = -20 + pixel_x = -28 + }, +/obj/machinery/camera/network/service{ + c_tag = "Dinner - Kitchen Freezer"; + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/tiled/freezer{ name = "cooled tiles"; @@ -40522,9 +40338,16 @@ /turf/simulated/floor/tiled/dark, /area/medical/gen_treatment) "tHI" = ( -/obj/machinery/vending/zora, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = -24 + }, +/obj/effect/floor_decal/corner/green/full, +/obj/effect/floor_decal/spline/plain, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_two/fore) "tHV" = ( /obj/effect/floor_decal/corner_wide/paleblue{ @@ -40712,7 +40535,7 @@ dir = 8 }, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "tME" = ( /obj/machinery/camera/network/second_deck{ c_tag = "Second Deck - Research Emergency Supplies Closet" @@ -40922,9 +40745,6 @@ /obj/effect/floor_decal/corner/green{ dir = 6 }, -/obj/machinery/newscaster{ - pixel_x = 32 - }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "tRz" = ( @@ -41025,6 +40845,9 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/freezer{ name = "cooled tiles"; temperature = 253.15 @@ -41451,7 +41274,7 @@ dir = 8 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 + dir = 1 }, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) @@ -41536,6 +41359,13 @@ /area/medical/cryo) "uhw" = ( /obj/structure/table/wood, +/obj/machinery/alarm{ + pixel_y = 28; + req_one_access = list(24,11,55) + }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/horizon/bar/backroom) "uhE" = ( @@ -41628,11 +41458,11 @@ /turf/simulated/floor/tiled, /area/hallway/engineering) "uki" = ( -/obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, /obj/machinery/door/firedoor, +/obj/structure/window/shuttle/scc_space_ship/cardinal, /turf/simulated/floor/plating, -/area/horizon/kitchen) +/area/horizon/stairwell/bridge) "ukp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -41776,14 +41606,17 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/item/device/radio/intercom{ dir = 4; - pixel_x = -21 + pixel_x = -24 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "uma" = ( /obj/structure/lattice/catwalk, /obj/structure/reagent_dispensers/watertank, /obj/item/reagent_containers/glass/bucket, +/obj/machinery/camera/network/service{ + c_tag = "Dinner - Hydroponics 1" + }, /turf/simulated/open, /area/horizon/hydroponics) "umH" = ( @@ -42129,11 +41962,11 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/machinery/orderterminal{ - pixel_x = 32 +/obj/machinery/light{ + dir = 4 }, /turf/simulated/floor/lino/grey, -/area/horizon/kitchen/hallway) +/area/horizon/crew_quarters/lounge/bar) "usK" = ( /obj/structure/closet/radiation, /obj/structure/window/reinforced{ @@ -42174,8 +42007,11 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/effect/floor_decal/corner/green{ - dir = 9 +/obj/effect/floor_decal/corner/green/full{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) @@ -42261,16 +42097,9 @@ /obj/effect/floor_decal/corner/green{ dir = 10 }, -/obj/machinery/camera/network/second_deck{ - c_tag = "Second Deck - Dinner Entrance 2"; - dir = 1 - }, -/obj/machinery/atm{ +/obj/structure/extinguisher_cabinet{ pixel_y = -32 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "uwi" = ( @@ -42281,14 +42110,12 @@ /turf/simulated/floor/tiled, /area/medical/gen_treatment) "uws" = ( -/obj/machinery/firealarm/east, -/obj/effect/floor_decal/corner/grey/full{ - dir = 1 +/obj/structure/table/stone/marble, +/obj/machinery/reagentgrinder{ + pixel_x = 4; + pixel_y = 18 }, -/obj/machinery/vending/dinnerware{ - pixel_y = 15 - }, -/turf/simulated/floor/lino/grey, +/turf/simulated/floor/tiled/dark/full, /area/horizon/bar) "uwP" = ( /obj/structure/disposalpipe/segment, @@ -42298,14 +42125,11 @@ /turf/simulated/floor/tiled, /area/operations/break_room) "uxb" = ( -/obj/effect/floor_decal/spline/plain/cee{ - dir = 1 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_service{ - name = "Private Bar" + name = "Bar Lounge" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/horizon/bar) "uxf" = ( /obj/machinery/mecha_part_fabricator{ @@ -42341,6 +42165,9 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "uxr" = ( +/obj/machinery/light{ + dir = 4 + }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, @@ -42617,12 +42444,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/research) -"uGh" = ( -/obj/structure/ladder{ - pixel_y = 16 - }, -/turf/simulated/open/airless, -/area/template_noop) "uGp" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -42686,9 +42507,6 @@ /area/engineering/atmos/storage) "uHq" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/spline/plain/corner{ - dir = 8 - }, /obj/effect/floor_decal/spline/plain{ dir = 4 }, @@ -42703,9 +42521,8 @@ }, /obj/machinery/disposal/small/south, /obj/structure/disposalpipe/trunk, -/obj/machinery/camera/network/service{ - c_tag = "Dinner - Kitchen 1"; - pixel_x = -6 +/obj/effect/floor_decal/spline/plain{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/horizon/kitchen) @@ -42868,12 +42685,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /obj/effect/floor_decal/corner/green{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "uLw" = ( @@ -42983,28 +42798,22 @@ /turf/simulated/floor/tiled/dark, /area/security/checkpoint2) "uNs" = ( -/obj/structure/kitchenspike, -/obj/machinery/camera/network/service{ - c_tag = "Dinner - Kitchen Freezer"; - dir = 4 - }, +/obj/structure/closet/secure_closet/freezer/meat, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/light, /turf/simulated/floor/tiled/freezer{ name = "cooled tiles"; temperature = 253.15 }, /area/horizon/kitchen/freezer) "uNL" = ( +/obj/structure/lattice/catwalk, /obj/machinery/button/remote/blast_door{ dir = 8; id = "shutters_deck2_hydroponicswindowssafety"; name = "Viewing Shutters"; - pixel_y = 32; - pixel_x = 32 - }, -/obj/structure/lattice/catwalk, -/obj/machinery/camera/network/service{ - c_tag = "Service - Hydroponics 1"; - dir = 8 + pixel_x = 25; + pixel_y = -7 }, /turf/simulated/open, /area/horizon/hydroponics) @@ -43113,20 +42922,15 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/alarm{ + pixel_y = 28; + req_one_access = list(24,11,55) }, /obj/structure/disposalpipe/junction{ dir = 4 }, /turf/simulated/floor/lino/grey, -/area/horizon/kitchen/hallway) +/area/horizon/crew_quarters/lounge/bar) "uQQ" = ( /obj/machinery/light, /obj/effect/floor_decal/spline/plain, @@ -43287,18 +43091,11 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_monitoring/tesla) "uUn" = ( -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" - }, -/obj/machinery/floor_light/dance, /obj/effect/floor_decal/spline/plain{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/wood, +/obj/machinery/floor_light/dance/alternate, +/turf/simulated/floor/tiled/dark/full, /area/horizon/crew_quarters/lounge/bar) "uUz" = ( /obj/item/device/radio/intercom{ @@ -43433,13 +43230,10 @@ /turf/simulated/floor/tiled/dark, /area/horizon/bar/backroom) "uZi" = ( -/obj/effect/floor_decal/spline/fancy/wood/cee{ - dir = 1 - }, /obj/machinery/door/airlock/service{ name = "Bar - Private Lounge" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/full, /area/horizon/bar) "uZs" = ( /obj/structure/table/wood, @@ -43707,15 +43501,19 @@ /turf/simulated/floor/tiled/full, /area/horizon/security/armoury) "vgh" = ( -/obj/item/hullbeacon/red, +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/structure/window/shuttle/scc_space_ship, +/obj/machinery/door/blast/shutters/open{ + name = "lounge window shutter"; + id = "lounge_window_shutters"; + dir = 2 + }, /obj/effect/landmark/entry_point/fore{ - name = "fore, kitchen" + name = "fore, dining hall" }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/template_noop) +/turf/simulated/floor/plating, +/area/horizon/crew_quarters/lounge/bar) "vgt" = ( /obj/structure/disposaloutlet{ dir = 1; @@ -43743,9 +43541,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/spline/fancy/wood/corner, -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, /turf/simulated/floor/wood, /area/horizon/bar) @@ -43822,7 +43619,7 @@ }, /obj/machinery/firealarm/south, /turf/simulated/floor/tiled/dark, -/area/horizon/kitchen) +/area/horizon/stairwell/bridge) "vkb" = ( /obj/structure/railing/mapped{ dir = 8 @@ -44169,9 +43966,6 @@ dir = 8 }, /obj/structure/bed/stool/chair/padded/red, -/obj/machinery/newscaster{ - pixel_x = -32 - }, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "vxe" = ( @@ -44212,7 +44006,7 @@ }, /obj/machinery/disposal/small/north, /turf/simulated/floor/lino/grey, -/area/horizon/kitchen/hallway) +/area/horizon/crew_quarters/lounge/bar) "vxY" = ( /obj/structure/cable{ icon_state = "1-2" @@ -44240,11 +44034,15 @@ /area/rnd/conference) "vyg" = ( /obj/effect/floor_decal/corner/green/diagonal, -/obj/machinery/recharge_station, /obj/machinery/light/small{ dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/mirror{ + pixel_y = 36 + }, +/obj/structure/sink{ + pixel_y = 28 + }, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/washroom/central) "vyk" = ( @@ -44458,7 +44256,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/horizon/kitchen) +/area/horizon/stairwell/bridge) "vDT" = ( /obj/effect/floor_decal/corner/brown/full{ dir = 1 @@ -44594,6 +44392,10 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/disposal/small/east, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "vHl" = ( @@ -44757,6 +44559,9 @@ /obj/effect/floor_decal/corner/grey{ dir = 10 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /obj/machinery/camera/network/service{ c_tag = "Service - Deck 2 - Bar Preparation Room"; dir = 1 @@ -44778,7 +44583,8 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, /area/horizon/kitchen) "vKg" = ( /obj/structure/bed/stool/chair, @@ -44851,9 +44657,8 @@ dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 + dir = 5 }, -/obj/effect/floor_decal/spline/fancy/wood/corner, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "vNI" = ( @@ -44929,33 +44734,12 @@ /obj/effect/floor_decal/spline/plain/corner{ dir = 1 }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -21; - pixel_y = -12 - }, /obj/effect/floor_decal/spline/plain/corner, /obj/structure/disposalpipe/segment, -/obj/machinery/button/remote/blast_door{ - name = "Kitchen window shutters"; - id = "kitchen_window_shutters"; - pixel_x = -24; - pixel_y = 12; - req_access = list(28) - }, -/obj/machinery/button/remote/blast_door{ - name = "Kitchen counter shutters"; - id = "shutters_deck2_kitchendesk"; - pixel_x = -24; - pixel_y = 4; - req_access = list(28) - }, -/obj/machinery/button/remote/blast_door{ - name = "Smartheater shutters"; - id = "shutters_deck2_smartheater"; - pixel_x = -24; - pixel_y = -4; - req_access = list(28) +/obj/machinery/firealarm/west, +/obj/machinery/camera/network/service{ + c_tag = "Dinner - Kitchen 2"; + dir = 4 }, /turf/simulated/floor/tiled/white, /area/horizon/kitchen) @@ -45194,13 +44978,12 @@ /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "vSd" = ( @@ -45232,7 +45015,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, -/area/horizon/kitchen) +/area/horizon/stairwell/bridge) "vTk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -45240,7 +45023,9 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled/freezer{ name = "cooled tiles"; temperature = 253.15 @@ -45297,11 +45082,11 @@ dir = 6 }, /obj/machinery/chem_master/condimaster, -/obj/effect/floor_decal/corner/grey/full{ - dir = 4 +/obj/effect/floor_decal/corner/grey{ + dir = 10 }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/lino/grey, +/obj/effect/floor_decal/industrial/hatch/grey, +/turf/simulated/floor/tiled/dark/full, /area/horizon/bar) "vUK" = ( /obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor, @@ -45322,10 +45107,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/spline/fancy/wood/cee{ - dir = 4 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/full, /area/horizon/bar) "vVv" = ( /obj/structure/table/rack, @@ -45387,29 +45169,11 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/media/jukebox/audioconsole/wall{ + pixel_x = -32 + }, /turf/simulated/floor/tiled/white, /area/horizon/kitchen) -"vWX" = ( -/obj/effect/floor_decal/corner/green/diagonal, -/obj/structure/toilet{ - dir = 1; - pixel_y = -1 - }, -/obj/machinery/button/remote/airlock{ - dir = 8; - id = "central_stall_2"; - name = "Stall Door Lock"; - pixel_x = 24; - specialfunctions = 4 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/bed/handrail{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/washroom/central) "vXn" = ( /obj/structure/railing/mapped{ dir = 8 @@ -45421,7 +45185,7 @@ dir = 5 }, /turf/simulated/floor/lino/grey, -/area/horizon/kitchen/hallway) +/area/horizon/crew_quarters/lounge/bar) "vXp" = ( /obj/structure/grille, /obj/structure/railing/mapped, @@ -45471,11 +45235,6 @@ /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) -"vXG" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/wood, -/area/horizon/crew_quarters/lounge/bar) "vXX" = ( /obj/machinery/light/small{ dir = 1 @@ -45702,12 +45461,23 @@ /turf/simulated/floor/tiled, /area/maintenance/wing/starboard) "wbE" = ( -/obj/effect/floor_decal/industrial/warning/corner{ +/obj/effect/floor_decal/corner/green/diagonal, +/obj/structure/toilet{ + dir = 1; + pixel_y = -1 + }, +/obj/machinery/button/remote/airlock{ + dir = 8; + id = "central_stall_2"; + name = "Stall Door Lock"; + pixel_x = 24; + specialfunctions = 4 + }, +/obj/machinery/light/small{ dir = 8 }, -/obj/item/hullbeacon/red, -/turf/simulated/floor/reinforced/airless, -/area/template_noop) +/turf/simulated/floor/tiled/white, +/area/horizon/crew_quarters/washroom/central) "wbL" = ( /obj/machinery/light/small{ dir = 8 @@ -45974,11 +45744,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) -"whs" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/obj/item/hullbeacon/red, -/turf/simulated/floor/reinforced/airless, -/area/template_noop) "whx" = ( /obj/structure/cable{ icon_state = "2-4" @@ -46030,15 +45795,18 @@ dir = 5 }, /obj/effect/floor_decal/spline/plain, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/effect/floor_decal/spline/plain/corner{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain/corner{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "wiB" = ( @@ -46186,18 +45954,13 @@ /turf/simulated/open, /area/horizon/maintenance/deck_two/fore/starboard) "wmt" = ( -/obj/structure/grille/diagonal{ - dir = 4 +/obj/machinery/icecream_vat, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/freezer{ + name = "cooled tiles"; + temperature = 253.15 }, -/obj/machinery/door/blast/shutters/open{ - name = "kitchen window shutter"; - id = "kitchen_window_shutters"; - dir = 2 - }, -/obj/structure/window/shuttle/scc_space_ship, -/obj/machinery/door/firedoor, -/turf/simulated/floor/reinforced, -/area/horizon/kitchen) +/area/horizon/kitchen/freezer) "wmz" = ( /obj/effect/floor_decal/corner_wide/blue{ dir = 10 @@ -46473,7 +46236,8 @@ /area/engineering/locker_room) "wrK" = ( /obj/machinery/appliance/cooker/oven, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "wrO" = ( /obj/effect/floor_decal/industrial/warning{ @@ -46670,10 +46434,15 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology) "wyK" = ( -/obj/structure/grille/diagonal, +/obj/structure/grille, /obj/machinery/door/firedoor, -/obj/structure/window/shuttle/scc_space_ship, -/turf/simulated/floor/reinforced, +/obj/structure/window/shuttle/scc_space_ship/cardinal, +/obj/machinery/door/blast/shutters/open{ + name = "Viewing Shutter"; + id = "kitchen_window_shutters"; + dir = 4 + }, +/turf/simulated/floor/plating, /area/horizon/kitchen/freezer) "wyV" = ( /turf/simulated/wall, @@ -46700,7 +46469,7 @@ "wzs" = ( /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "wzD" = ( /obj/machinery/camera/network/engineering{ c_tag = "Engineering - Hallway 3"; @@ -46811,7 +46580,6 @@ /turf/simulated/floor/tiled/dark, /area/horizon/hydroponics/garden) "wCm" = ( -/obj/effect/floor_decal/spline/plain, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -46877,18 +46645,15 @@ name = "Kitchen Desk Shutter" }, /turf/simulated/floor/tiled/dark, -/area/horizon/kitchen/hallway) +/area/horizon/kitchen) "wDv" = ( /obj/structure/bed/stool/chair/padded/brown, /turf/simulated/floor/carpet/red, /area/horizon/library) "wDG" = ( /obj/effect/floor_decal/corner/green/diagonal, -/obj/machinery/power/apc{ - pixel_y = -24 - }, -/obj/structure/cable/green{ - icon_state = "0-8" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/washroom/central) @@ -46896,11 +46661,8 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/machinery/floor_light/dance/alternate, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark/full, /area/horizon/crew_quarters/lounge/bar) "wDR" = ( /obj/structure/cable{ @@ -47382,13 +47144,15 @@ /turf/simulated/wall, /area/horizon/custodial/auxiliary) "wNI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/lino/grey, /area/horizon/bar) "wNQ" = ( @@ -47517,6 +47281,7 @@ pixel_y = -32 }, /obj/effect/floor_decal/spline/plain, +/obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/horizon/bar) "wRu" = ( @@ -47537,9 +47302,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/cable/green{ icon_state = "1-4" }, @@ -47549,6 +47311,9 @@ /obj/effect/landmark/start{ name = "Bartender" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/lino/grey, /area/horizon/bar) "wSG" = ( @@ -47665,14 +47430,23 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room/tesla) "wVT" = ( -/obj/effect/floor_decal/corner/green{ - dir = 1 +/obj/effect/floor_decal/corner/green/diagonal, +/obj/structure/toilet{ + dir = 1; + pixel_y = -1 }, -/obj/effect/floor_decal/spline/plain/corner{ +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "central_stall_1"; + name = "Stall Door Lock"; + pixel_x = -24; + specialfunctions = 4 + }, +/obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/horizon/hallway/deck_two/fore) +/turf/simulated/floor/tiled/white, +/area/horizon/crew_quarters/washroom/central) "wWh" = ( /obj/effect/floor_decal/corner/blue{ dir = 10 @@ -47849,15 +47623,6 @@ }, /turf/simulated/floor/tiled, /area/operations/lower/machinist) -"wZF" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/horizon/crew_quarters/lounge/bar) "wZJ" = ( /turf/simulated/floor/plating, /area/engineering/aft_airlock) @@ -48401,11 +48166,14 @@ }, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/hydroponics) "xlL" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/bush/grove, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/grass/alt, /area/horizon/hallway/deck_two/fore) "xlP" = ( @@ -48434,9 +48202,8 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical) "xlV" = ( -/obj/structure/railing/mapped, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/ramp/bottom{ +/turf/simulated/floor/tiled/ramp{ dir = 4 }, /area/horizon/crew_quarters/lounge/bar) @@ -48684,8 +48451,8 @@ /area/horizon/crew_quarters/lounge/bar) "xtW" = ( /obj/effect/floor_decal/plaque{ - name = "SCCV Horizon Plaque"; - desc = "The unbreakable chainlink, the one thing holding the Orion Spur together..." + name = "\improper SCCV Horizon plaque"; + desc = "A plaque commemorating the SCCV Horizon's launch by the unbreakable chainlink, the SCC. The one thing holding the Orion Spur together. According to some, anyways." }, /obj/effect/floor_decal/spline/fancy/wood/full, /turf/simulated/floor/wood, @@ -48783,10 +48550,7 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/structure/railing/mapped{ - dir = 1 - }, -/turf/simulated/floor/tiled/ramp/bottom{ +/turf/simulated/floor/tiled/ramp{ dir = 4 }, /area/horizon/crew_quarters/lounge/bar) @@ -48873,6 +48637,18 @@ /area/rnd/strongroom) "xzE" = ( /obj/structure/table/stone/marble, +/obj/machinery/camera/network/service{ + c_tag = "Dinner - Kitchen 3"; + dir = 8 + }, +/obj/item/reagent_containers/food/condiment/enzyme{ + pixel_x = -9; + pixel_y = 9 + }, +/obj/item/reagent_containers/food/condiment/enzyme{ + pixel_x = -9; + pixel_y = 5 + }, /obj/item/reagent_containers/food/condiment/shaker/peppermill{ pixel_x = -4; pixel_y = 11 @@ -48881,14 +48657,6 @@ pixel_x = -4; pixel_y = 7 }, -/obj/item/reagent_containers/food/condiment/shaker/salt{ - pixel_x = 8; - pixel_y = 11 - }, -/obj/item/reagent_containers/food/condiment/shaker/salt{ - pixel_x = 8; - pixel_y = 7 - }, /obj/item/reagent_containers/food/condiment/shaker/spacespice{ pixel_x = 3; pixel_y = 7 @@ -48897,25 +48665,15 @@ pixel_x = 3; pixel_y = 1 }, -/obj/item/reagent_containers/food/condiment/enzyme{ - pixel_x = -9; - pixel_y = 9 +/obj/item/reagent_containers/food/condiment/shaker/salt{ + pixel_x = 8; + pixel_y = 11 }, -/obj/item/reagent_containers/food/condiment/enzyme{ - pixel_x = -9; - pixel_y = 5 +/obj/item/reagent_containers/food/condiment/shaker/salt{ + pixel_x = 8; + pixel_y = 7 }, -/obj/machinery/requests_console{ - department = "Kitchen"; - departmentType = 1; - name = "Kitchen Requests Console"; - pixel_x = 32 - }, -/obj/machinery/camera/network/service{ - c_tag = "Dinner - Kitchen 3"; - dir = 8 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "xzK" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green{ @@ -48959,14 +48717,10 @@ dir = 2; name = "Public Garden" }, -/obj/effect/floor_decal/spline/plain/cee, /obj/machinery/door/firedoor/multi_tile{ dir = 1 }, -/obj/effect/floor_decal/spline/plain/corner{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/horizon/hydroponics/garden) "xBN" = ( /obj/machinery/light{ @@ -48982,15 +48736,12 @@ dir = 8; req_access = list(25) }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/door/blast/shutters{ dir = 8; id = "bar_shutter"; name = "Bar Shutter" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/bar) "xCx" = ( /obj/structure/cable/green{ @@ -49075,7 +48826,7 @@ icon_state = "1-4" }, /turf/simulated/floor/lino/grey, -/area/horizon/kitchen/hallway) +/area/horizon/crew_quarters/lounge/bar) "xDR" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ @@ -49275,9 +49026,9 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/vending/mredispenser, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, +/obj/machinery/vending/cola, +/obj/effect/floor_decal/industrial/hatch/grey, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_two/fore) "xJA" = ( /obj/structure/cable/green{ @@ -49470,11 +49221,14 @@ /turf/simulated/wall, /area/horizon/hydroponics/garden) "xOs" = ( -/obj/effect/floor_decal/corner/grey{ +/obj/effect/floor_decal/corner/green{ dir = 8 }, -/turf/simulated/floor/lino/grey, -/area/horizon/bar) +/obj/effect/floor_decal/spline/plain/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_two/fore) "xOA" = ( /obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/air/airlock, @@ -49531,9 +49285,8 @@ /area/rnd/xenobiology/xenoflora) "xPY" = ( /obj/machinery/chem_heater, -/obj/effect/floor_decal/corner/grey/full, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/lino/grey, +/obj/effect/floor_decal/industrial/hatch/grey, +/turf/simulated/floor/tiled/dark/full, /area/horizon/bar) "xQg" = ( /obj/machinery/camera/network/supply{ @@ -49710,9 +49463,6 @@ /turf/simulated/floor/tiled/white, /area/medical/main_storage) "xSZ" = ( -/obj/effect/floor_decal/spline/plain/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -49724,8 +49474,11 @@ dir = 1; icon_state = "pipe-c" }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, /turf/simulated/floor/lino/grey, -/area/horizon/kitchen/hallway) +/area/horizon/crew_quarters/lounge/bar) "xUK" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 @@ -49853,16 +49606,7 @@ /turf/simulated/floor/tiled/full, /area/engineering/engine_airlock) "xXi" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/structure/railing/mapped{ - dir = 8 - }, -/turf/simulated/floor/tiled/ramp/bottom{ +/turf/simulated/floor/tiled/ramp{ dir = 1 }, /area/horizon/bar) @@ -49899,6 +49643,7 @@ dir = 8 }, /obj/machinery/disposal/small/west, +/obj/machinery/firealarm/east, /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, @@ -50341,13 +50086,12 @@ name = "Hydroponics"; req_access = list(35) }, -/obj/effect/floor_decal/corner/green/diagonal, -/obj/effect/floor_decal/corner/green/diagonal{ - dir = 8 - }, /obj/machinery/door/firedoor, -/obj/effect/floor_decal/spline/plain/cee, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/green{ + dir = 1 + }, +/obj/effect/floor_decal/corner/grey, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "yfL" = ( /obj/machinery/camera/network/second_deck{ @@ -50576,11 +50320,8 @@ /obj/effect/floor_decal/spline/plain{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/machinery/floor_light/dance/alternate, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark/full, /area/horizon/crew_quarters/lounge/bar) "ylk" = ( /obj/effect/floor_decal/corner/green/full{ @@ -67325,22 +67066,22 @@ fol xIW lNQ ekX -ojz -mLU -keG -mLU -mLU -mLU -keG -mLU -mLU -jvu -keG -mLU -mLU -mLU -mLU -eTQ +xXW +xXW +xXW +xXW +xXW +xXW +xXW +xXW +xXW +xXW +xXW +xXW +xXW +xXW +xXW +gNm qgN qgN qgN @@ -67527,7 +67268,7 @@ fol fol lNQ gBp -gBp +pIE wMg oYM oYM @@ -67542,8 +67283,8 @@ oYM fUj fUj iav -wbE -eTQ +tMp +gNm qgN qgN qgN @@ -67746,7 +67487,7 @@ ppn slE fRg tMp -eTQ +gNm qgN qgN qgN @@ -67929,7 +67670,7 @@ kYw gun fsZ nxI -lAx +pmm rTC wAb mLL @@ -67948,7 +67689,7 @@ rTC czP eRT fRg -xer +xVu qgN qgN qgN @@ -68137,7 +67878,7 @@ aqT miP xCr nxI -lYV +vZy tQA vZy obs @@ -68145,12 +67886,12 @@ enE kca lJg uZi -rBi +lAx uzd xXi giH etT -mxf +xVu qgN qgN qgN @@ -68352,7 +68093,7 @@ lIL rQO giH kfZ -xer +xVu qgN qgN qgN @@ -68554,7 +68295,7 @@ aas crn giH etT -xer +xVu qgN qgN qgN @@ -68756,7 +68497,7 @@ aas crn giH etT -mxf +xVu qgN qgN qgN @@ -68948,7 +68689,7 @@ nxI gwy rIZ gBK -cfc +fkr oAw pZs jHp @@ -68958,7 +68699,7 @@ aas crn dLP uMs -xer +xVu qgN qgN qgN @@ -69136,8 +68877,8 @@ rYM wMP mqN bpC -qvd -vWX +bGH +bGH vNQ bYY nJy @@ -69160,7 +68901,7 @@ jjF eEx uMs wzs -uhP +cgI qgN qgN qgN @@ -69338,8 +69079,8 @@ cJI wMP obi pac -bGH -bGH +qvd +wbE vNQ uhw nxW @@ -69347,7 +69088,7 @@ dWH nxI sOe eSd -kum +hFM nxI sKJ sKJ @@ -69360,9 +69101,9 @@ sKJ sKJ sKJ eeQ -hkJ -uhP -qgN +wzs +cgI +cbK qgN qgN qgN @@ -69540,8 +69281,8 @@ fak wMP rca qyA -pjQ -qlX +bGH +bGH vNQ hCo ayT @@ -69549,7 +69290,7 @@ sGq nxI fln wNI -xOs +aec xPY sKJ iOU @@ -69562,9 +69303,9 @@ vGT vwx pZX eeQ -xer -qgN -qgN +xVu +cbK +cbK qgN qgN qgN @@ -69742,8 +69483,8 @@ dCa wMP vyg wDG -bGH -bGH +pjQ +wVT vNQ aib vNL @@ -69765,8 +69506,8 @@ oml ftB eeQ tMp -mLU -eTQ +xXW +gNm qgN qgN qgN @@ -69968,7 +69709,7 @@ sKJ eeQ vtX kvd -xer +xVu qgN qgN qgN @@ -70145,7 +69886,7 @@ tre qfC hnf dMA -sBy +tre gRh bhj tHI @@ -70170,7 +69911,7 @@ srq dVv sVO vtX -xer +xVu qgN qgN qgN @@ -70347,32 +70088,32 @@ adw rNs uCX uCX -pIE -gRh -slk -xYK +uCX +jvu +uCX +xOs xbP xYK xYK xYK -wVT +xYK lzC -oPM +kBe uwe sKJ emF tAn xtW -vXG -cUZ -oTg -nFQ +efy +pGD +sJq +idL nAq pNA xDv oXu -vtX -hPC +vgh +xVu qgN qgN qgN @@ -70574,7 +70315,7 @@ rGX kRB ehU vtX -xer +xVu qgN qgN qgN @@ -70752,7 +70493,7 @@ rNs uCX uCX wCm -gRh +jvu iNu mnc pFU @@ -70761,7 +70502,7 @@ ogu ogu ogu rSD -uCX +kvN xDz sKJ jPj @@ -70770,13 +70511,13 @@ bGg izV kKM ugc -wZF +nNF fCE sKJ sKJ sKJ eeQ -xer +xVu qgN qgN qgN @@ -70954,11 +70695,11 @@ ncN aZN fKj nhS -gRh +kgp gfB myl iEi -hFM +fuX xlL fuX ayo @@ -70978,7 +70719,7 @@ srq lSo fco vtX -xer +xVu qgN qgN qgN @@ -71167,7 +70908,7 @@ dvw fdZ uCX hww -pED +mLU itW vXn cks @@ -71179,8 +70920,8 @@ uOD pNA xDv oXu -vtX -hPC +vgh +xVu qgN qgN qgN @@ -71361,7 +71102,7 @@ xOo rAn nfN uSv -rAn +sBy dvw gmt buz @@ -71382,7 +71123,7 @@ rGX kRB kRB vtX -xer +xVu qgN qgN qgN @@ -71564,27 +71305,27 @@ eAX wCt buG eAX -byq +hPC euT gAP xlE vIb tjT asG -cbK +sKJ qoy qDU tiF pGu pGu -pED +upP upP rRS upP mPl vtX gsY -xer +xVu qgN qgN qgN @@ -71766,14 +71507,14 @@ eAX bCV jRO eAX -byq +hPC oTR giw dvw byq byq byq -pED +dvw dQZ esy wDk @@ -71785,8 +71526,8 @@ lmz tdO mPl wzs -rVv -uhP +ugx +cgI qgN qgN qgN @@ -71975,7 +71716,7 @@ ulV maV myN maV -pED +dvw jUc qDU wDk @@ -71985,10 +71726,10 @@ cDx nhR eOl tIB -fkr -xer -qgN -qgN +mPl +xVu +cbK +cbK qgN qgN qgN @@ -72177,20 +71918,20 @@ maV maV qZb gEf -pED +dvw uPW vxK rGj tIB kgH nmD -bHs +dJV hiH -pvb -fkr -vgh -eTQ -qgN +tIB +tjS +tMp +gNm +cbK qgN qgN qgN @@ -72372,14 +72113,14 @@ gZt wBq gZt ave -byq +hPC hSp mXh maV maV qZb cWf -upP +dvw hUW lSH upP @@ -72390,9 +72131,9 @@ dJV qVw tIB tjS -wmt +tjS tMp -eTQ +gNm qgN qgN qgN @@ -72574,7 +72315,7 @@ wmc sYq qbp xoL -byq +hPC gRr byh mQR @@ -72591,10 +72332,10 @@ nZX dJV hYo tIB -gfj -kvc -wmt -xer +kPz +tjS +tjS +xVu qgN qgN qgN @@ -72786,17 +72527,17 @@ npD kze naE jWh -tIB +cfc gfj udZ pVT nhR wrK tIB -rar -bdT -sPp -mxf +oZN +qnB +tjS +xVu qgN qgN qgN @@ -72984,7 +72725,7 @@ sLu fgd nJs qZb -fZr +maV upP cVb sPK @@ -72995,10 +72736,10 @@ qFQ bCp wfR cns -oZN -qnB +qlX +lYV mPl -xer +xVu qgN qgN qgN @@ -73200,7 +72941,7 @@ afA rHj rRX mPl -xer +xVu qgN qgN qgN @@ -73401,8 +73142,8 @@ sSZ vmD vmD vmD -ccn -xer +ddX +xVu qgN qgN qgN @@ -73599,12 +73340,12 @@ iRj ipD tvk aSg -waI +cwO mtP -uNs +wmt ssh -klg -xer +ccn +xVu qgN qgN qgN @@ -73793,20 +73534,20 @@ wOo fWh tRz dlG -tZR +nTU iGG htd vjN iRj fnv -kPz +max mys waI -bpF -ssh -cwO -wzs -uhP +waI +uNs +kHv +kHv +xVu qgN qgN qgN @@ -74003,12 +73744,12 @@ iRj hIz tWp vFQ -ddX -cku -wyK -whs -uhP -qgN +waI +bpF +kHv +kHv +wzs +cgI qgN qgN qgN @@ -74197,7 +73938,7 @@ uZH mPE stq uZH -tZR +nTU vDh qcs aAu @@ -74206,10 +73947,10 @@ ilm vTk mjp cku -wyK +kHv +kHv wzs -uhP -qgN +cgI qgN qgN qgN @@ -74394,26 +74135,26 @@ kUp wAm nTU sKo +sKo idX -idX -idX -idX -idX -mPl -uki +bHs +sKo +sKo +sKo uki +keG uki ccn -tqC -tqC -tqC +ccn wyK +wyK +wyK +kHv wzs -uhP -qgN -qgN +cgI qgN qgN +nFQ qgN qgN qgN @@ -74596,22 +74337,22 @@ ogR rfi vOL jfH -kgp -uGh -gTy -rVv -rVv -rVv -rVv -rnN -rVv -rVv -rVv -ltv -rVv -rVv -uhP -qgN +xVu +fDv +hDE +ugx +ugx +ugx +ugx +ugx +ugx +ugx +ugx +ugx +ugx +ugx +ugx +cgI qgN qgN qgN @@ -74798,8 +74539,8 @@ vXy bLu gis jfH -xer -kUf +xVu +bxp ryR qgN qgN @@ -75000,7 +74741,7 @@ pMf pMf sKE jfH -xer +xVu nIX cPB qgN diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 748e0debe2c..2945986e527 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -4051,12 +4051,11 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "dAz" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 }, -/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "dAI" = ( /obj/effect/floor_decal/corner/blue{ dir = 10 @@ -5273,10 +5272,11 @@ /turf/simulated/floor/reinforced, /area/bridge/selfdestruct) "ewP" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/mapped, -/turf/simulated/open/airless, -/area/template_noop) +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior) "eyi" = ( /obj/structure/lattice/catwalk, /obj/structure/railing/mapped{ @@ -14955,12 +14955,11 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/medical/smoking) "lUf" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 +/obj/effect/floor_decal/industrial/warning{ + dir = 10 }, -/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "lUB" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -19452,12 +19451,13 @@ /turf/simulated/floor/wood, /area/horizon/hallway/deck_three/primary/central) "pwa" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 8 }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced/airless, -/area/template_noop) +/obj/structure/railing/mapped, +/turf/simulated/open/airless, +/area/horizon/exterior) "pwO" = ( /obj/effect/floor_decal/corner/blue{ dir = 9 @@ -47200,10 +47200,10 @@ vaL vaL vaL uPJ -wGH -vkb -iqb -gVY +cPq +mKC +mUv +pwa dSF dSF dSF @@ -47402,20 +47402,20 @@ vaL qHx aoA ivg -wGH -vkb -vtk -ewP +cPq +mKC +uLZ +wfb +slH +slH +slH +slH +slH +slH +slH +slH +slH slH -hBa -otI -otI -otI -otI -otI -otI -otI -opC slH slH slH @@ -47604,24 +47604,24 @@ aoA aoA aoA aoA -wGH -vBY -otI -otI -otI -tJH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -vBY -otI -otI -otI -opC +cPq +dAz +mjb +mjb +mjb +mjb +mjb +mjb +mjb +mjb +mjb +mjb +mjb +mjb +mjb +mjb +mjb +lUf slH slH dSF @@ -47806,25 +47806,25 @@ vaL aoA aoA ivg -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -vBY -opC +cPq +cPq +cPq +cPq +cPq +cPq +cPq +cPq +cPq +cPq +cPq +cPq +cPq +cPq +cPq +cPq +cPq +dAz +lUf slH slH dSF @@ -48025,9 +48025,9 @@ giI rnu iWr bqA -wGH -vBY -opC +cPq +dAz +lUf slH dSF dSF @@ -48228,8 +48228,8 @@ jqi hzB fgF bqA -wGH -vkb +cPq +mKC slH dSF dSF @@ -48431,7 +48431,7 @@ jRy rFu grm bqA -vkb +mKC slH dSF dSF @@ -48633,8 +48633,8 @@ ljj oir fkC mIs -vBY -opC +mKC +slH dSF dSF dSF @@ -48835,8 +48835,8 @@ kQW rvO aXB qlf -wGH -vkb +mKC +slH dSF dSF dSF @@ -49037,8 +49037,8 @@ nxm nSO fvX sqN -wGH -vkb +mKC +slH dSF dSF dSF @@ -49239,8 +49239,8 @@ fec rGK vbh aZS -wGH -vkb +mKC +slH dSF dSF dSF @@ -49441,8 +49441,8 @@ soE jKp soE qBS -wGH -vkb +mKC +slH dSF dSF dSF @@ -49643,8 +49643,8 @@ wFM kAR cAY hrR -wGH -vkb +mKC +slH dSF dSF dSF @@ -49845,7 +49845,7 @@ sWA naZ omA sdp -leE +dAz lUf dSF dSF @@ -50048,7 +50048,7 @@ ltT lFK mrU kBl -dAz +mKC dSF dSF dSF @@ -50250,7 +50250,7 @@ xEZ jxM iwi jIF -pwa +mKC dSF dSF dSF @@ -50452,7 +50452,7 @@ tKU lIB amy mrU -vkb +mKC dSF dSF dSF @@ -50654,7 +50654,7 @@ eFH vaz dhn mrU -vkb +mKC dSF dSF dSF @@ -50856,7 +50856,7 @@ uNc oWy xhy rmQ -vkb +mKC dSF dSF dSF @@ -51058,7 +51058,7 @@ eFH oWy suj mrU -vkb +mKC dSF dSF dSF @@ -51260,7 +51260,7 @@ hfm fis grs mrU -vkb +mKC dSF dSF dSF @@ -51462,7 +51462,7 @@ ltT phw uCJ dFe -vkb +mKC dSF dSF dSF @@ -51663,8 +51663,8 @@ hmu xEZ auq mrU -wGH -vkb +nbl +ewP dSF dSF dSF @@ -51865,8 +51865,8 @@ hhA rqU ltH mrU -wGH -vkb +mKC +slH dSF dSF dSF @@ -52067,8 +52067,8 @@ rxJ xPq iii dFe -wGH -vkb +mKC +slH dSF dSF dSF @@ -52269,8 +52269,8 @@ asO asO asO hrR -wGH -vkb +mKC +slH dSF dSF dSF @@ -52471,8 +52471,8 @@ eeU dpE xPj sHE -wGH -vkb +mKC +slH dSF dSF dSF @@ -52673,8 +52673,8 @@ uIm uIm gjT sHE -wGH -vkb +mKC +slH dSF dSF dSF @@ -52875,8 +52875,8 @@ kkw cBE edo bNm -wGH -vkb +mKC +slH dSF dSF dSF @@ -53077,8 +53077,8 @@ qrQ qrQ pNE sHE -wGH -vkb +mKC +slH dSF dSF dSF @@ -53279,8 +53279,8 @@ vZO vZO rKd sHE -bEW -kMe +mKC +slH dSF dSF dSF @@ -53481,7 +53481,7 @@ vZO vZO eri qsz -vkb +mKC slH dSF dSF @@ -53682,8 +53682,8 @@ fbz ujs eri qsz -wGH -vkb +cPq +mKC slH dSF dSF @@ -53883,9 +53883,9 @@ waX waX waX qsz -wGH -bEW -kMe +cPq +nbl +ewP slH dSF dSF @@ -54080,15 +54080,15 @@ sGh drY drY cPq -wGH -wGH -wGH -wGH -wGH -wGH -vkb +cPq +cPq +cPq +cPq +cPq +cPq +ewP +slH slH -dSF dSF dSF dSF @@ -54282,14 +54282,14 @@ cPq cPq cPq cPq -wGH -wGH -wGH -bEW -leE -leE -kMe -dSF +cPq +cPq +cPq +cPq +cPq +ewP +slH +slH dSF dSF dSF @@ -54484,10 +54484,11 @@ fJy fJy fJy fJy -leE -leE -leE -kMe +fJy +fJy +fJy +fJy +ewP slH slH dSF @@ -54545,7 +54546,6 @@ dSF dSF dSF dSF -dSF "} (119,1,1) = {" dSF @@ -54691,7 +54691,7 @@ slH slH slH slH -dSF +slH dSF dSF dSF