From 7197ec96e2d8ceb3f7e32d7dbf76e0c89514699b Mon Sep 17 00:00:00 2001 From: ArrisFairburne Date: Fri, 20 Jun 2025 02:55:49 -0400 Subject: [PATCH] Quiet ghost cafe (#4079) ## About The Pull Request Sets `shut_up = true` for all Ghost Cafe vendors. ## Why It's Good For The Game No more annoying textspam while ERPing in the Ghost Cafe. ## Proof Of Testing I idled around the central vending area on the cafe as a ghost and didn't see any vending machine messages. ## Changelog :cl: qol: Ghost Cafe vending machines no longer say voice lines /:cl: --- _maps/map_files/generic/CentCom_skyrat_z2.dmm | 210 +++++++++++++----- 1 file changed, 154 insertions(+), 56 deletions(-) diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index c7a3f23bc94..b54512239c5 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -161,14 +161,18 @@ /turf/open/floor/iron, /area/centcom/interlink) "afj" = ( -/obj/machinery/vending/hydroseeds, +/obj/machinery/vending/hydroseeds{ + shut_up = 1 + }, /turf/open/indestructible/hoteltile{ icon_state = "darkfull" }, /area/centcom/holding/cafe) "afl" = ( /obj/machinery/barsign/all_access/directional/north, -/obj/machinery/vending/wardrobe/bar_wardrobe/ghost_cafe, +/obj/machinery/vending/wardrobe/bar_wardrobe/ghost_cafe{ + shut_up = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "afr" = ( @@ -270,7 +274,9 @@ /turf/open/floor/wood, /area/centcom/holding/cafe) "agr" = ( -/obj/machinery/vending/access/command, +/obj/machinery/vending/access/command{ + shut_up = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "agy" = ( @@ -450,7 +456,8 @@ default_price = 0; extended_inventory = 1; extra_price = 0; - fair_market_price = 0 + fair_market_price = 0; + shut_up = 1 }, /turf/open/indestructible/hoteltile{ icon_state = "floor" @@ -1101,7 +1108,8 @@ default_price = 0; extended_inventory = 1; extra_price = 0; - fair_market_price = 0 + fair_market_price = 0; + shut_up = 1 }, /turf/open/indestructible/hoteltile{ icon_state = "floor" @@ -1152,7 +1160,9 @@ /turf/open/indestructible/carpet, /area/centcom/holding/cafe) "aqy" = ( -/obj/machinery/vending/wardrobe/cargo_wardrobe/ghost_cafe, +/obj/machinery/vending/wardrobe/cargo_wardrobe/ghost_cafe{ + shut_up = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "aqG" = ( @@ -1314,7 +1324,8 @@ default_price = 0; extended_inventory = 1; extra_price = 0; - fair_market_price = 0 + fair_market_price = 0; + shut_up = 1 }, /turf/open/indestructible/hoteltile{ icon_state = "floor" @@ -1409,7 +1420,9 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, -/obj/machinery/vending/clothing, +/obj/machinery/vending/clothing{ + shut_up = 1 + }, /turf/open/indestructible/hoteltile{ icon_state = "floor" }, @@ -1545,7 +1558,9 @@ }, /area/centcom/holding/cafe/park) "awn" = ( -/obj/machinery/vending/wardrobe/hydro_wardrobe/ghost_cafe, +/obj/machinery/vending/wardrobe/hydro_wardrobe/ghost_cafe{ + shut_up = 1 + }, /turf/open/indestructible/hoteltile{ icon_state = "darkfull" }, @@ -1599,7 +1614,9 @@ /area/centcom/holding/cafe) "awQ" = ( /obj/machinery/light/directional/south, -/obj/machinery/vending/wardrobe/engi_wardrobe/ghost_cafe, +/obj/machinery/vending/wardrobe/engi_wardrobe/ghost_cafe{ + shut_up = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "awU" = ( @@ -1879,7 +1896,9 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, -/obj/machinery/vending/games, +/obj/machinery/vending/games{ + shut_up = 1 + }, /turf/open/indestructible/hoteltile{ icon_state = "floor" }, @@ -2129,7 +2148,9 @@ }, /area/centcom/holding/cafe/park) "aBk" = ( -/obj/machinery/vending/wardrobe/curator_wardrobe/ghost_cafe, +/obj/machinery/vending/wardrobe/curator_wardrobe/ghost_cafe{ + shut_up = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "aBm" = ( @@ -2303,7 +2324,9 @@ /turf/open/misc/dirt/planet, /area/centcom/holding/cafe/park) "aCY" = ( -/obj/machinery/vending/wardrobe/viro_wardrobe/ghost_cafe, +/obj/machinery/vending/wardrobe/viro_wardrobe/ghost_cafe{ + shut_up = 1 + }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, @@ -2397,7 +2420,9 @@ }, /area/centcom/holding/cafe) "aEG" = ( -/obj/machinery/vending/dinnerware, +/obj/machinery/vending/dinnerware{ + shut_up = 1 + }, /turf/open/indestructible/hoteltile{ icon_state = "cafeteria" }, @@ -2564,7 +2589,8 @@ default_price = 0; extended_inventory = 1; extra_price = 0; - fair_market_price = 0 + fair_market_price = 0; + shut_up = 1 }, /turf/open/indestructible/hoteltile{ icon_state = "floor" @@ -2867,7 +2893,9 @@ }, /area/centcom/holding/cafe) "aKD" = ( -/obj/machinery/vending/wardrobe/atmos_wardrobe, +/obj/machinery/vending/wardrobe/atmos_wardrobe{ + shut_up = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "aKP" = ( @@ -3344,7 +3372,9 @@ }, /area/centcom/holding/cafe) "aPK" = ( -/obj/machinery/vending/wardrobe/cent_wardrobe, +/obj/machinery/vending/wardrobe/cent_wardrobe{ + shut_up = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "aPU" = ( @@ -3373,7 +3403,9 @@ /turf/closed/indestructible/wood, /area/centcom/holding/cafe) "aQa" = ( -/obj/machinery/vending/wardrobe/det_wardrobe, +/obj/machinery/vending/wardrobe/det_wardrobe{ + shut_up = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "aQd" = ( @@ -4046,7 +4078,9 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 }, -/obj/machinery/vending/barbervend, +/obj/machinery/vending/barbervend{ + shut_up = 1 + }, /turf/open/indestructible/hoteltile{ icon_state = "floor" }, @@ -4071,7 +4105,9 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "aXd" = ( -/obj/machinery/vending/wardrobe/law_wardrobe/ghost_cafe, +/obj/machinery/vending/wardrobe/law_wardrobe/ghost_cafe{ + shut_up = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "aXl" = ( @@ -4122,7 +4158,8 @@ default_price = 0; extended_inventory = 1; extra_price = 0; - fair_market_price = 0 + fair_market_price = 0; + shut_up = 1 }, /obj/machinery/light/directional/east, /turf/open/indestructible/hotelwood, @@ -4157,7 +4194,9 @@ }, /area/centcom/holding/cafe/park) "aYj" = ( -/obj/machinery/vending/wardrobe/chap_wardrobe/unholy/ghost_cafe, +/obj/machinery/vending/wardrobe/chap_wardrobe/unholy/ghost_cafe{ + shut_up = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "aYk" = ( @@ -4338,7 +4377,9 @@ /area/centcom/holding/cafe) "bbW" = ( /obj/effect/turf_decal/bot, -/obj/machinery/vending/wardrobe/gene_wardrobe/ghost_cafe, +/obj/machinery/vending/wardrobe/gene_wardrobe/ghost_cafe{ + shut_up = 1 + }, /turf/open/indestructible/hoteltile{ icon_state = "darkfull" }, @@ -4655,7 +4696,8 @@ /area/centcom/interlink) "buX" = ( /obj/machinery/vending/hydronutrients{ - products = list(/obj/item/reagent_containers/cup/bottle/nutrient/ez = 50, /obj/item/reagent_containers/cup/bottle/nutrient/l4z = 20, /obj/item/reagent_containers/cup/bottle/nutrient/rh = 10, /obj/item/reagent_containers/spray/pestspray = 30, /obj/item/reagent_containers/syringe = 5, /obj/item/storage/bag/plants = 30, /obj/item/cultivator = 10, /obj/item/shovel/spade = 10, /obj/item/plant_analyzer = 10) + products = list(/obj/item/reagent_containers/cup/bottle/nutrient/ez = 50, /obj/item/reagent_containers/cup/bottle/nutrient/l4z = 20, /obj/item/reagent_containers/cup/bottle/nutrient/rh = 10, /obj/item/reagent_containers/spray/pestspray = 30, /obj/item/reagent_containers/syringe = 5, /obj/item/storage/bag/plants = 30, /obj/item/cultivator = 10, /obj/item/shovel/spade = 10, /obj/item/plant_analyzer = 10); + shut_up = 1 }, /turf/open/indestructible/hoteltile{ icon_state = "darkfull" @@ -6343,7 +6385,9 @@ /area/centcom/interlink) "dLs" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/vending/wardrobe/cent_wardrobe, +/obj/machinery/vending/wardrobe/cent_wardrobe{ + shut_up = 1 + }, /obj/effect/turf_decal/delivery, /turf/open/indestructible/hoteltile{ icon_state = "darkfull" @@ -6685,7 +6729,8 @@ default_price = 0; extended_inventory = 1; extra_price = 0; - fair_market_price = 0 + fair_market_price = 0; + shut_up = 1 }, /turf/open/indestructible/hoteltile{ icon_state = "floor" @@ -6734,7 +6779,9 @@ /turf/open/floor/wood/tile, /area/centcom/interlink) "erP" = ( -/obj/machinery/vending/dorms, +/obj/machinery/vending/dorms{ + shut_up = 1 + }, /turf/open/floor/iron/showroomfloor, /area/centcom/holding/cafe) "erR" = ( @@ -7923,7 +7970,9 @@ /turf/open/floor/fakebasalt, /area/centcom/holding/cafe/park) "gmE" = ( -/obj/machinery/vending/wardrobe/medi_wardrobe/ghost_cafe, +/obj/machinery/vending/wardrobe/medi_wardrobe/ghost_cafe{ + shut_up = 1 + }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, @@ -8242,7 +8291,9 @@ /area/centcom/interlink) "gJd" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/vending/access/command, +/obj/machinery/vending/access/command{ + shut_up = 1 + }, /obj/effect/turf_decal/delivery, /turf/open/indestructible/hoteltile{ icon_state = "darkfull" @@ -8837,7 +8888,9 @@ /area/centcom/holding/cafe/park) "hyt" = ( /obj/effect/turf_decal/bot, -/obj/machinery/vending/wardrobe/viro_wardrobe/ghost_cafe, +/obj/machinery/vending/wardrobe/viro_wardrobe/ghost_cafe{ + shut_up = 1 + }, /turf/open/indestructible/hoteltile{ icon_state = "darkfull" }, @@ -9643,7 +9696,9 @@ /area/centcom/holding/cafe) "iwF" = ( /obj/effect/turf_decal/sand, -/obj/machinery/vending/cigarette/beach, +/obj/machinery/vending/cigarette/beach{ + shut_up = 1 + }, /turf/open/misc/beach/sand, /area/centcom/holding/cafe/park) "iwK" = ( @@ -9970,7 +10025,9 @@ }, /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/light, -/obj/machinery/vending/autodrobe, +/obj/machinery/vending/autodrobe{ + shut_up = 1 + }, /turf/open/indestructible/hoteltile{ icon_state = "floor" }, @@ -10639,7 +10696,8 @@ default_price = 0; extended_inventory = 1; extra_price = 0; - fair_market_price = 0 + fair_market_price = 0; + shut_up = 1 }, /turf/open/indestructible/hoteltile{ icon_state = "floor" @@ -10995,7 +11053,9 @@ name = "thick vines"; opacity = 1 }, -/obj/machinery/vending/wardrobe/sec_wardrobe/red, +/obj/machinery/vending/wardrobe/sec_wardrobe/red{ + shut_up = 1 + }, /turf/open/misc/dirt/planet, /area/centcom/holding/cafe/park) "kID" = ( @@ -11555,7 +11615,9 @@ /area/centcom/holding/cafe) "lnP" = ( /obj/structure/sign/poster/contraband/space_cola/directional/north, -/obj/machinery/vending/boozeomat/cafe, +/obj/machinery/vending/boozeomat/cafe{ + shut_up = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "loD" = ( @@ -11839,7 +11901,9 @@ /turf/open/lava/fake, /area/centcom/holding/cafe/park) "lNi" = ( -/obj/machinery/vending/wardrobe/chem_wardrobe/ghost_cafe, +/obj/machinery/vending/wardrobe/chem_wardrobe/ghost_cafe{ + shut_up = 1 + }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, @@ -11930,7 +11994,8 @@ default_price = 0; extended_inventory = 1; extra_price = 0; - fair_market_price = 0 + fair_market_price = 0; + shut_up = 1 }, /turf/open/indestructible/hoteltile{ icon_state = "floor" @@ -12295,7 +12360,9 @@ }, /area/centcom/holding/cafe) "msM" = ( -/obj/machinery/vending/boozeomat, +/obj/machinery/vending/boozeomat{ + shut_up = 1 + }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/indestructible/hoteltile{ icon_state = "darkfull" @@ -12661,7 +12728,9 @@ /turf/open/floor/iron/dark/textured_large, /area/cruiser_dock) "mIk" = ( -/obj/machinery/vending/boozeomat/cafe, +/obj/machinery/vending/boozeomat/cafe{ + shut_up = 1 + }, /turf/open/floor/wood, /area/centcom/holding/cafe) "mIp" = ( @@ -13983,7 +14052,8 @@ /obj/machinery/vending/wardrobe/syndie_wardrobe/ghost_cafe{ default_price = 0; extra_price = 0; - fair_market_price = 0 + fair_market_price = 0; + shut_up = 1 }, /turf/open/misc/dirt/planet, /area/centcom/holding/cafe/park) @@ -14196,7 +14266,9 @@ /area/cruiser_dock) "oGv" = ( /obj/effect/turf_decal/bot, -/obj/machinery/vending/wardrobe/chem_wardrobe/ghost_cafe, +/obj/machinery/vending/wardrobe/chem_wardrobe/ghost_cafe{ + shut_up = 1 + }, /turf/open/indestructible/hoteltile{ icon_state = "darkfull" }, @@ -14424,7 +14496,9 @@ /turf/open/floor/wood, /area/centcom/interlink/dorm_rooms) "oYI" = ( -/obj/machinery/vending/coffee, +/obj/machinery/vending/coffee{ + shut_up = 1 + }, /turf/open/indestructible/hoteltile{ icon_state = "darkfull" }, @@ -15462,6 +15536,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, +/obj/structure/table/wood/fancy/black, /turf/open/indestructible/hotelwood{ icon = 'modular_skyrat/modules/aesthetics/floors/icons/floors.dmi'; icon_state = "wood_large" @@ -15667,7 +15742,9 @@ /area/centcom/interlink) "qwo" = ( /obj/effect/turf_decal/sand, -/obj/machinery/vending/snack, +/obj/machinery/vending/snack{ + shut_up = 1 + }, /turf/open/misc/beach/sand, /area/centcom/holding/cafe/park) "qwJ" = ( @@ -15803,7 +15880,9 @@ /area/centcom/interlink) "qGA" = ( /obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/vending/wardrobe/sec_wardrobe, +/obj/machinery/vending/wardrobe/sec_wardrobe{ + shut_up = 1 + }, /turf/open/floor/iron/dark, /area/centcom/holding/cafe) "qGW" = ( @@ -16464,7 +16543,9 @@ /area/centcom/holding/cafe) "rCl" = ( /obj/effect/turf_decal/bot, -/obj/machinery/vending/wardrobe/science_wardrobe/ghost_cafe, +/obj/machinery/vending/wardrobe/science_wardrobe/ghost_cafe{ + shut_up = 1 + }, /turf/open/indestructible/hoteltile{ icon_state = "darkfull" }, @@ -17552,7 +17633,9 @@ /area/centcom/interlink) "sKP" = ( /obj/effect/turf_decal/bot, -/obj/machinery/vending/wardrobe/robo_wardrobe/ghost_cafe, +/obj/machinery/vending/wardrobe/robo_wardrobe/ghost_cafe{ + shut_up = 1 + }, /turf/open/indestructible/hoteltile{ icon_state = "darkfull" }, @@ -17796,7 +17879,8 @@ /area/centcom/interlink) "tag" = ( /obj/machinery/vending/tool{ - onstation = 0 + onstation = 0; + shut_up = 1 }, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) @@ -17992,7 +18076,9 @@ /turf/open/indestructible/cobble/side, /area/centcom/holding/cafe/park) "tuC" = ( -/obj/machinery/vending/cigarette, +/obj/machinery/vending/cigarette{ + shut_up = 1 + }, /turf/open/indestructible/hoteltile{ icon_state = "darkfull" }, @@ -18005,7 +18091,9 @@ dir = 4 }, /obj/structure/sign/poster/contraband/lusty_xenomorph/directional/south, -/obj/machinery/vending/wardrobe/jani_wardrobe/ghost_cafe, +/obj/machinery/vending/wardrobe/jani_wardrobe/ghost_cafe{ + shut_up = 1 + }, /turf/open/indestructible/hoteltile{ icon_state = "white" }, @@ -18042,7 +18130,9 @@ /area/centcom/holding/cafe/park) "tyG" = ( /obj/effect/turf_decal/sand, -/obj/machinery/vending/cola, +/obj/machinery/vending/cola{ + shut_up = 1 + }, /turf/open/misc/beach/sand, /area/centcom/holding/cafe/park) "tzg" = ( @@ -18367,7 +18457,8 @@ default_price = 0; extended_inventory = 1; extra_price = 0; - fair_market_price = 0 + fair_market_price = 0; + shut_up = 1 }, /turf/open/indestructible/hoteltile{ icon_state = "floor" @@ -19410,13 +19501,17 @@ /area/centcom/interlink) "vxC" = ( /obj/effect/turf_decal/bot, -/obj/machinery/vending/wardrobe/coroner_wardrobe/ghost_cafe, +/obj/machinery/vending/wardrobe/coroner_wardrobe/ghost_cafe{ + shut_up = 1 + }, /turf/open/indestructible/hoteltile{ icon_state = "darkfull" }, /area/centcom/holding/cafe/park) "vxF" = ( -/obj/machinery/vending/games, +/obj/machinery/vending/games{ + shut_up = 1 + }, /turf/open/floor/carpet/cyan, /area/centcom/holding/cafe) "vxU" = ( @@ -19498,7 +19593,6 @@ /turf/open/floor/wood, /area/centcom/interlink) "vFo" = ( -/obj/structure/table/wood/fancy/black, /obj/item/disk/nuclear/fake{ pixel_y = 4 }, @@ -20716,7 +20810,9 @@ /turf/open/floor/iron, /area/centcom/interlink) "xqI" = ( -/obj/machinery/vending/dorms, +/obj/machinery/vending/dorms{ + shut_up = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "xrz" = ( @@ -21117,7 +21213,9 @@ /turf/open/floor/iron/freezer, /area/centcom/interlink) "xTZ" = ( -/obj/machinery/vending/wardrobe/coroner_wardrobe/ghost_cafe, +/obj/machinery/vending/wardrobe/coroner_wardrobe/ghost_cafe{ + shut_up = 1 + }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 },