From 6be749e919a4276c453244d71324b862d2405abe Mon Sep 17 00:00:00 2001 From: evilew Date: Fri, 24 Jan 2025 16:16:53 +0100 Subject: [PATCH] fixed a cake sprite, added gateway computers - added gateway computers to all stations besides Meta - fixed blackberry cake sprites to replace them with better ones --- _maps/map_files/BoxStation/BoxStation.dmm | 7 +++--- _maps/map_files/KiloStation/KiloStation.dmm | 25 +++++++++++++++---- _maps/map_files/PubbyStation/PubbyStation.dmm | 15 +++++------ .../food_and_drinks/food/snacks_cake.dm | 18 ++++++++----- 4 files changed, 42 insertions(+), 23 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 53937e68cf..9cd5f293ff 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -1623,7 +1623,7 @@ "aFB" = (/obj/machinery/light{dir = 1; pixel_y = 16},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/catwalk_floor,/area/maintenance/central/secondary) "aFC" = (/obj/structure/safe,/obj/item/clothing/head/bearpelt,/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/item/gun/ballistic/revolver/russian,/obj/item/ammo_box/a357,/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,/obj/effect/turf_decal/bot_white/left,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ai_monitored/command/nuke_storage) "aFD" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{icon_state = "1-2"},/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating,/area/maintenance/fore) -"aFE" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_x = -30},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/command/gateway) +"aFE" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_x = -30},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/computer/gateway_control{dir = 4},/turf/open/floor/plasteel,/area/command/gateway) "aFF" = (/obj/structure/chair/stool,/turf/open/floor/plasteel,/area/command/gateway) "aFG" = (/turf/open/floor/plasteel,/area/command/gateway) "aFH" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/commons/dorms) @@ -2050,7 +2050,7 @@ "aNP" = (/obj/structure/closet/emcloset,/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel,/area/hallway/secondary/entry) "aNQ" = (/obj/structure/closet/emcloset,/obj/effect/turf_decal/stripes/line{dir = 5},/turf/open/floor/plasteel,/area/hallway/secondary/entry) "aNR" = (/obj/structure/table/wood,/obj/item/storage/fancy/cigarettes{pixel_y = 2},/obj/item/lighter/greyscale{pixel_x = 4; pixel_y = 2},/turf/open/floor/plasteel/grimy,/area/hallway/secondary/entry) -"aNS" = (/obj/structure/table/wood,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/carpet,/area/hallway/secondary/entry) +"aNS" = (/obj/structure/table/wood,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/book/lorebooks/welcome_to_gato,/turf/open/floor/carpet,/area/hallway/secondary/entry) "aNT" = (/obj/machinery/vending/gato,/turf/open/floor/plasteel/dark,/area/hallway/secondary/entry) "aNU" = (/obj/structure/cable{icon_state = "2-4"},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/hallway/primary/central) "aNV" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel,/area/hallway/primary/port) @@ -7420,6 +7420,7 @@ "kJi" = (/obj/structure/table/wood,/obj/item/book/manual/blubbery_bartender,/turf/open/floor/carpet/red,/area/maintenance/bar) "kJj" = (/obj/effect/spawner/lootdrop/maintenance{lootcount = 8; name = "8maintenance loot spawner"},/turf/open/floor/plating,/area/maintenance/port/aft) "kKb" = (/obj/structure/chair/beanbag/green{dir = 8; pixel_x = 2; pixel_y = -2},/obj/effect/turf_decal/tile/green{dir = 8},/obj/effect/turf_decal/tile/green{dir = 4},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_decals10"},/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_decals10"},/obj/structure/cable{icon_state = "0-2"},/obj/machinery/power/apc{areastring = "/area/hallway/secondary/service"; dir = 1; name = "Service Hall APC"; pixel_y = 25},/turf/open/floor/plasteel/cafeteria{dir = 5},/area/hallway/secondary/service) +"kLW" = (/obj/structure/table/plasmaglass,/obj/item/book/lorebooks/welcome_to_gato,/turf/open/floor/carpet/black,/area/service/bar) "kMu" = (/obj/effect/turf_decal/stripes/white/line{dir = 5},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/security/prison/upper) "kOh" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/drinks/drinkingglass{pixel_x = -6; pixel_y = 6},/obj/item/reagent_containers/food/drinks/drinkingglass{pixel_x = 6; pixel_y = -2},/obj/item/reagent_containers/food/drinks/bottle/champagne,/turf/open/floor/carpet,/area/hallway/secondary/exit) "kSb" = (/obj/machinery/requests_console{department = "Security"; departmentType = 5; pixel_y = 30},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 8},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/security/office) @@ -7952,7 +7953,7 @@ byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRFatJbh byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaQoaaaaaaaaaaxwaxyaxzayTaQpbkuaQqaPeaxBaxBaQraQqbkuaQpaPeaxBaxBaxBaQsaQtaQuaQvaQwaQxbmgaQyaQzaLObmhbmiaPjaQBaPluQvbpMlqGfNxaPlsswaThaTmnVktRyaUfaUCaPpaQNaQOaQPaPsnbdaPuaPuaQRaPuaPuaPAaPAaQSaQTaPAaPAaPAaQUbjWbbeaILaaaaaaaaaaaaaaaaaaaaauKSaKnaQVaQWaQXaQYaQZaRaaRbaRcaRdaReuKSaaaaaaaaaaaaaaaaaaaaaaILaVNaIPbjXaJdbmjaRjbmkaTUaNpbmlaWHbmmbmnbdaaSaaSaaSabmoaJiaSBaRoaRqaRuaRraRtaStaSEbmaaOHaRvaVsbmpbmpbmqaRxaOHaHTaRyaFbaRzooZbmraONaRAaRAaRBaFbaFbaRCaFbaCwaRDaGNaOTaREaREaOUaOVaCwaCwaCwaYNbmsbmtbbkaZNbnSaMyaRGaRHaMzaMzaMzaMzaMzaMzaRIaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRFatJbhrbanaaaaaaaaaaaaaaaaweaXgawgaRKaRLaRLaRLaRLaRLaRLaRLaRLaRKaRLaRLazaaYOcfZnRaaVOaVPsMNaVTbmuaWNaXbaXyaPjaPjaPjaQBaPlkxbbpPbpPbsnaPlsswjmfbpQjTSbpfbpfkaraPpaRVaQOaQOaPsnbdaPuaRWaRXaRXaRYaPAaSdaTxaSbaTAaUNaSebbVbjWbbeaILaaaaaaaaaaaaaPCaPCaPCaPCaSgaShctzaSjaSkaSiaSmaSnctzaSlaSvaPCaPCaPCaPCaaaaaaaaaaaaaILbmvbmwbmxaJdbmybmzaKoaKoaKoaKobmAbmBaSfaSqaKoaKoaKobmCaVoaSBaSCaSDaSFaSGaSHaStaSBaSIaUcaSKbmDaZubbdbmEaSNaOHaHTaHUaFbbadaMpaOMaONaRAaRAaMpaSOaSPaMpaSQaCworqaSRaSSaREaREaVAaSUaSVaCwbchbcibmFbmGbckaZObdjbdmbdnbdobmHbetaRkaRkaRkaRkbpIaTaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhrbclbhPatJatJatJatJauSauSauSauSayUayUayUayUayUayUayUayUauSauSmJZaAgaTbxIJaTcaTdaTcnGbaTcaTcaTeaTcaTcaPjaQAaTfaTgaPltIrbfRbfRhaVaPljNLbpfbpfaTouAvpYbaVMaPpaTqaTraTsaPsaQQaPuaTtaTuaTvaTwaPAaUOaTyaSbaTzaUPaSebbVaPBbbeaILaILaTBaPCaPCaPCaTCaTDaTEaTFaTGaTLaTIaTJxHvaTKaTHaTLaTMaTNaTOaTPaTQaPCaPCaPCaTBaILaILbmJaIPbjXaJdaSraKobmKbmLbmLbmMbmNaNqaSsbmMbmLbmLbmObmCaVoaSBaSCbmPaTXaTYaTZaUaaSBaUbaUcaUdbmQbejbelbmRaUgaUhaHTaHUaFbaUihsZaOMaONaUjaMpaMpaUkbmSaUlaUmaCwaUnaUoaUpaREaREaUqaUrlJOaCwbewaQjaQhbmTbckaZPbfVbfWaQhaQibmUaMzaMzaMzaMzaMzaMzaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayUbmVayWayXmChaTcaUvdOeaUuaUwaUynzpaUwaTcbmWaRTaUAaUBaPlkWDbfRbfRvpOaPlsswirIlAqaUKaULaUMhzoaPpaPpaPpaPpaPsaQQaPuaPuaPuaPuaPuaPAaUQbgfbmXbmYbmZaSebbVaIPbbeaBuaIRaURaUSaZQaPCaUUlTjaUWaUXaUYaUXaUZaVaaVbaVcaVdaVeaVfaVdaVgaSoaViaPCaZRaUSaVkaVlaCTaVNaIPaxxaJdbnaaKobnbbncbndbnebnfbngaSzbnebndbnhbnibmCaVoaSBbnjbnkbnlaVpbnkbnmbnnaJiaVraUdbnobnpbnpbnqaUgaVtaHTaVuaFbaFbaFbeObaONaVvaVwaMpaVxaVybnraVzaCwuHUaSRaSSaREaREaVAaSUaVBaCwbnsaQjaQhbmTbntbnubnvbfWaQhaQibmUaMzaZNaZOaZPaMzcPzaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayUbmVayWayXmChaTcaUvdOeaUuaUwaUynzpaUwaTcbmWaRTaUAaUBaPlkWDbfRbfRvpOaPlsswirIlAqaUKaULaUMhzoaPpaPpaPpaPpaPsaQQaPuaPuaPuaPuaPuaPAaUQbgfbmXbmYbmZaSebbVaIPbbeaBuaIRaURaUSaZQaPCaUUlTjaUWaUXaUYaUXaUZaVaaVbaVcaVdaVeaVfaVdaVgaSoaViaPCaZRaUSaVkaVlaCTaVNaIPaxxaJdbnaaKobnbbnckLWbnebnfbngaSzbnebndbnhbnibmCaVoaSBbnjbnkbnlaVpbnkbnmbnnaJiaVraUdbnobnpbnpbnqaUgaVtaHTaVuaFbaFbaFbeObaONaVvaVwaMpaVxaVybnraVzaCwuHUaSRaSSaREaREaVAaSUaVBaCwbnsaQjaQhbmTbntbnubnvbfWaQhaQibmUaMzaZNaZOaZPaMzcPzaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaVDayUayUayWaYSbYnaTcaUxaUuaUuaVHaVIaUzaUwaTcaVJaVKaVQaRTaPlbqwbfRbfRaXtaPlsswkarrWjjtZdIzaXuaXvaPlaVUaVVaVWaVXaVYaVZaWaaWbaWcaWdaWdaWdaWdaWdaWdaWdaWdbbVaIPbjXaCVaIPaWeaWfaWgaWhaWiaWjaWkaWlaWmaWnaWoaWpaWqaWraWsaWtaWuaWvaWkaWwaWxaWyaWzaWAaWBaWCaEpaLyaIPbjXblSbnxaKobnybnzbnzbnAbnBbnCaSAbnAbnzbnzbnDbmCbnEbnFbnGbnHbnIbnJbnKbnLaYoaJiaOHaUdaRwaZWaZWaRwaUgaOHaHTaWDbnMbnNaWPaWQaWRaWSaWSaWTaOMaOMaOMaOMbegaREaREaREaREaREaWVaWWaWXaYIaWZbnObnPbnQbnRaZObnSbfWaQhaQibnTaMzaZPaSTbnUaMzbnwaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRMatJbhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXebnVaRJbeybnWayXuvSaTcaXiaXjaXkaXkaXlaXmaXnaTcaXoaRTaVLaPlaPlaPlxVWxVWaPlaPlsswkaraPlaPludKvEfbnXaPlaXzaXAaXBaXCaXDaXEaXBaXFaXGaXGaXHaXIaXJaXKaXLaXMaWdbbVaIPbbZaWEaXPaXQaXRaXSuKSaXTaSpaUVaVhaXXaXYaXYaXZaNtaYbaYcaYdaYeaYfaXVaYgaXTuKSaXSaXRaYhaYiaWMbnYaIPbjXblSbmybmzaKoaKoaKoaKoaKoaKoboaaKoaKoaJebobbocaJiaJiaJiaYraYraYraYraJiaJiaJiaYsaYtbodaRwaRwaYvboeaYwaYxaYyaYzbofaYAaYBaYCaOMaOMaYDaOMaOMaOMaOMbegaYEaYFaYFaYFaYFaYFaYGaYHbogaYJaYKaYLbohbckgSabnvbfWaQhaQiboiaMzbnuaZOaZNaMzcPzaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayUayUayUayWayXaYPaTcaYRaXkaXkaXkaXkaYTaUuaTcaYUaYVaVLaPliXAhzAaYZaYZlbnspQmidqnBlyOfBlbqxbfAhcSaPlaZhaZicGrhIGcGraZlaZmaZnaWdaZoaZpaZpaZqaZraZsaZtaWdbbYaLzbomaZvaZvaZvaZvaZvaZvaZwaZxaZvaXXaXZaZzaZAaZAbeDaZAaZAaZCaYbaYeaZDaZEaZFaZDaZDaZDaZDaZDaZDbonaIPbjXaJdboobopbgUboqborbosbotboubovbowboxaJdbfubfuboybozboAaZTaZTaZTaZTboBbozboyaZUaRwboCaZWaZWaZXaZYaYsaHTaZZroPbabaFbbacbafbaeaNDaNCbafaUkaNDboDaCwbahoHHbaiaREaREbaiqMSbajaCwbakbalboEbohboFboGboHbfWaQhaQibmUaMzaMzaMzaMzaMzaMzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 5a87b4b985..b2afab5c14 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -58436,10 +58436,7 @@ dir = 1 }, /obj/structure/table, -/obj/item/toy/figure/assistant{ - pixel_x = 8; - pixel_y = 6 - }, +/obj/item/book/lorebooks/welcome_to_gato, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bTD" = ( @@ -58615,6 +58612,10 @@ pixel_y = 4 }, /obj/item/pen, +/obj/item/toy/figure/assistant{ + pixel_x = 8; + pixel_y = 6 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bTO" = ( @@ -74512,6 +74513,9 @@ dir = 8; pixel_x = 32 }, +/obj/machinery/computer/gateway_control{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/command/gateway) "cvR" = ( @@ -81137,6 +81141,17 @@ "cZm" = ( /turf/closed/wall/rust, /area/security/prison) +"day" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/obj/structure/chair{ + dir = 8 + }, +/obj/item/book/lorebooks/welcome_to_gato, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) "dbY" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ dir = 1 @@ -127781,7 +127796,7 @@ bPf bQZ bQZ wHR -bQZ +day bWA bXB bPe diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index e6d8d918ae..53399490ec 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -8366,6 +8366,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, +/obj/machinery/computer/gateway_control{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/command/gateway) "aqR" = ( @@ -28387,10 +28390,7 @@ /area/security/office) "bgU" = ( /obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = 1; - pixel_y = 5 - }, +/obj/item/book/lorebooks/welcome_to_gato, /turf/open/floor/plasteel/grimy, /area/commons/lounge) "bgV" = ( @@ -28413,15 +28413,12 @@ /area/commons/lounge) "bgY" = ( /obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = 1; - pixel_y = 5 - }, /obj/machinery/button/door{ id = "loungeshutters"; name = "Privacy Shutters"; pixel_y = 25 }, +/obj/item/book/lorebooks/welcome_to_gato, /turf/open/floor/plasteel/grimy, /area/commons/lounge) "bgZ" = ( @@ -60149,7 +60146,6 @@ /area/maintenance/department/security/brig) "niy" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/cookie, /obj/machinery/airalarm{ pixel_y = 22 }, @@ -60163,6 +60159,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/book/lorebooks/welcome_to_gato, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) "nkk" = ( diff --git a/code/modules/food_and_drinks/food/snacks_cake.dm b/code/modules/food_and_drinks/food/snacks_cake.dm index 67ac2ee59b..1eeca7bcb3 100644 --- a/code/modules/food_and_drinks/food/snacks_cake.dm +++ b/code/modules/food_and_drinks/food/snacks_cake.dm @@ -260,24 +260,27 @@ /obj/item/reagent_containers/food/snacks/store/cake/bsvc // blackberry strawberries vanilla cake name = "blackberry and strawberry vanilla cake" desc = "A plain cake, filled with assortment of blackberries and strawberries!" - icon_state = "blackbarry_strawberries_cake_vanilla_cake" + icon = 'GainStation13/icons/obj/food/piecake.dmi' //GS13 - changed for our sprite + icon_state = "blackberry_strawberries_cake_vanilla_cake" slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/bsvc bonus_reagents = list(/datum/reagent/consumable/nutriment = 14, /datum/reagent/consumable/nutriment/vitamin = 4) - tastes = list("blackbarry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2, "cake" = 3) + tastes = list("blackberry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2, "cake" = 3) foodtype = GRAIN | DAIRY | FRUIT | SUGAR /obj/item/reagent_containers/food/snacks/cakeslice/bsvc name = "blackberry and strawberry vanilla cake slice" desc = "Just a slice of cake filled with assortment of blackberries and strawberries!" - icon_state = "blackbarry_strawberries_cake_vanilla_slice" + icon = 'GainStation13/icons/obj/food/piecake.dmi' //GS13 - changed for our sprite + icon_state = "blackberry_strawberries_cake_vanilla_slice" filling_color = "#FFD700" - tastes = list("blackbarry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2,"cake" = 3) + tastes = list("blackberry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2,"cake" = 3) foodtype = GRAIN | DAIRY | FRUIT | SUGAR /obj/item/reagent_containers/food/snacks/store/cake/bscc // blackbarry strawberries chocolate cake name = "blackberry and strawberry chocolate cake" desc = "A plain cake, filled with assortment of blackberries and strawberries!" - icon_state = "blackbarry_strawberries_cake_coco_cake" + icon = 'GainStation13/icons/obj/food/piecake.dmi' //GS13 - changed for our sprite + icon_state = "blackberry_strawberries_cake_cocoa_cake" slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/bscc bonus_reagents = list(/datum/reagent/consumable/nutriment = 14, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/coco = 5) tastes = list("blackberry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2,"cake" = 3) @@ -286,7 +289,8 @@ /obj/item/reagent_containers/food/snacks/cakeslice/bscc name = "blackberry and strawberry chocolate cake slice" desc = "Just a slice of cake filled with assortment of blackberries and strawberries!" - icon_state = "blackbarry_strawberries_cake_coco_slice" + icon = 'GainStation13/icons/obj/food/piecake.dmi' //GS13 - changed for our sprite + icon_state = "blackberry_strawberries_cake_cocoa_slice" filling_color = "#FFD700" tastes = list("blackberry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2,"cake" = 3) foodtype = GRAIN | DAIRY | FRUIT | SUGAR @@ -311,6 +315,7 @@ /obj/item/reagent_containers/food/snacks/store/cake/pound_cake name = "pound cake" desc = "A condensed cake made for filling people up quickly." + icon = 'GainStation13/icons/obj/food/piecake.dmi' //GS13 - changed for our sprite icon_state = "pound_cake" slices_num = 7 //Its meant to feed the party slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/pound_cake_slice @@ -321,6 +326,7 @@ /obj/item/reagent_containers/food/snacks/cakeslice/pound_cake_slice name = "pound cake slice" desc = "A slice of condensed cake made for filling people up quickly." + icon = 'GainStation13/icons/obj/food/piecake.dmi' //GS13 - changed for our sprite icon_state = "pound_cake_slice" filling_color = "#00FFFF" tastes = list("cake" = 5, "sweetness" = 5, "batter" = 1)