diff --git a/html/changelogs/kitchenfixes - ASmallCuteCat.yml b/html/changelogs/kitchenfixes - ASmallCuteCat.yml new file mode 100644 index 00000000000..b859399cbe9 --- /dev/null +++ b/html/changelogs/kitchenfixes - ASmallCuteCat.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: ASmallCuteCat + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - qol: "Kitchen supplies now spawn on the kitchen counters, adds missing soda machine, moves dinnerware vendor, removes extra oven." + - qol: "The freezer is no longer lethal to Unathi chefs (-4C instead of -20C)" diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index edf82e1a63b..b858e8ac5b2 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -140,7 +140,7 @@ /obj/effect/floor_decal/industrial/loading/grey{ dir = 8 }, -/obj/structure/machinery/alarm/freezer/north, +/obj/structure/machinery/alarm/cold/north, /turf/simulated/floor/tiled/dark/full{ temperature = 278 }, @@ -3829,13 +3829,13 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/service/mess_hall) "axM" = ( @@ -6874,10 +6874,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /turf/simulated/floor/tiled/white, /area/horizon/service/kitchen) "aSh" = ( @@ -7126,6 +7122,10 @@ pixel_x = 9; pixel_y = 4 }, +/obj/item/material/kitchen/rollingpin{ + pixel_x = -4; + pixel_y = 18 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/kitchen) "aTK" = ( @@ -10051,8 +10051,7 @@ c_tag = "Service - Kitchen 2"; dir = 8 }, -/obj/structure/reagent_dispensers/cookingoil, -/obj/effect/floor_decal/industrial/outline/service, +/obj/structure/table/rack/retail_shelf, /turf/simulated/floor/tiled/dark/full{ temperature = 278 }, @@ -13556,6 +13555,13 @@ /obj/structure/machinery/merchant_pad, /turf/simulated/floor/wood, /area/merchant_station/warehouse) +"bLN" = ( +/obj/structure/machinery/holosign/service/kitchen{ + pixel_y = -32; + id = "kitchen" + }, +/turf/simulated/wall, +/area/horizon/service/chapel/main) "bLQ" = ( /obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/reinforced/airless, @@ -22933,6 +22939,10 @@ }, /turf/simulated/floor/marble/dark, /area/horizon/holodeck/source_luceism) +"cYl" = ( +/obj/structure/machinery/vending/dinnerware, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/service/kitchen) "cYm" = ( /obj/structure/machinery/alarm/north, /obj/structure/machinery/suit_cycler/engineering/prepared, @@ -26842,6 +26852,17 @@ }, /turf/simulated/floor/tiled, /area/horizon/operations/office) +"dvZ" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/effect/floor_decal/spline/plain/green{ + dir = 4 + }, +/obj/structure/machinery/disposal/small/west, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/horizon/service/kitchen) "dwn" = ( /obj/effect/floor_decal/corner/brown{ dir = 9 @@ -27271,7 +27292,7 @@ /area/horizon/engineering/reactor/indra/mainchamber) "dyF" = ( /obj/effect/floor_decal/industrial/outline/service, -/obj/structure/machinery/vending/dinnerware, +/obj/structure/machinery/smartfridge/foodheater, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/kitchen) "dyJ" = ( @@ -29086,7 +29107,9 @@ /area/horizon/maintenance/substation/security) "dKe" = ( /obj/structure/table/stone/marble, -/obj/item/storage/box/large/tableware, +/obj/structure/machinery/firealarm/east, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/storage/box/large/produce, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/kitchen) "dKf" = ( @@ -29355,13 +29378,14 @@ /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/interstitial) "dMl" = ( -/obj/structure/machinery/light{ - dir = 4 - }, /obj/structure/sign/nosmoking_1{ pixel_x = 32 }, -/obj/structure/machinery/appliance/cooker/oven, +/obj/structure/table/stone/marble, +/obj/structure/machinery/chemical_dispenser/bar_soft/full{ + dir = 8; + pixel_x = 3 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/kitchen) "dMr" = ( @@ -34670,6 +34694,7 @@ /obj/structure/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "ewq" = ( @@ -37910,7 +37935,6 @@ dir = 8 }, /obj/structure/machinery/light/small/floor, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/horizon/service/kitchen) "eSC" = ( @@ -37923,15 +37947,6 @@ /obj/structure/machinery/power/apc/west, /obj/structure/cable/green, /obj/effect/floor_decal/industrial/outline/grey, -/obj/structure/closet/crate/freezer{ - name = "Kitchen Supplies" - }, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/storage/box/large/produce, -/obj/item/storage/box/large/produce, -/obj/item/reagent_containers/food/condiment/enzyme, -/obj/item/reagent_containers/food/condiment/enzyme, /turf/simulated/floor/tiled/dark/full{ temperature = 278 }, @@ -38408,13 +38423,13 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/service/mess_hall) "eVF" = ( @@ -47906,6 +47921,27 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/horizon/security/hallway) +"gkB" = ( +/obj/structure/table/stone/marble, +/obj/item/reagent_containers/glass/beaker{ + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/reagent_containers/food/condiment/shaker/peppermill{ + pixel_x = 8; + pixel_y = 13 + }, +/obj/item/reagent_containers/food/condiment/shaker/salt{ + pixel_x = 8; + pixel_y = 7 + }, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/shaker/spacespice{ + pixel_x = 3; + pixel_y = 1 + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/service/kitchen) "gkC" = ( /obj/structure/window/borosilicate{ dir = 4 @@ -48720,10 +48756,6 @@ pixel_x = -6; pixel_y = 15 }, -/obj/item/reagent_containers/glass/beaker{ - pixel_x = -6; - pixel_y = 7 - }, /obj/item/reagent_containers/food/condiment/shaker/peppermill{ pixel_x = 8; pixel_y = 13 @@ -48732,6 +48764,11 @@ pixel_x = 8; pixel_y = 7 }, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/shaker/spacespice{ + pixel_x = 3; + pixel_y = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/kitchen) "gpM" = ( @@ -50272,7 +50309,7 @@ /obj/structure/machinery/door/airlock/service{ dir = 4; name = "Bar Backroom"; - req_one_access = list(25,67) + req_one_access = list(25) }, /obj/structure/machinery/door/firedoor{ dir = 4 @@ -56638,11 +56675,11 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/holodeck) "hrz" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 10 - }, /obj/structure/bed/stool/bar/padded/red, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/turf/simulated/floor/lino/diamond, /area/horizon/service/mess_hall) "hrA" = ( /obj/structure/cable/green{ @@ -59322,7 +59359,6 @@ /obj/effect/floor_decal/spline/plain/green{ dir = 8 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/horizon/service/kitchen) "hIA" = ( @@ -70169,8 +70205,10 @@ "jeW" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/effect/floor_decal/spline/plain/corner/green, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/sortjunction/flipped{ + name = "Kitchen"; + sortType = "Kitchen"; + dir = 8 }, /turf/simulated/floor/tiled/white, /area/horizon/service/kitchen) @@ -71651,14 +71689,14 @@ dir = 10 }, /obj/structure/table/wood/gamblingtable, -/obj/item/paper_bin{ - pixel_x = 8; - pixel_y = 2 - }, /obj/item/pen/fountain/black{ pixel_x = 5; pixel_y = 3 }, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 6 + }, /turf/simulated/floor/wood, /area/horizon/service/bar) "joj" = ( @@ -74183,9 +74221,6 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/tiled/white, /area/horizon/service/kitchen) "jFI" = ( @@ -78008,6 +78043,7 @@ "keZ" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/extinguisher_cabinet/west, +/obj/structure/closet/secure_closet/freezer/chicken_and_fish, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/kitchen) "kfi" = ( @@ -82647,10 +82683,8 @@ /obj/effect/floor_decal/spline/plain/corner/green{ dir = 8 }, -/obj/structure/disposalpipe/sortjunction/flipped{ - name = "Kitchen"; - sortType = "Kitchen"; - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/tiled/white, /area/horizon/service/kitchen) @@ -93482,8 +93516,8 @@ /turf/simulated/floor/holofloor/tiled, /area/horizon/holodeck/source_emptycourt) "meu" = ( -/obj/structure/closet/secure_closet/freezer/meat, /obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/reagent_dispensers/cookingoil, /turf/simulated/floor/tiled/dark/full{ temperature = 278 }, @@ -93795,6 +93829,7 @@ name = "sink"; pixel_x = 19 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/horizon/service/kitchen) "mgs" = ( @@ -95539,6 +95574,7 @@ /area/centcom/holding) "mrL" = ( /obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/closet/secure_closet/refrigerator/station/alt, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/kitchen) "mrN" = ( @@ -96802,10 +96838,6 @@ /obj/structure/sign/poster/engineering/bay_52{ pixel_y = -32 }, -/obj/structure/machinery/disposal/small/north, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /turf/simulated/floor/tiled/white, /area/horizon/service/kitchen) "mBq" = ( @@ -105213,6 +105245,21 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/security/port) +"nHn" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/spline/plain/green{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/horizon/service/kitchen) "nHo" = ( /obj/structure/window/shuttle/unique/scc/scout{ icon_state = "5,3" @@ -108999,10 +109046,6 @@ /turf/simulated/floor/tiled/white, /area/horizon/rnd/xenobiology) "ohx" = ( -/obj/item/material/kitchen/rollingpin{ - pixel_x = -4; - pixel_y = 18 - }, /obj/structure/machinery/appliance/cooker/stove, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/kitchen) @@ -116968,17 +117011,6 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/nacelle) -"pgQ" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 10 - }, -/obj/structure/machinery/light/floor, -/obj/structure/machinery/holosign/service/kitchen{ - pixel_y = -32; - id = "kitchen" - }, -/turf/simulated/floor/tiled, -/area/horizon/hallway/primary/deck_2/central) "pgV" = ( /turf/simulated/wall/shuttle/unique/mercenary/small{ icon_state = "1,3" @@ -120516,13 +120548,13 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/machinery/door/airlock/freezer{ dir = 4; name = "Freezer"; - req_one_access = list(28,67) - }, -/obj/structure/disposalpipe/segment{ - dir = 4 + req_one_access = list(28) }, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/kitchen/freezer) @@ -129336,7 +129368,11 @@ dir = 8 }, /obj/structure/table/stone/marble, -/obj/item/storage/box/large/tableware, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/storage/box/large/produce, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/kitchen) "qOL" = ( @@ -129852,7 +129888,10 @@ dir = 8 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/structure/closet/secure_closet/freezer/chicken_and_fish, +/obj/structure/closet/secure_closet/refrigerator/station/main, +/obj/item/storage/box/large/produce/nralakk, +/obj/item/storage/box/large/produce/moghes, +/obj/item/storage/box/large/produce/adhomai, /turf/simulated/floor/tiled/dark/full{ temperature = 278 }, @@ -135356,6 +135395,7 @@ /obj/structure/sign/nosmoking_1{ pixel_x = -32 }, +/obj/structure/closet/secure_closet/freezer/meat, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/kitchen) "rCL" = ( @@ -135993,14 +136033,14 @@ /turf/simulated/floor/tiled/dark, /area/horizon/holodeck/source_pool) "rGR" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 10 - }, /obj/structure/bed/stool/bar/padded/red, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/lino/diamond, /area/horizon/service/mess_hall) "rGT" = ( /obj/structure/bed/stool/chair/office/light, @@ -138498,10 +138538,6 @@ /turf/simulated/floor/reinforced/airless, /area/horizon/exterior) "rWf" = ( -/obj/effect/floor_decal/corner/dark_green/full{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline_straight/service, /obj/effect/landmark/start{ name = "Chef" }, @@ -138522,6 +138558,10 @@ /obj/structure/disposalpipe/segment{ icon_state = "pipe-c" }, +/obj/effect/floor_decal/corner/dark_green/full{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_door/service, /turf/simulated/floor/tiled/dark, /area/horizon/service/mess_hall) "rWg" = ( @@ -140700,7 +140740,6 @@ /turf/simulated/floor/tiled/white, /area/horizon/rnd/telesci) "sjt" = ( -/obj/structure/closet/secure_closet/refrigerator/station/alt, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/dark/full{ temperature = 278 @@ -144107,7 +144146,7 @@ /obj/structure/machinery/door/airlock/service{ dir = 1; name = "Bar Backroom"; - req_one_access = list(25,67) + req_one_access = list(25) }, /obj/effect/floor_decal/industrial/hatch_door/service{ dir = 8 @@ -148030,15 +148069,15 @@ /turf/simulated/floor/wood, /area/horizon/service/mess_hall) "tgE" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 10 - }, /obj/structure/bed/stool/bar/padded/red, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/lino/diamond, /area/horizon/service/mess_hall) "tgG" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -149730,6 +149769,10 @@ /obj/effect/landmark/start{ name = "Chef" }, +/obj/structure/machinery/disposal/small/west, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/horizon/service/kitchen) "tqK" = ( @@ -152395,14 +152438,14 @@ /turf/unsimulated/floor/plating, /area/centcom/specops) "tHD" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 10 - }, /obj/effect/floor_decal/industrial/outline_door/service, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/turf/simulated/floor/lino/diamond, /area/horizon/service/mess_hall) "tHL" = ( /obj/structure/machinery/mass_driver{ @@ -171222,6 +171265,9 @@ /obj/structure/railing/mapped{ dir = 8 }, +/obj/effect/floor_decal/corner/dark_green/full{ + dir = 4 + }, /turf/simulated/open, /area/horizon/service/hydroponics) "whg" = ( @@ -177726,8 +177772,10 @@ /turf/simulated/floor/wood, /area/horizon/repoffice/consular_one) "wVS" = ( -/obj/structure/machinery/firealarm/east, /obj/structure/table/stone/marble, +/obj/structure/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/kitchen) "wVV" = ( @@ -179834,13 +179882,13 @@ }, /area/tdome/tdomeobserve) "xiQ" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 10 - }, /obj/structure/machinery/holosign/service/kitchen{ pixel_y = -32; id = "kitchen" }, +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/horizon/service/mess_hall) "xiW" = ( @@ -180664,9 +180712,6 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_2/central) "xoP" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 6 - }, /obj/structure/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -180676,6 +180721,9 @@ /obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/effect/floor_decal/corner/dark_green{ + dir = 6 + }, /turf/simulated/floor/tiled/dark, /area/horizon/service/mess_hall) "xoU" = ( @@ -183079,16 +183127,6 @@ }, /turf/simulated/floor, /area/horizon/command/bridge/meeting_room) -"xEb" = ( -/obj/effect/floor_decal/industrial/outline/grey, -/obj/structure/closet/secure_closet/refrigerator/station/main, -/obj/item/storage/box/large/produce/adhomai, -/obj/item/storage/box/large/produce/moghes, -/obj/item/storage/box/large/produce/nralakk, -/turf/simulated/floor/tiled/dark/full{ - temperature = 278 - }, -/area/horizon/service/kitchen/freezer) "xEd" = ( /obj/effect/floor_decal/industrial/outline/research, /obj/structure/closet/secure_closet/guncabinet/sci, @@ -286388,7 +286426,7 @@ fSj fSj gZa eCK -vAU +etm rGR erO jeW @@ -286649,7 +286687,7 @@ etm rGR myg dZT -cfl +gkB cfl xTF jFH @@ -287159,7 +287197,7 @@ tof lRh nBM qVx -etm +vAU rGR lFR dZT @@ -287376,7 +287414,7 @@ ecg qCx pTN xrf -pgQ +edn mlB pQd pwm @@ -287421,7 +287459,7 @@ tHD xPP cGB wDb -wYW +nHn wYW kPH hEJ @@ -287678,7 +287716,7 @@ rWf mWt aAO mCY -mCY +dvZ mCY mCY drN @@ -287937,7 +287975,7 @@ nCf dKe wVS dMl -wYq +cYl bWX oak lYS @@ -288147,7 +288185,7 @@ gZT pIF bUl bUl -pIF +bLN pIF dvo glp @@ -289996,7 +290034,7 @@ abc cIT wOo uBz -xEb +sjt sjt nxk nxk