diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 31ee9f18c34..070299016ca 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -967,6 +967,7 @@ /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/item/reagent_containers/food/drinks/takeaway_cup_idris = 6, /obj/item/clothing/accessory/apron/chef = 2, /obj/item/clothing/suit/chef_jacket = 2, /obj/item/material/kitchen/rollingpin = 2, @@ -984,7 +985,8 @@ /obj/item/tray = 12, /obj/item/tray/plate = 10, /obj/item/reagent_containers/bowl = 10, - /obj/item/reagent_containers/bowl/plate = 10 + /obj/item/reagent_containers/bowl/plate = 10, + /obj/item/reagent_containers/glass/bottle/syrup = 4, ) contraband = list( /obj/item/storage/toolbox/lunchbox/syndicate = 2 @@ -1007,7 +1009,8 @@ /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/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup = 6, + /obj/item/reagent_containers/food/drinks/takeaway_cup_idris = 6, ) /obj/machinery/vending/dinnerware/bar @@ -1017,7 +1020,8 @@ /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/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup = 6, + /obj/item/reagent_containers/food/drinks/takeaway_cup_idris = 6, ) /obj/machinery/vending/sovietsoda diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index fa6554ccc11..0c5df5d2640 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -1177,4 +1177,27 @@ desc = "A box full of high-capacity power cells." starts_with = list( /obj/item/cell/high = 3 - ) \ No newline at end of file + ) + +/obj/item/storage/box/condiment + name = "condiment box" + desc = "A large box of condiments, syrups, flavorings." + icon_state = "largebox" + illustration = "condiment" + starts_with = list( + /obj/item/reagent_containers/food/condiment/enzyme = 1, + /obj/item/reagent_containers/food/condiment/shaker/peppermill = 2, + /obj/item/reagent_containers/food/condiment/shaker/salt = 2, + /obj/item/reagent_containers/food/condiment/shaker/spacespice = 2, + /obj/item/reagent_containers/food/condiment/shaker/sprinkles = 1, + /obj/item/reagent_containers/food/condiment/sugar = 1, + /obj/item/reagent_containers/food/condiment/shaker/pumpkinspice = 1, + /obj/item/reagent_containers/glass/bottle/syrup/chocolate = 1, + /obj/item/reagent_containers/glass/bottle/syrup/pumpkin = 1, + /obj/item/reagent_containers/glass/bottle/syrup/vanilla = 1, + /obj/item/reagent_containers/glass/bottle/syrup/caramel = 1, + ) + +/obj/item/storage/box/produce/fill() + . = ..() + make_exact_fit() 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 1d4c78be75a..f103e6eb0f8 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -81,4 +81,15 @@ new /obj/random/spacecash(src) for(var/i = 0, i < rand(6,9), i++) - new /obj/random/coin(src) \ No newline at end of file + new /obj/random/coin(src) + +/obj/structure/closet/secure_closet/freezer/cafe/fill() + ..() + for(var/i = 0, i < 6, i++) + new /obj/item/reagent_containers/food/drinks/milk(src) + for(var/i = 0, i < 3, i++) + new /obj/item/storage/box/fancy/egg_box(src) + new /obj/item/reagent_containers/food/condiment/flour(src) + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_containers/food/drinks/soymilk(src) + new /obj/item/reagent_containers/food/condiment/sugar(src) diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals.dm index c67aa0c8645..f51e868c8ba 100644 --- a/code/game/turfs/flooring/flooring_decals.dm +++ b/code/game/turfs/flooring/flooring_decals.dm @@ -218,6 +218,16 @@ /obj/effect/floor_decal/corner/grey/full icon_state = "corner_white_full" +/obj/effect/floor_decal/corner/teal + name = "teal corner" + color = "#00fbff" + +/obj/effect/floor_decal/corner/teal/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/floor_decal/corner/teal/full + icon_state = "corner_white_full" + //Wide Corners// - Works better with some kinds of floors when you want the line of corner decals to connect diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index cef1226a6b6..9d82aae476d 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -100,6 +100,11 @@ volume = 40 reagents_to_add = list(/singleton/reagent/nutriment/sprinkles = 40) +/obj/item/reagent_containers/food/condiment/shaker/pumpkinspice + icon_state = "spacespicebottle" + volume = 40 + reagents_to_add = list(/singleton/reagent/spacespice/pumpkinspice = 40) + /obj/item/reagent_containers/food/condiment/flour name = "flour sack" desc = "A big bag of flour. Good for baking!" @@ -260,3 +265,30 @@ //End of MRE stuff. + +//syrups + +/obj/item/reagent_containers/glass/bottle/syrup + name = "syrup dispenser" + desc = "A small bottle dispenser." + icon = 'icons/obj/syrup.dmi' + icon_state = "syrup" + filling_states = "20;40;60;80;100" + flags = OPENCONTAINER + volume = 50 + +/obj/item/reagent_containers/glass/bottle/syrup/chocolate + name = "chocolate syrup dispenser" + reagents_to_add = list(/singleton/reagent/drink/syrup_chocolate = 50) + +/obj/item/reagent_containers/glass/bottle/syrup/pumpkin + name = "pumpkin spice syrup dispenser" + reagents_to_add = list(/singleton/reagent/drink/syrup_pumpkin = 50) + +/obj/item/reagent_containers/glass/bottle/syrup/vanilla + name = "vanilla syrup dispenser" + reagents_to_add = list(/singleton/reagent/drink/syrup_vanilla = 50) + +/obj/item/reagent_containers/glass/bottle/syrup/caramel + name = "caramel syrup dispenser" + reagents_to_add = list(/singleton/reagent/drink/syrup_caramel = 50) diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index 54fdda8eeed..e8ad1db4ffe 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -321,6 +321,15 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I else icon_state = "water_cup_e" +/obj/item/reagent_containers/food/drinks/takeaway_cup_idris + name = "takeaway cup" + desc = "A takeaway cup, sporting the Idris logo." + icon_state = "takeaway_cup_idris" + drop_sound = 'sound/items/drop/papercup.ogg' + pickup_sound = 'sound/items/pickup/papercup.ogg' + possible_transfer_amounts = null + volume = 30 + //////////////////////////JUICES AND STUFF /////////////////////// /obj/item/reagent_containers/food/drinks/carton diff --git a/html/changelogs/DreamySkrell-idris-cafe-0.yml b/html/changelogs/DreamySkrell-idris-cafe-0.yml new file mode 100644 index 00000000000..4c44c6d44ae --- /dev/null +++ b/html/changelogs/DreamySkrell-idris-cafe-0.yml @@ -0,0 +1,42 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: DreamySkrell + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - maptweak: "Remaps the third deck cafe to be Idris themed." + - rscadd: "Adds coffee menu sign and syrups (sprites by disappointedButNotSuprised) and takeaway cups (sprite by Crumpaloo)." diff --git a/icons/effects/cafesign.dmi b/icons/effects/cafesign.dmi new file mode 100644 index 00000000000..cf172e08372 Binary files /dev/null and b/icons/effects/cafesign.dmi differ diff --git a/icons/obj/coffeemenu.dmi b/icons/obj/coffeemenu.dmi new file mode 100644 index 00000000000..5fa511299f0 Binary files /dev/null and b/icons/obj/coffeemenu.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 16880687480..c0561f9efd4 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index b53c5f5df44..04fdfebfb61 100644 Binary files a/icons/obj/reagentfillings.dmi and b/icons/obj/reagentfillings.dmi differ diff --git a/icons/obj/syrup.dmi b/icons/obj/syrup.dmi new file mode 100644 index 00000000000..c8b82187b12 Binary files /dev/null and b/icons/obj/syrup.dmi differ diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 0af704c2fb3..90326d1efde 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -180,22 +180,14 @@ dir = 1; id = "shutters_deck3_cafedesk"; name = "Cafe Desk Shutters"; - pixel_x = 25; + pixel_x = -21; pixel_y = -35 }, /obj/machinery/button/remote/blast_door{ dir = 1; id = "shutters_deck3_cafewindows"; name = "Cafe Window Shutters"; - pixel_x = 39; - pixel_y = -25 - }, -/obj/effect/floor_decal/corner/red/diagonal, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "shutters_deck3_cafeutensils"; - name = "Cafe Utensils Vendor Shutter"; - pixel_x = 25; + pixel_x = -21; pixel_y = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -207,10 +199,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /obj/effect/floor_decal/spline/plain{ dir = 10 }, -/turf/simulated/floor/lino/grey, +/turf/simulated/floor/wood, /area/horizon/cafeteria) "aeP" = ( /obj/structure/bed/stool/chair/office/dark{ @@ -411,6 +406,14 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hallway/deck_three/primary/starboard/docks) +"ajV" = ( +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/railing/mapped, +/obj/structure/lattice, +/turf/simulated/open, +/area/horizon/hallway/deck_three/primary/central) "akf" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -451,14 +454,6 @@ /turf/simulated/floor/carpet/rubber, /area/bridge/controlroom) "amM" = ( -/obj/machinery/power/apc/low{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, /obj/machinery/camera/network/third_deck{ c_tag = "Third Deck - Central Ring Port"; dir = 8 @@ -506,10 +501,13 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/hallway/deck_three/primary/port/docks) "aob" = ( -/obj/effect/floor_decal/corner/red/diagonal, -/obj/structure/table/reinforced/wood, -/obj/item/storage/box/fancy/donut, -/obj/item/paper/fluff/microwave, +/obj/machinery/newscaster{ + pixel_x = 32 + }, +/obj/effect/floor_decal/corner/teal/diagonal, +/obj/machinery/smartfridge/drinks{ + opacity = 1 + }, /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) "aog" = ( @@ -552,7 +550,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/lounge/secondary) "arR" = ( -/obj/effect/floor_decal/corner/red/diagonal, +/obj/effect/floor_decal/corner/teal/diagonal, /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) "asO" = ( @@ -638,10 +636,9 @@ /turf/simulated/floor/tiled/freezer, /area/horizon/crew_quarters/fitness/showers) "awM" = ( -/obj/effect/floor_decal/corner/red/diagonal, -/obj/structure/table/reinforced/wood, -/obj/machinery/newscaster{ - pixel_y = 32 +/obj/effect/floor_decal/corner/teal/diagonal, +/obj/structure/cable/green{ + icon_state = "1-2" }, /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) @@ -945,7 +942,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/full, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/cafeteria) "aLT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1737,9 +1737,6 @@ /turf/simulated/wall, /area/horizon/crew_quarters/fitness/changing) "bpP" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -1754,6 +1751,9 @@ /obj/machinery/light/floor{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) "bqA" = ( @@ -2119,6 +2119,16 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/lounge) +"bMn" = ( +/obj/effect/floor_decal/corner/teal/diagonal, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/lino/grey, +/area/horizon/cafeteria) "bMY" = ( /obj/machinery/alarm{ dir = 1; @@ -2258,6 +2268,16 @@ }, /turf/simulated/floor/reinforced/airless, /area/horizon/exterior) +"bTH" = ( +/obj/machinery/door/firedoor, +/obj/structure/table/stone/marble, +/obj/machinery/door/blast/shutters/open{ + dir = 8; + id = "shutters_deck3_cafedesk"; + name = "Cafe Desk Shutter" + }, +/turf/simulated/floor/tiled, +/area/horizon/cafeteria) "bTO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2265,6 +2285,9 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) "bUg" = ( @@ -2981,6 +3004,16 @@ }, /turf/simulated/floor/tiled/white, /area/horizon/security/autopsy_laboratory) +"cHf" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/structure/bed/stool/bar/padded/teal, +/turf/simulated/floor/lino/grey, +/area/horizon/cafeteria) "cHl" = ( /obj/effect/floor_decal/spline/fancy/wood/cee, /obj/structure/flora/ausbushes/ywflowers, @@ -3362,13 +3395,23 @@ /turf/simulated/floor/tiled, /area/horizon/security/investigations_hallway) "daI" = ( -/obj/structure/table/reinforced/wood, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 28 + }, +/obj/effect/floor_decal/corner/teal/diagonal, /obj/machinery/reagentgrinder{ pixel_x = 1; pixel_y = 8 }, -/obj/effect/floor_decal/corner/red/diagonal, -/obj/machinery/firealarm/east, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/table/stone/marble, +/obj/item/reagent_containers/glass/beaker{ + pixel_x = 9; + pixel_y = 0 + }, /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) "dce" = ( @@ -3834,15 +3877,26 @@ /turf/simulated/floor/tiled/dark, /area/horizon/crew_armoury/foyer) "dui" = ( -/obj/effect/floor_decal/corner/red/diagonal, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/machinery/disposal/small/north, /obj/structure/disposalpipe/trunk{ dir = 8 }, -/turf/simulated/floor/lino/grey, +/obj/structure/sign/flag/idris{ + pixel_y = -32 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, +/turf/simulated/floor/wood, +/area/horizon/cafeteria) +"dvl" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/horizon/cafeteria) "dvD" = ( /obj/structure/table/glass{ @@ -3878,20 +3932,24 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "dxG" = ( -/obj/structure/table/reinforced/wood, -/obj/item/glass_jar{ - desc = "A small empty jar that is mostly used for giving a tip."; - name = "tip jar" - }, -/obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/camera/network/third_deck{ c_tag = "Third Deck - Cafe"; dir = 8 }, -/obj/machinery/alarm{ +/obj/item/device/radio/intercom{ dir = 8; - pixel_x = 28 + pixel_x = 22 }, +/obj/effect/floor_decal/corner/teal/diagonal, +/obj/item/reagent_containers/food/drinks/shaker{ + pixel_x = 5; + pixel_y = 0 + }, +/obj/item/storage/toolbox/lunchbox/idris{ + pixel_y = -8; + pixel_x = -2 + }, +/obj/structure/table/stone/marble, /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) "dzT" = ( @@ -4832,15 +4890,41 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "emD" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 +/obj/effect/floor_decal/corner/teal/diagonal, +/obj/item/storage/box/condiment{ + pixel_y = 13 }, -/obj/effect/floor_decal/corner/red/diagonal, -/obj/structure/mirror{ - pixel_x = 25; - pixel_y = 8 +/obj/effect/decal/fake_object{ + desc = "A chalkboard with the menu of the cafe written on it."; + icon = 'icons/obj/coffeemenu.dmi'; + icon_state = "left"; + name = "coffee menu chalkboard"; + dir = 8; + pixel_x = 32 }, +/obj/item/reagent_containers/food/condiment/shaker/pumpkinspice{ + pixel_y = 6 + }, +/obj/item/reagent_containers/food/condiment/shaker/peppermill{ + pixel_x = 2; + pixel_y = 0 + }, +/obj/item/reagent_containers/food/condiment/shaker/salt{ + pixel_x = 7; + pixel_y = 0 + }, +/obj/item/reagent_containers/food/condiment/shaker/sprinkles{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/item/storage/box/fancy/donut{ + pixel_y = -9; + pixel_x = 1 + }, +/obj/structure/table/stone/marble, /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) "emE" = ( @@ -5072,9 +5156,6 @@ /area/bridge/meeting_room) "evn" = ( /obj/effect/floor_decal/corner/red/diagonal, -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/spline/plain/corner{ dir = 4 @@ -5082,15 +5163,32 @@ /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) "evE" = ( -/obj/machinery/vending/dinnerware/plastic, -/obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/door/blast/shutters/open{ dir = 8; - id = "shutters_deck3_cafeutensils"; - name = "Cafe Utensils Vendor Shutter" + id = "shutters_deck3_cafedesk"; + name = "Cafe Desk Shutter" }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark/full, +/obj/structure/table/stone/marble, +/obj/machinery/vending/dinnerware/plastic{ + pixel_y = 22 + }, +/obj/item/reagent_containers/food/condiment/shaker/salt{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/food/condiment/shaker/peppermill{ + pixel_x = 4; + pixel_y = 8 + }, +/obj/item/flame/candle{ + pixel_y = 8 + }, +/obj/item/glass_jar{ + desc = "A small empty jar that is mostly used for giving a tip."; + name = "tip jar"; + pixel_y = -9 + }, +/turf/simulated/floor/tiled, /area/horizon/cafeteria) "evI" = ( /obj/effect/floor_decal/industrial/warning, @@ -7420,6 +7518,9 @@ /obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) "gbN" = ( @@ -8039,7 +8140,7 @@ name = "Cafe Desk Shutter" }, /obj/structure/table/stone/marble, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/tiled, /area/horizon/cafeteria) "gDE" = ( /obj/machinery/light/small/emergency{ @@ -10560,6 +10661,9 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) "iDn" = ( @@ -10752,16 +10856,31 @@ /turf/simulated/floor/tiled/dark/full, /area/crew_quarters/heads/hop/xo) "iJl" = ( -/obj/structure/table/reinforced/wood, -/obj/machinery/chemical_dispenser/bar_soft/full{ - pixel_x = 4; - pixel_y = 7 - }, -/obj/effect/floor_decal/corner/red/diagonal, +/obj/structure/table/stone/marble, /obj/effect/floor_decal/spline/plain{ dir = 9 }, -/turf/simulated/floor/lino/grey, +/obj/machinery/chemical_dispenser/bar_soft/full{ + pixel_x = -1; + pixel_y = 12 + }, +/obj/item/reagent_containers/glass/bottle/syrup/chocolate{ + pixel_y = 1; + pixel_x = -12 + }, +/obj/item/reagent_containers/glass/bottle/syrup/pumpkin{ + pixel_x = 7; + pixel_y = 1 + }, +/obj/item/reagent_containers/glass/bottle/syrup/vanilla{ + pixel_x = 16; + pixel_y = 1 + }, +/obj/item/reagent_containers/glass/bottle/syrup/caramel{ + pixel_x = -3; + pixel_y = 1 + }, +/turf/simulated/floor/wood, /area/horizon/cafeteria) "iKX" = ( /obj/structure/railing/mapped{ @@ -11309,16 +11428,12 @@ /turf/simulated/floor/tiled, /area/bridge) "jhP" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/red/diagonal, -/obj/effect/floor_decal/spline/plain{ +/obj/structure/railing/mapped{ dir = 8 }, -/turf/simulated/floor/lino/grey, -/area/horizon/cafeteria) +/obj/structure/lattice, +/turf/simulated/open, +/area/horizon/hallway/deck_three/primary/central) "jid" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -11596,6 +11711,9 @@ }, /obj/effect/floor_decal/corner/red/diagonal, /obj/effect/floor_decal/spline/plain/corner, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) "jvH" = ( @@ -13128,6 +13246,9 @@ /obj/effect/floor_decal/spline/plain/corner{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) "kwr" = ( @@ -13345,6 +13466,22 @@ /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor/tiled/dark/full, /area/tcommsat/entrance) +"kHX" = ( +/obj/structure/closet/secure_closet/freezer/cafe, +/obj/machinery/power/apc/low{ + dir = 4; + name = "east bump"; + pixel_x = 24 + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/effect/floor_decal/corner/grey/diagonal{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/tiled/white, +/area/horizon/cafeteria) "kIe" = ( /obj/structure/lattice/catwalk, /obj/structure/railing/mapped{ @@ -14221,6 +14358,13 @@ "lnI" = ( /turf/simulated/wall, /area/horizon/security/meeting_room) +"lnV" = ( +/obj/effect/floor_decal/spline/plain/cee{ + dir = 1 + }, +/obj/structure/bed/stool/bar/padded/teal, +/turf/simulated/floor/lino/grey, +/area/horizon/cafeteria) "lnX" = ( /obj/effect/floor_decal/corner/green/full{ dir = 4 @@ -14723,11 +14867,13 @@ /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) "lFr" = ( -/obj/structure/bed/stool/bar/padded/red, -/obj/effect/floor_decal/corner/red/diagonal, /obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/structure/bed/stool/bar/padded/teal, /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) "lFK" = ( @@ -15568,11 +15714,16 @@ /turf/simulated/floor/tiled/white, /area/horizon/security/autopsy_laboratory) "mpY" = ( -/obj/effect/floor_decal/corner/red/diagonal, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/lino/grey, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/horizon/cafeteria) "mqh" = ( /obj/effect/floor_decal/corner/blue{ @@ -16127,6 +16278,24 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) +"mQN" = ( +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = 32; + pixel_x = -27 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/effect/floor_decal/corner/grey/diagonal{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/horizon/cafeteria) "mRd" = ( /obj/machinery/alarm{ dir = 8; @@ -17700,12 +17869,23 @@ /turf/simulated/open, /area/horizon/hallway/deck_three/primary/starboard) "obj" = ( -/obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/turf/simulated/floor/lino/grey, +/obj/structure/table/stone/marble, +/obj/item/reagent_containers/glass/rag/advanced/idris{ + pixel_x = -4; + pixel_y = 0 + }, +/obj/item/reagent_containers/food/drinks/shaker{ + pixel_x = 6; + pixel_y = 4 + }, +/turf/simulated/floor/wood, /area/horizon/cafeteria) "obp" = ( /obj/machinery/ammunition_loader/longbow{ @@ -17811,9 +17991,11 @@ id = "shutters_deck3_cafedesk"; name = "Cafe Desk Shutter" }, -/obj/item/material/ashtray/bronze, /obj/structure/table/stone/marble, -/turf/simulated/floor/tiled/dark/full, +/obj/item/material/ashtray/bronze{ + pixel_y = -5 + }, +/turf/simulated/floor/tiled, /area/horizon/cafeteria) "ofL" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -20763,6 +20945,10 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/controlroom) +"qKv" = ( +/obj/structure/lattice, +/turf/simulated/open, +/area/horizon/hallway/deck_three/primary/central) "qKz" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -20799,17 +20985,34 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hop/xo) "qKT" = ( -/obj/structure/table/reinforced/wood, -/obj/item/reagent_containers/glass/rag, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/device/radio/intercom{ - dir = 8; - pixel_x = 25 - }, -/obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/light{ dir = 4 }, +/obj/effect/floor_decal/corner/teal/diagonal, +/obj/item/material/kitchen/utensil/knife{ + pixel_x = -5; + pixel_y = -9 + }, +/obj/item/material/kitchen/rollingpin{ + pixel_x = -1; + pixel_y = -10 + }, +/obj/effect/decal/fake_object{ + desc = "A chalkboard with the menu of the cafe written on it."; + icon = 'icons/obj/coffeemenu.dmi'; + icon_state = "right"; + name = "coffee menu chalkboard"; + dir = 8; + pixel_x = 32 + }, +/obj/structure/table/stone/marble, +/obj/item/pen/black{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/item/reagent_containers/cooking_container/board/bowl{ + pixel_y = -13 + }, /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) "qLy" = ( @@ -21370,13 +21573,15 @@ /turf/simulated/floor/tiled/full, /area/bridge) "rnL" = ( -/obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/bed/stool/bar/padded/red, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/turf/simulated/floor/lino/grey, +/obj/structure/bed/stool/bar/padded/red, +/turf/simulated/floor/wood, /area/horizon/cafeteria) "rnX" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, @@ -21430,9 +21635,15 @@ /turf/simulated/wall, /area/security/vacantoffice) "rqs" = ( -/obj/structure/foamedmetal, -/turf/simulated/floor, -/area/maintenance/security_starboard) +/obj/structure/sink/kitchen{ + layer = 3.5; + pixel_y = 27 + }, +/obj/effect/floor_decal/corner/grey/diagonal{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/horizon/cafeteria) "rqM" = ( /obj/structure/closet/crate, /obj/random/loot, @@ -23011,7 +23222,7 @@ /turf/simulated/floor/tiled/dark, /area/medical/smoking) "ssD" = ( -/obj/effect/floor_decal/corner/red/diagonal, +/obj/effect/floor_decal/spline/plain/cee, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -23021,8 +23232,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/spline/plain{ - dir = 6 +/obj/structure/cable/green{ + icon_state = "4-8" }, /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) @@ -24080,13 +24291,44 @@ /turf/simulated/floor/tiled/dark, /area/horizon/longbow) "tqm" = ( -/obj/structure/table/reinforced/wood, /obj/machinery/chemical_dispenser/coffeemaster/full{ - pixel_x = -3; - pixel_y = 7 + pixel_x = -9; + pixel_y = 12 }, -/obj/effect/floor_decal/corner/red/diagonal, -/turf/simulated/floor/lino/grey, +/obj/structure/table/stone/marble, +/obj/effect/decal/fake_object{ + desc = "A descriptive sign."; + icon = 'icons/effects/cafesign.dmi'; + icon_state = "cafesign"; + name = "cafe sign"; + pixel_y = 30 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/idris{ + pixel_x = 9; + pixel_y = 8 + }, +/obj/item/reagent_containers/food/drinks/takeaway_cup_idris, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/idris{ + pixel_x = 9; + pixel_y = 2 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/idris{ + pixel_x = 9; + pixel_y = -4 + }, +/obj/item/reagent_containers/food/drinks/takeaway_cup_idris{ + pixel_y = 0 + }, +/obj/item/reagent_containers/food/drinks/takeaway_cup_idris{ + pixel_x = -7 + }, +/obj/item/reagent_containers/food/drinks/takeaway_cup_idris{ + pixel_x = -7 + }, +/turf/simulated/floor/wood, /area/horizon/cafeteria) "tqy" = ( /obj/structure/disposalpipe/segment{ @@ -24441,14 +24683,16 @@ /turf/simulated/floor, /area/maintenance/security_starboard) "tDT" = ( -/obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/turf/simulated/floor/lino/grey, +/turf/simulated/floor/wood, /area/horizon/cafeteria) "tFa" = ( /obj/machinery/light_switch{ @@ -25523,6 +25767,16 @@ }, /turf/simulated/floor/tiled/white, /area/medical/ward) +"uwL" = ( +/obj/machinery/appliance/cooker/oven{ + pixel_y = 8 + }, +/obj/effect/floor_decal/corner/grey/diagonal{ + dir = 8 + }, +/obj/machinery/firealarm/east, +/turf/simulated/floor/tiled/white, +/area/horizon/cafeteria) "uxr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/industrial/warning{ @@ -26818,6 +27072,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/hologram/holopad, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) "vvg" = ( @@ -27837,12 +28094,12 @@ /obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) "wkI" = ( @@ -29423,6 +29680,14 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/security/firing_range) +"xrD" = ( +/obj/effect/floor_decal/corner/teal/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/chem_heater, +/turf/simulated/floor/lino/grey, +/area/horizon/cafeteria) "xrV" = ( /obj/structure/flora/pottedplant/random, /obj/effect/floor_decal/spline/fancy/wood/full, @@ -29483,6 +29748,7 @@ /obj/structure/railing/mapped{ dir = 8 }, +/obj/structure/lattice, /turf/simulated/open, /area/horizon/hallway/deck_three/primary/central) "xus" = ( @@ -52806,7 +53072,7 @@ lwL ucg stS bpP -jhP +soS evn lCc xqs @@ -53209,11 +53475,11 @@ xaT rIg qlt tmc -kIy +ajV mzI amM -oAK -lFr +lnV +cHf lFr lFr ssD @@ -53410,19 +53676,19 @@ nVR xaT rIg egb -lrF -tlL -hNj +kwr +qKv +jhP lbi evE -gDe +bTH ofx gDe aLA lbi -hNj -tlL -ykD +jhP +qKv +eEz xNx fWB dCe @@ -53613,7 +53879,7 @@ xaT rIg qlt lrF -tlL +qKv tlL xXD iJl @@ -53623,7 +53889,7 @@ obj aeC uKi tlL -tlL +qKv ykD fGV axw @@ -53814,14 +54080,14 @@ ftC rBG jAj lSN -fXr -fXr -fXr +vFz +lbi +lbi lbi tqm mpY -arR -arR +dvl +dvl dui lbi qzF @@ -54016,15 +54282,15 @@ rrp rrp vFz qKz -fXr -fXr -rqs +vFz lbi +rqs +mQN awM +bMn arR arR -arR -arR +xrD uKi wWG vOV @@ -54219,9 +54485,9 @@ aWw rMS nMz gvP -fXr -rqs lbi +uwL +kHX aob emD qKT @@ -54421,8 +54687,8 @@ fXr tUk oip jYN -fXr -fXr +lbi +lbi lbi lbi lbi