From 7bec371bac88f68c624359dbf0d4b1ecf9f7e050 Mon Sep 17 00:00:00 2001 From: Tk420634 Date: Sun, 14 Jul 2024 15:15:56 -0500 Subject: [PATCH 1/2] CHAT CHUD ENGAGED --- _maps/map_files/coyote_bayou/foxybarupper.dmm | 3436 ++++++++--------- code/__HELPERS/game.dm | 52 +- code/datums/chatmessage.dm | 46 +- 3 files changed, 1782 insertions(+), 1752 deletions(-) diff --git a/_maps/map_files/coyote_bayou/foxybarupper.dmm b/_maps/map_files/coyote_bayou/foxybarupper.dmm index a4e3b67c4b..48981a7e94 100644 --- a/_maps/map_files/coyote_bayou/foxybarupper.dmm +++ b/_maps/map_files/coyote_bayou/foxybarupper.dmm @@ -1,4 +1,16 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ad" = ( +/obj/machinery/door/unpowered/securedoor, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/turf/open/floor/carpet/red, +/area/f13/fb/bar) "ag" = ( /obj/effect/turf_decal/siding/wood{ dir = 8; @@ -40,53 +52,6 @@ light_color = "#BAF8FF" }, /area/f13/caves) -"ak" = ( -/obj/machinery/light/small{ - color = "#444499"; - dir = 4; - light_color = "#444499"; - light_power = 2; - light_range = 2; - pixel_y = 13 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/turf/open/floor/carpet/black, -/area/f13/fb/bar) -"al" = ( -/obj/effect/overlay/fog/fog2{ - plane = -2 - }, -/obj/structure/railing{ - color = "#A47449"; - dir = 4 - }, -/obj/machinery/light/small{ - color = "#444499"; - light_color = "#444499"; - light_power = 2; - light_range = 2; - pixel_y = 0 - }, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/fb/bar) -"ap" = ( -/obj/structure/table/abductor, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/obj/effect/overlay/fog/fog2{ - plane = -2 - }, -/turf/open/floor/wood_common{ - color = "#99BBBB" - }, -/area/f13/fb/bar) "ar" = ( /obj/structure/simple_door/room, /obj/item/lock_bolt, @@ -102,18 +67,18 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"ax" = ( -/obj/structure/chess/whitepawn, -/turf/open/floor/plasteel/white{ - light_color = null; - color = "#666666" - }, -/area/f13/fb/bar) "aG" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, /obj/effect/turf_decal/siding/wood{ dir = 4; color = "#3B2B1A" }, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/carpet/royalblue, /area/f13/fb/bar) "aH" = ( @@ -127,6 +92,12 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) +"aL" = ( +/obj/structure/chair/f13chair1{ + dir = 8 + }, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/fb/bar) "aR" = ( /obj/effect/turf_decal/siding/wood/end{ dir = 1 @@ -140,12 +111,6 @@ color = "#B18770" }, /area/f13/caves) -"aT" = ( -/obj/effect/overlay/fog/fog2{ - plane = -2 - }, -/turf/closed/wall/mineral/brick, -/area/f13/fb/bar) "be" = ( /obj/machinery/photocopier, /obj/effect/turf_decal/siding/wood{ @@ -186,59 +151,59 @@ }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/fb/bar) -"bA" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" +"bt" = ( +/obj/effect/overlay/fog/fog2{ + plane = -2 }, -/obj/structure/chair/right{ +/turf/open/transparent/openspace, +/area/f13/fb/bar) +"bB" = ( +/obj/structure/railing{ + color = "#A47449"; dir = 1 }, /obj/effect/overlay/fog/fog2{ plane = -2 }, -/obj/structure/window/bronze{ - plane = -3 - }, -/turf/open/floor/wood_common{ - color = "#99BBBB" - }, +/turf/open/transparent/openspace, /area/f13/fb/bar) "bH" = ( /obj/item/kirbyplants/random, /turf/open/floor/plasteel/neutral, /area/f13/fb/bar) -"cs" = ( -/obj/structure/table/glass, -/turf/open/floor/carpet/red, -/area/f13/fb/bar) -"cG" = ( -/obj/structure/window/bronze{ - plane = -6; - density = 0; - mouse_opacity = 0 +"bI" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" }, -/obj/structure/window/bronze{ - plane = -3; - density = 0; - mouse_opacity = 0; - dir = 8 +/obj/structure/curtain{ + color = "#c40e0e"; + open = 0 }, +/turf/open/floor/carpet/royalblue, +/area/f13/fb/bar) +"bP" = ( /obj/effect/turf_decal/siding/wood{ color = "#3B2B1A" }, /obj/effect/turf_decal/siding/wood{ - dir = 8; + dir = 4; color = "#3B2B1A" }, -/obj/structure/chess/whiterook, -/turf/open/floor/plasteel/white{ - light_color = null; - color = "#666666" +/obj/item/kirbyplants/random, +/obj/machinery/light/small{ + color = "#444499"; + dir = 4; + light_color = "#444499"; + light_power = 2; + light_range = 2; + pixel_y = 13 }, +/turf/open/floor/carpet/black, +/area/f13/fb/bar) +"cs" = ( +/obj/structure/table/glass, +/turf/open/floor/carpet/red, /area/f13/fb/bar) "cK" = ( /obj/structure/chair/bench{ @@ -250,16 +215,13 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"cL" = ( -/obj/structure/chair/stool/retro/tan, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, +"cQ" = ( /obj/effect/turf_decal/siding/wood{ + dir = 8; color = "#3B2B1A" }, -/turf/open/floor/carpet/arcade, +/obj/item/kirbyplants/random, +/turf/open/floor/carpet/black, /area/f13/fb/bar) "cR" = ( /obj/item/kirbyplants/random, @@ -278,56 +240,86 @@ /turf/open/floor/carpet/black, /area/f13/fb/bar) "cV" = ( -/obj/machinery/door/unpowered/securedoor, +/obj/effect/decal/cleanable/glitter/white{ + color = "#884444" + }, /obj/effect/turf_decal/siding/wood{ dir = 1; color = "#3B2B1A" }, +/turf/open/floor/carpet/black, +/area/f13/fb/bar) +"dm" = ( /obj/effect/turf_decal/siding/wood{ dir = 1; color = "#3B2B1A" }, -/turf/open/floor/carpet/red, +/obj/structure/decoration/sign{ + icon_state = "vault_level2"; + pixel_y = 30 + }, +/turf/open/floor/carpet/black, /area/f13/fb/bar) -"cW" = ( +"dw" = ( +/obj/item/kirbyplants/random, /obj/effect/turf_decal/siding/wood{ + dir = 1; color = "#3B2B1A" }, -/obj/structure/chair/bench, -/turf/open/floor/carpet/black, +/turf/open/floor/carpet/royalblue, /area/f13/fb/bar) -"dn" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 4 +"dy" = ( +/obj/structure/sign/painting/library{ + pixel_x = -32 }, -/obj/effect/overlay/fog/fog2{ - plane = -2 +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" }, /obj/machinery/light/small{ color = "#444499"; - dir = 1; + dir = 8; light_color = "#444499"; light_power = 2; light_range = 2; pixel_y = 13 }, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/fb/bar) -"dr" = ( -/obj/structure/table/wood/settler, -/obj/machinery/computer/libraryconsole/bookmanagement, -/turf/open/floor/wood_common/wood_common_dark, +/turf/open/floor/carpet/black, /area/f13/fb/bar) -"dw" = ( -/obj/item/kirbyplants/random, +"dz" = ( +/obj/structure/sign/painting/library{ + pixel_x = -32 + }, /obj/effect/turf_decal/siding/wood{ - dir = 1; + dir = 8; color = "#3B2B1A" }, -/turf/open/floor/carpet/royalblue, +/obj/structure/table/abductor, +/obj/item/reagent_containers/food/condiment/saltshaker{ + pixel_x = -7; + pixel_y = 5; + layer = 4 + }, +/obj/item/reagent_containers/food/condiment/peppermill{ + pixel_x = -9; + pixel_y = 1; + layer = 4 + }, +/obj/item/reagent_containers/food/condiment/ketchup{ + pixel_y = 6; + pixel_x = -12 + }, +/obj/effect/overlay/fog/fog2{ + plane = -2; + pixel_y = 0 + }, +/obj/effect/overlay/fog/fog2{ + plane = -2; + pixel_y = 0 + }, +/turf/open/floor/wood_common{ + color = "#99BBBB" + }, /area/f13/fb/bar) "dC" = ( /turf/closed/indestructible/riveted, @@ -383,32 +375,35 @@ /obj/item/lock_bolt, /turf/open/floor/carpet/purple, /area/f13/fb/bar) -"ey" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" - }, -/obj/structure/chair/middle, +"eI" = ( /obj/effect/overlay/fog/fog2{ plane = -2 }, -/obj/structure/window/bronze{ - dir = 1 +/obj/structure/railing{ + color = "#A47449"; + dir = 4 }, +/obj/item/kirbyplants/random, /turf/open/floor/wood_common{ - color = "#99BBBB" + color = "#779999" }, /area/f13/fb/bar) -"fg" = ( -/obj/structure/table/wood/settler, +"eL" = ( +/obj/structure/chess/whitepawn, +/turf/open/floor/plasteel/white, +/area/f13/fb/bar) +"eM" = ( +/obj/item/kirbyplants/random{ + pixel_y = 22 + }, /obj/effect/turf_decal/siding/wood{ + dir = 8; color = "#3B2B1A" }, /obj/effect/turf_decal/siding/wood{ - dir = 4; color = "#3B2B1A" }, -/turf/open/floor/wood_common/wood_common_dark, +/turf/open/floor/carpet/black, /area/f13/fb/bar) "fi" = ( /obj/machinery/light/small{ @@ -424,15 +419,28 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"fx" = ( +"fo" = ( +/obj/structure/window/bronze{ + plane = -3; + density = 0; + mouse_opacity = 0; + dir = 1 + }, /obj/effect/turf_decal/siding/wood{ dir = 1; color = "#3B2B1A" }, -/obj/machinery/computer/arcade{ - density = 0 +/obj/structure/chess/blackbishop, +/turf/open/floor/plasteel/white{ + light_color = null; + color = "#666666" }, -/turf/open/floor/carpet/arcade, +/area/f13/fb/bar) +"fw" = ( +/obj/structure/chair/f13chair1{ + dir = 1 + }, +/turf/open/floor/wood_common/wood_common_dark, /area/f13/fb/bar) "fB" = ( /obj/structure/chair/sofa{ @@ -445,17 +453,6 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"fD" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" - }, -/turf/open/floor/carpet/black, -/area/f13/fb/bar) "fR" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -659,6 +656,15 @@ light_color = "#BAF8FF" }, /area/f13/caves) +"gy" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/structure/chair/f13chair1{ + dir = 8 + }, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/fb/bar) "gI" = ( /obj/machinery/vending/cola/red{ density = 0; @@ -670,6 +676,19 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) +"gT" = ( +/obj/structure/table/wood/settler, +/obj/item/storage/box/dice{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/storage/bag/dice_cup, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/fb/bar) "ha" = ( /obj/machinery/door/unpowered/securedoor, /obj/effect/turf_decal/siding/wood{ @@ -695,96 +714,47 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"hC" = ( -/obj/structure/sign/painting/library{ - pixel_x = -32 +"hR" = ( +/obj/structure/table/abductor, +/obj/structure/lootable/house/junk_television{ + pixel_y = 13; + pixel_x = 2 }, /obj/effect/turf_decal/siding/wood{ - dir = 8; color = "#3B2B1A" }, -/obj/structure/table/abductor, -/obj/item/reagent_containers/food/condiment/saltshaker{ - pixel_x = -7; - pixel_y = 5; - layer = 4 - }, -/obj/item/reagent_containers/food/condiment/peppermill{ - pixel_x = -9; - pixel_y = 1; - layer = 4 - }, -/obj/item/reagent_containers/food/condiment/ketchup{ - pixel_y = 6; - pixel_x = -12 - }, -/obj/effect/overlay/fog/fog2{ - plane = -2 - }, -/obj/machinery/light/small{ - color = "#444499"; - dir = 8; - light_color = "#444499"; - light_power = 2; - light_range = 2; - pixel_y = 13 - }, -/turf/open/floor/wood_common{ - color = "#99BBBB" +/turf/open/floor/carpet/black{ + color = "#CCCCCC" }, /area/f13/fb/bar) -"hD" = ( -/obj/structure/window/bronze{ - plane = -3; - density = 0; - mouse_opacity = 0; - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/obj/structure/chess/blackpawn, -/turf/open/floor/plasteel/white{ - light_color = null; - color = "#666666" +"hT" = ( +/obj/structure/railing{ + color = "#A47449"; + dir = 4 }, +/turf/open/transparent/openspace, /area/f13/fb/bar) -"hK" = ( +"ic" = ( /obj/structure/window/bronze{ plane = -3; density = 0; mouse_opacity = 0; dir = 1 }, -/obj/structure/window/bronze{ - plane = -3; - density = 0; - mouse_opacity = 0; - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, /obj/effect/turf_decal/siding/wood{ dir = 1; color = "#3B2B1A" }, -/obj/structure/chess/blackrook, +/obj/structure/chess/blackbishop, /turf/open/floor/plasteel/white, /area/f13/fb/bar) -"hR" = ( +"if" = ( /obj/structure/table/abductor, -/obj/structure/lootable/house/junk_television{ - pixel_y = 13; - pixel_x = 2 - }, -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" +/obj/effect/overlay/fog/fog2{ + plane = -2 }, -/turf/open/floor/carpet/black{ - color = "#CCCCCC" +/turf/open/floor/wood_common{ + color = "#99BBBB" }, /area/f13/fb/bar) "il" = ( @@ -859,13 +829,6 @@ }, /turf/open/floor/carpet/royalblue, /area/f13/fb/bar) -"jo" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" - }, -/turf/open/floor/carpet/green, -/area/f13/fb/bar) "jt" = ( /obj/effect/decal/cleanable/glitter/white{ color = "#884444" @@ -880,66 +843,11 @@ }, /turf/open/floor/carpet/blue, /area/f13/fb/bar) -"jE" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/obj/structure/chess/whitebishop, -/obj/structure/window/bronze{ - plane = -6; - density = 0; - mouse_opacity = 0 - }, -/turf/open/floor/plasteel/white, -/area/f13/fb/bar) -"jF" = ( -/obj/structure/window/bronze{ - plane = -3; - density = 0; - mouse_opacity = 0; - dir = 1 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" - }, -/obj/structure/chess/blackqueen, -/turf/open/floor/plasteel/white{ - light_color = null; - color = "#666666" - }, -/area/f13/fb/bar) -"jN" = ( -/obj/structure/railing{ - color = "#A47449"; - layer = 4; - pixel_y = -2 - }, -/obj/structure/railing{ - color = "#A47449"; - dir = 1 - }, -/obj/effect/overlay/fog/fog2{ - plane = -2 - }, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/fb/bar) "jO" = ( /obj/item/restraints/handcuffs/fake/kinky, /obj/structure/table/abductor, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"jS" = ( -/obj/item/cartridge/curator, -/obj/item/cartridge/curator, -/obj/item/cartridge/curator, -/obj/item/cartridge/curator, -/obj/item/cartridge/curator, -/obj/structure/bookcase, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/fb/bar) "jU" = ( /obj/machinery/bookbinder, /obj/effect/turf_decal/siding/wood{ @@ -952,16 +860,8 @@ }, /turf/open/floor/carpet/royalblue, /area/f13/fb/bar) -"jX" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/obj/structure/chess/whiteking, -/obj/structure/window/bronze{ - plane = -6; - density = 0; - mouse_opacity = 0 - }, +"jY" = ( +/obj/structure/chess/blackpawn, /turf/open/floor/plasteel/white, /area/f13/fb/bar) "kb" = ( @@ -989,33 +889,22 @@ /turf/closed/wall/mineral/brick, /area/f13/caves) "kQ" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/obj/machinery/light/small{ - color = "#444499"; - dir = 8; - light_color = "#444499"; - light_power = 2; - light_range = 2; - pixel_y = 13 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/carpet/black, +/obj/structure/closet/crate/bin, +/turf/open/floor/wood_common/wood_common_dark, /area/f13/fb/bar) -"la" = ( -/obj/structure/curtain{ - color = "#c40e0e"; - open = 0 +"kX" = ( +/obj/machinery/vending/cola/red{ + density = 0; + pixel_y = 16 }, /obj/effect/turf_decal/siding/wood{ dir = 1; color = "#3B2B1A" }, +/obj/structure/decoration/sign{ + icon_state = "vault_arcade"; + pixel_y = 30 + }, /turf/open/floor/carpet/black, /area/f13/fb/bar) "ln" = ( @@ -1024,6 +913,22 @@ }, /turf/open/floor/carpet/red, /area/f13/fb/bar) +"lt" = ( +/obj/structure/window/bronze{ + plane = -3; + density = 0; + mouse_opacity = 0; + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/chess/whitepawn, +/turf/open/floor/plasteel/white{ + light_color = null; + color = "#666666" + }, +/area/f13/fb/bar) "lB" = ( /obj/item/kirbyplants/random, /obj/machinery/light/small{ @@ -1040,33 +945,27 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"lG" = ( +"lR" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1; + dir = 4; color = "#3B2B1A" }, -/obj/structure/decoration/sign{ - icon_state = "vault_level2"; - pixel_y = 30 +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/structure/chair/right{ + dir = 1 }, -/turf/open/floor/carpet/black, -/area/f13/fb/bar) -"lK" = ( /obj/effect/overlay/fog/fog2{ plane = -2 }, -/obj/structure/railing{ - color = "#A47449"; - dir = 4 +/obj/structure/window/bronze{ + plane = -3 }, /turf/open/floor/wood_common{ - color = "#779999" + color = "#99BBBB" }, /area/f13/fb/bar) -"lL" = ( -/obj/machinery/door/unpowered/securedoor, -/turf/open/floor/carpet/royalblue, -/area/f13/fb/bar) "lS" = ( /obj/structure/chair/sofa{ color = "#475340" @@ -1087,11 +986,28 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"mA" = ( -/obj/structure/chess/whitepawn, -/turf/open/floor/plasteel/white, +"mu" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/turf/open/floor/carpet/green, /area/f13/fb/bar) -"mF" = ( +"mv" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/structure/chess/whitebishop, +/obj/structure/window/bronze{ + plane = -6; + density = 0; + mouse_opacity = 0 + }, +/turf/open/floor/plasteel/white{ + light_color = null; + color = "#666666" + }, +/area/f13/fb/bar) +"mF" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; icon_state = "smoke"; @@ -1159,6 +1075,17 @@ light_color = "#BAF8FF" }, /area/f13/caves) +"mN" = ( +/obj/structure/chair/stool/retro/tan, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/turf/open/floor/carpet/arcade, +/area/f13/fb/bar) "mQ" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/siding/wood{ @@ -1181,22 +1108,6 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"nn" = ( -/obj/item/kirbyplants/random, -/obj/machinery/light/small{ - color = "#444499"; - dir = 4; - light_color = "#444499"; - light_power = 2; - light_range = 2; - pixel_y = 13 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/turf/open/floor/carpet/black, -/area/f13/fb/bar) "ns" = ( /obj/structure/dresser{ pixel_y = 19; @@ -1216,14 +1127,6 @@ }, /turf/open/floor/carpet/blue, /area/f13/fb/bar) -"nz" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/obj/item/kirbyplants/random, -/turf/open/floor/carpet/black, -/area/f13/fb/bar) "nE" = ( /obj/structure/chair/f13chair1{ dir = 1 @@ -1249,70 +1152,70 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"nT" = ( -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 8 - }, -/obj/structure/destructible/tribal_torch/wall/lit{ - dir = 1; - pixel_y = 12 - }, -/obj/effect/overlay/fog/fog2{ - plane = -2 +"nH" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) -"nX" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1; + dir = 8; color = "#3B2B1A" }, -/turf/open/floor/carpet/black, +/turf/open/floor/carpet/royalblue, /area/f13/fb/bar) -"nZ" = ( -/turf/closed{ - icon_state = "black" +"nM" = ( +/obj/machinery/light/small{ + color = "#444499"; + dir = 8; + light_color = "#444499"; + light_power = 2; + light_range = 2; + pixel_y = 13 }, -/area) -"ob" = ( /obj/effect/turf_decal/siding/wood{ - dir = 4; color = "#3B2B1A" }, /obj/effect/turf_decal/siding/wood{ - dir = 1; + dir = 8; color = "#3B2B1A" }, -/obj/structure/chair/left, +/obj/structure/chair/left{ + dir = 1 + }, /obj/effect/overlay/fog/fog2{ plane = -2 }, /obj/structure/window/bronze{ - dir = 1 + plane = -3 }, /turf/open/floor/wood_common{ color = "#99BBBB" }, /area/f13/fb/bar) -"oi" = ( -/turf/open/floor/plasteel/white{ - light_color = null; - color = "#666666" +"nT" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 }, -/area/f13/fb/bar) -"ox" = ( -/obj/item/kirbyplants/random{ - pixel_y = 22 +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 1; + pixel_y = 12 }, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" +/obj/effect/overlay/fog/fog2{ + plane = -2 }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +"nX" = ( /obj/effect/turf_decal/siding/wood{ + dir = 1; color = "#3B2B1A" }, /turf/open/floor/carpet/black, /area/f13/fb/bar) +"nZ" = ( +/turf/closed{ + icon_state = "black" + }, +/area) "oA" = ( /obj/structure/chair/stool/retro/backed{ dir = 8 @@ -1325,6 +1228,18 @@ color = "#CCCCCC" }, /area/f13/fb/bar) +"oB" = ( +/obj/effect/overlay/fog/fog2{ + plane = -2 + }, +/obj/structure/railing{ + color = "#A47449"; + dir = 1 + }, +/turf/open/floor/wood_common{ + color = "#779999" + }, +/area/f13/fb/bar) "oD" = ( /obj/structure/railing{ color = "#A47449"; @@ -1340,6 +1255,23 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) +"oI" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/structure/chair/middle{ + dir = 1 + }, +/obj/effect/overlay/fog/fog2{ + plane = -2 + }, +/obj/structure/window/bronze{ + plane = -3 + }, +/turf/open/floor/wood_common{ + color = "#99BBBB" + }, +/area/f13/fb/bar) "oL" = ( /obj/structure/railing{ color = "#A47449"; @@ -1369,14 +1301,6 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"oV" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/obj/item/kirbyplants/random, -/turf/open/floor/carpet/black, -/area/f13/fb/bar) "pc" = ( /obj/structure/toilet{ dir = 8 @@ -1416,32 +1340,10 @@ /obj/structure/table/wood/settler, /turf/open/floor/wood_common/wood_common_dark, /area/f13/fb/bar) -"pu" = ( -/obj/structure/chair/stool/retro/tan, -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/turf/open/floor/carpet/arcade, -/area/f13/fb/bar) "pv" = ( /obj/structure/table/wood/settler, /turf/open/floor/carpet/royalblue, /area/f13/fb/bar) -"pF" = ( -/obj/effect/overlay/fog/fog2{ - plane = -2 - }, -/obj/machinery/light/small{ - color = "#444499"; - light_color = "#444499"; - light_power = 2; - light_range = 2; - pixel_y = 0 - }, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/fb/bar) "pL" = ( /obj/structure/chair/sofa{ color = "#475340"; @@ -1463,14 +1365,6 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"pO" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/obj/structure/chair/stool/retro/tan, -/turf/open/floor/carpet/black, -/area/f13/fb/bar) "qo" = ( /obj/effect/turf_decal/siding/wood{ dir = 8; @@ -1485,6 +1379,19 @@ "qp" = ( /turf/open/floor/carpet/royalblue, /area/f13/fb/bar) +"qq" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/carpet/royalblue, +/area/f13/fb/bar) "qv" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/siding/wood{ @@ -1496,10 +1403,6 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"qw" = ( -/obj/structure/chess/blackpawn, -/turf/open/floor/plasteel/white, -/area/f13/fb/bar) "qA" = ( /obj/structure/railing/corner{ color = "#A47449"; @@ -1522,51 +1425,20 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"qD" = ( -/obj/structure/table/abductor, -/obj/item/dice/d6{ - pixel_y = 12; - pixel_x = 6 - }, -/obj/item/dice/d6{ - pixel_y = 0; - pixel_x = -5 - }, -/obj/item/storage/bag/dice_cup, -/turf/open/floor/carpet/black{ - color = "#CCCCCC" - }, -/area/f13/fb/bar) -"qG" = ( -/obj/machinery/vending/cola/red{ - density = 0; - pixel_y = 16 - }, +"qW" = ( /obj/effect/turf_decal/siding/wood{ dir = 1; color = "#3B2B1A" }, -/obj/structure/decoration/sign{ - icon_state = "vault_arcade"; - pixel_y = 30 - }, -/turf/open/floor/carpet/black, -/area/f13/fb/bar) -"qP" = ( +/obj/structure/chair/middle, /obj/effect/overlay/fog/fog2{ plane = -2 }, -/obj/structure/railing{ - color = "#A47449"; +/obj/structure/window/bronze{ dir = 1 }, -/obj/structure/railing{ - color = "#A47449"; - layer = 4; - pixel_y = -2 - }, /turf/open/floor/wood_common{ - color = "#779999" + color = "#99BBBB" }, /area/f13/fb/bar) "rc" = ( @@ -1596,18 +1468,6 @@ color = "#CCCCCC" }, /area/f13/fb/bar) -"rj" = ( -/obj/effect/overlay/fog/fog2{ - plane = -2 - }, -/obj/structure/railing{ - color = "#A47449"; - dir = 1 - }, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/fb/bar) "rk" = ( /obj/structure/sink/greyscale{ dir = 8; @@ -1616,59 +1476,42 @@ }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/fb/bar) -"rl" = ( +"rm" = ( +/obj/item/cartridge/curator, +/obj/item/cartridge/curator, +/obj/item/cartridge/curator, +/obj/item/cartridge/curator, +/obj/item/cartridge/curator, +/obj/structure/bookcase, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/fb/bar) +"ru" = ( +/obj/structure/closet/crate/bin, +/turf/open/floor/plasteel/neutral, +/area/f13/fb/bar) +"ry" = ( +/obj/structure/window/bronze{ + plane = -3; + density = 0; + mouse_opacity = 0; + dir = 8 + }, /obj/effect/turf_decal/siding/wood{ - dir = 4; + dir = 8; color = "#3B2B1A" }, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/carpet/royalblue, -/area/f13/fb/bar) -"rp" = ( -/obj/machinery/door/unpowered/securedoor, -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/turf/open/floor/carpet/red, -/area/f13/fb/bar) -"rq" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 1 - }, -/obj/effect/overlay/fog/fog2{ - plane = -2 - }, -/turf/open/transparent/openspace, -/area/f13/fb/bar) -"ru" = ( -/obj/structure/closet/crate/bin, -/turf/open/floor/plasteel/neutral, -/area/f13/fb/bar) -"rC" = ( -/obj/effect/turf_decal/huge/heaven{ - pixel_x = 0 +/obj/structure/chess/blackpawn, +/turf/open/floor/plasteel/white{ + light_color = null; + color = "#666666" }, -/turf/open/floor/carpet/black, /area/f13/fb/bar) -"rD" = ( -/obj/structure/window/bronze{ - plane = -3; - density = 0; - mouse_opacity = 0; - dir = 8 - }, +"rA" = ( /obj/effect/turf_decal/siding/wood{ - dir = 8; color = "#3B2B1A" }, -/obj/structure/chess/whitepawn, -/turf/open/floor/plasteel/white, +/obj/machinery/light, +/turf/open/floor/carpet/royalblue, /area/f13/fb/bar) "rM" = ( /obj/machinery/light/small{ @@ -1730,33 +1573,17 @@ }, /turf/open/floor/carpet/blue, /area/f13/fb/bar) -"sh" = ( -/obj/effect/decal/cleanable/glitter/white{ - color = "#884444" - }, -/obj/structure/chair/stool/retro/tan, -/obj/structure/railing{ - color = "#A47449"; - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/turf/open/floor/carpet/arcade, -/area/f13/fb/bar) -"sn" = ( +"se" = ( /obj/effect/turf_decal/siding/wood{ color = "#3B2B1A" }, -/obj/machinery/computer/slot_machine{ - pixel_y = -4; - density = 0 +/obj/structure/chess/whitebishop, +/obj/structure/window/bronze{ + plane = -6; + density = 0; + mouse_opacity = 0 }, -/turf/open/floor/carpet/black, +/turf/open/floor/plasteel/white, /area/f13/fb/bar) "su" = ( /obj/effect/turf_decal/siding/wood{ @@ -1775,6 +1602,20 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) +"sw" = ( +/obj/structure/window/bronze{ + plane = -3; + density = 0; + mouse_opacity = 0; + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/obj/structure/chess/blackknight, +/turf/open/floor/plasteel/white, +/area/f13/fb/bar) "sx" = ( /obj/structure/glowshroom{ color = "green" @@ -1802,6 +1643,22 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) +"sJ" = ( +/obj/structure/window/bronze{ + plane = -3; + density = 0; + mouse_opacity = 0; + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/turf/open/floor/plasteel/white{ + light_color = null; + color = "#666666" + }, +/area/f13/fb/bar) "ta" = ( /obj/structure/chair/f13chair1{ dir = 4 @@ -1815,19 +1672,6 @@ }, /turf/open/floor/carpet/royalblue, /area/f13/fb/bar) -"tb" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/obj/structure/table/abductor, -/obj/effect/overlay/fog/fog2{ - plane = -2 - }, -/turf/open/floor/wood_common{ - color = "#99BBBB" - }, -/area/f13/fb/bar) "tf" = ( /obj/structure/railing{ color = "#A47449"; @@ -1853,6 +1697,16 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"tu" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/carpet/royalblue, +/area/f13/fb/bar) "tv" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -1900,6 +1754,14 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) +"tH" = ( +/obj/structure/window/bronze/fulltile, +/obj/structure/curtain{ + color = "#c40e0e"; + open = 0 + }, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/fb/bar) "tJ" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -1925,6 +1787,21 @@ light_color = "#BAF8FF" }, /area/f13/caves) +"tL" = ( +/obj/effect/overlay/fog/fog2{ + plane = -2 + }, +/obj/machinery/light/small{ + color = "#444499"; + light_color = "#444499"; + light_power = 2; + light_range = 2; + pixel_y = 0 + }, +/turf/open/floor/wood_common{ + color = "#779999" + }, +/area/f13/fb/bar) "tM" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -1962,6 +1839,35 @@ /obj/machinery/telecomms/relay/preset/telecomms, /turf/open/indestructible, /area/f13/wasteland) +"tY" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/turf/open/floor/carpet/royalblue, +/area/f13/fb/bar) +"ub" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/structure/curtain{ + color = "#c40e0e"; + open = 0 + }, +/turf/open/floor/carpet/royalblue, +/area/f13/fb/bar) +"ud" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/structure/chess/whiteking, +/obj/structure/window/bronze{ + plane = -6; + density = 0; + mouse_opacity = 0 + }, +/turf/open/floor/plasteel/white, +/area/f13/fb/bar) "um" = ( /obj/structure/bookcase, /obj/structure/sign/painting/library{ @@ -1990,16 +1896,6 @@ }, /turf/open/floor/carpet/blue, /area/f13/fb/bar) -"uw" = ( -/obj/machinery/light/small{ - light_power = 2; - light_range = 2; - light_color = "#E1D5D5"; - color = "#E1D5D5" - }, -/obj/item/kirbyplants/random, -/turf/open/floor/carpet/red, -/area/f13/fb/bar) "uA" = ( /obj/structure/towel_rack{ pixel_y = 27 @@ -2010,20 +1906,6 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"uK" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/carpet/royalblue, -/area/f13/fb/bar) "uM" = ( /obj/structure/chair/sofa/right{ dir = 8; @@ -2041,30 +1923,33 @@ color = "#CCCCCC" }, /area/f13/fb/bar) -"uX" = ( -/obj/effect/overlay/fog/fog2{ - plane = -2 +"uQ" = ( +/obj/structure/window/bronze{ + plane = -3; + density = 0; + mouse_opacity = 0; + dir = 1 }, -/turf/open/transparent/openspace, -/area/f13/fb/bar) -"vc" = ( /obj/effect/turf_decal/siding/wood{ + dir = 1; color = "#3B2B1A" }, -/obj/structure/chair/middle{ - dir = 1 +/obj/structure/chess/blackknight, +/turf/open/floor/plasteel/white{ + light_color = null; + color = "#666666" }, +/area/f13/fb/bar) +"vb" = ( /obj/effect/overlay/fog/fog2{ plane = -2 }, -/obj/structure/window/bronze{ - plane = -3 - }, +/obj/item/kirbyplants/random, /turf/open/floor/wood_common{ - color = "#99BBBB" + color = "#779999" }, /area/f13/fb/bar) -"vd" = ( +"ve" = ( /obj/structure/window/bronze{ plane = -3; density = 0; @@ -2074,15 +1959,34 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/structure/chess/whitepawn, -/turf/open/floor/plasteel/white{ - light_color = null; - color = "#666666" +/turf/open/floor/plasteel/white, +/area/f13/fb/bar) +"vk" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" }, +/turf/open/floor/carpet/black, /area/f13/fb/bar) "vv" = ( /turf/open/floor/carpet/red, /area/f13/fb/bar) +"vB" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/carpet/royalblue, +/area/f13/fb/bar) "vC" = ( /obj/machinery/door/unpowered/securedoor, /obj/effect/turf_decal/siding/wood{ @@ -2090,6 +1994,13 @@ }, /turf/open/floor/carpet/red, /area/f13/fb/bar) +"vE" = ( +/obj/structure/chair/stool/retro/tan, +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/turf/open/floor/carpet/arcade, +/area/f13/fb/bar) "vI" = ( /obj/machinery/light/small{ color = "#444499"; @@ -2107,10 +2018,6 @@ }, /turf/open/floor/carpet/red, /area/f13/fb/bar) -"vW" = ( -/obj/machinery/libraryscanner, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/fb/bar) "vX" = ( /obj/structure/chair/sofa{ color = "#475340"; @@ -2121,39 +2028,17 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"wa" = ( +"wl" = ( /obj/effect/turf_decal/siding/wood{ + dir = 4; color = "#3B2B1A" }, /obj/effect/turf_decal/siding/wood{ - dir = 8; + dir = 1; color = "#3B2B1A" }, -/obj/machinery/light{ - dir = 8 - }, /turf/open/floor/carpet/royalblue, /area/f13/fb/bar) -"wc" = ( -/obj/effect/overlay/fog/fog2{ - plane = -2 - }, -/obj/structure/railing{ - color = "#A47449"; - dir = 4 - }, -/obj/machinery/light/small{ - color = "#444499"; - dir = 8; - light_color = "#444499"; - light_power = 2; - light_range = 2; - pixel_y = 13 - }, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/fb/bar) "wn" = ( /obj/structure/chair/wood/wings, /obj/effect/turf_decal/siding/wood{ @@ -2166,6 +2051,19 @@ }, /turf/open/floor/carpet/red, /area/f13/fb/bar) +"wo" = ( +/obj/structure/table/abductor, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/obj/effect/overlay/fog/fog2{ + plane = -2 + }, +/turf/open/floor/wood_common{ + color = "#99BBBB" + }, +/area/f13/fb/bar) "ws" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -2192,6 +2090,12 @@ light_color = "#BAF8FF" }, /area/f13/caves) +"wB" = ( +/obj/effect/overlay/fog/fog2{ + plane = -2 + }, +/turf/closed/wall/mineral/brick, +/area/f13/fb/bar) "wM" = ( /obj/item/kirbyplants/random, /turf/open/floor/wood_common/wood_common_dark, @@ -2204,6 +2108,9 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) +"wV" = ( +/turf/open/floor/plasteel/white, +/area/f13/fb/bar) "xd" = ( /obj/effect/turf_decal/siding/wood{ dir = 4; @@ -2212,20 +2119,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/carpet/red, /area/f13/fb/bar) -"xr" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" - }, -/obj/machinery/computer/arcade{ - density = 0 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/turf/open/floor/carpet/arcade, -/area/f13/fb/bar) "xI" = ( /obj/structure/bed/wooden, /obj/effect/spawner/lootdrop/bedsheet, @@ -2256,12 +2149,6 @@ }, /turf/open/floor/carpet/blue, /area/f13/fb/bar) -"xM" = ( -/obj/structure/table/wood/settler, -/obj/item/paper_bin, -/obj/item/pen, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/fb/bar) "xS" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/siding/wood{ @@ -2289,27 +2176,55 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "yl" = ( +/obj/structure/sign/painting/library{ + pixel_x = -32 + }, /obj/effect/turf_decal/siding/wood{ dir = 8; color = "#3B2B1A" }, -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" +/obj/structure/table/abductor, +/obj/item/reagent_containers/food/condiment/saltshaker{ + pixel_x = 11; + pixel_y = 5; + layer = 4 }, -/obj/structure/chair/right{ - dir = 2 +/obj/item/reagent_containers/food/condiment/peppermill{ + pixel_x = 10; + pixel_y = 1; + layer = 4 + }, +/obj/item/reagent_containers/food/condiment/ketchup{ + pixel_y = 6; + pixel_x = 4 }, /obj/effect/overlay/fog/fog2{ plane = -2 }, -/obj/structure/window/bronze{ - dir = 1 +/obj/machinery/light/small{ + color = "#444499"; + dir = 4; + light_color = "#444499"; + light_power = 2; + light_range = 2; + pixel_y = 13 }, /turf/open/floor/wood_common{ color = "#99BBBB" }, /area/f13/fb/bar) +"ym" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/structure/chess/whiteknight, +/obj/structure/window/bronze{ + plane = -6; + density = 0; + mouse_opacity = 0 + }, +/turf/open/floor/plasteel/white, +/area/f13/fb/bar) "yn" = ( /obj/structure/chair/sofa/left, /obj/structure/dresser{ @@ -2368,20 +2283,18 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"yC" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/obj/structure/chess/whiteknight, +"yE" = ( /obj/structure/window/bronze{ - plane = -6; + plane = -3; density = 0; - mouse_opacity = 0 + mouse_opacity = 0; + dir = 4 }, -/turf/open/floor/plasteel/white{ - light_color = null; - color = "#666666" +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, +/obj/structure/chess/blackpawn, +/turf/open/floor/plasteel/white, /area/f13/fb/bar) "yH" = ( /obj/structure/spacevine{ @@ -2417,6 +2330,26 @@ light_color = "#BAF8FF" }, /area/f13/caves) +"yJ" = ( +/obj/effect/overlay/fog/fog2{ + plane = -2 + }, +/obj/structure/railing{ + color = "#A47449"; + dir = 4 + }, +/obj/machinery/light/small{ + color = "#444499"; + dir = 8; + light_color = "#444499"; + light_power = 2; + light_range = 2; + pixel_y = 13 + }, +/turf/open/floor/wood_common{ + color = "#779999" + }, +/area/f13/fb/bar) "yM" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -2475,18 +2408,23 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"zq" = ( +"zr" = ( +/turf/open/floor/carpet/black, +/area/f13/fb/bar) +"zu" = ( +/obj/item/kirbyplants/random, +/obj/machinery/light/small{ + color = "#444499"; + dir = 4; + light_color = "#444499"; + light_power = 2; + light_range = 2; + pixel_y = 13 + }, /obj/effect/turf_decal/siding/wood{ - dir = 8; + dir = 4; color = "#3B2B1A" }, -/obj/structure/decoration/sign{ - icon_state = "vault_dorm"; - pixel_x = -32 - }, -/turf/open/floor/carpet/black, -/area/f13/fb/bar) -"zr" = ( /turf/open/floor/carpet/black, /area/f13/fb/bar) "zB" = ( @@ -2519,17 +2457,6 @@ light_color = "#BAF8FF" }, /area/f13/caves) -"zG" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" - }, -/turf/open/floor/carpet/royalblue, -/area/f13/fb/bar) "zK" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -2559,19 +2486,11 @@ light_color = "#BAF8FF" }, /area/f13/caves) -"zR" = ( -/obj/structure/window/bronze{ - plane = -3; - density = 0; - mouse_opacity = 0; - dir = 1 - }, +"zL" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1; color = "#3B2B1A" }, -/obj/structure/chess/blackbishop, -/turf/open/floor/plasteel/white, +/turf/open/floor/carpet/red, /area/f13/fb/bar) "zS" = ( /obj/structure/table/abductor, @@ -2584,22 +2503,19 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"zT" = ( -/obj/machinery/bookbinder, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/fb/bar) -"zW" = ( -/obj/effect/overlay/fog/fog2{ - plane = -2 - }, -/obj/structure/railing{ - color = "#A47449"; - dir = 4 +"zZ" = ( +/obj/structure/window/bronze{ + plane = -3; + density = 0; + mouse_opacity = 0; + dir = 8 }, -/obj/item/kirbyplants/random, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" }, +/obj/structure/chess/whitepawn, +/turf/open/floor/plasteel/white, /area/f13/fb/bar) "Af" = ( /obj/effect/turf_decal/siding/wood{ @@ -2639,34 +2555,6 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"Am" = ( -/obj/structure/window/bronze{ - plane = -3; - density = 0; - mouse_opacity = 0; - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/turf/open/floor/plasteel/white{ - light_color = null; - color = "#666666" - }, -/area/f13/fb/bar) -"An" = ( -/obj/structure/window/bronze/fulltile, -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" - }, -/obj/structure/curtain{ - color = "#c40e0e"; - open = 0 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/fb/bar) "AI" = ( /obj/effect/turf_decal/siding/wood{ dir = 1; @@ -2675,15 +2563,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"AK" = ( -/obj/effect/overlay/fog/fog2{ - plane = -2 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/fb/bar) "AR" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -2716,6 +2595,13 @@ light_color = "#BAF8FF" }, /area/f13/caves) +"Ba" = ( +/obj/structure/chess/blackpawn, +/turf/open/floor/plasteel/white{ + light_color = null; + color = "#666666" + }, +/area/f13/fb/bar) "Bb" = ( /obj/structure/closet/crate/bin, /obj/effect/turf_decal/siding/wood{ @@ -2727,17 +2613,6 @@ }, /turf/open/floor/carpet/royalblue, /area/f13/fb/bar) -"Be" = ( -/turf/open/floor/plasteel/white, -/area/f13/fb/bar) -"Bf" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/obj/structure/table/wood/settler, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/fb/bar) "Bt" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -2761,59 +2636,23 @@ light_color = "#BAF8FF" }, /area/f13/caves) -"Bv" = ( +"BC" = ( +/obj/structure/chair/f13chair1{ + dir = 8 + }, /obj/effect/turf_decal/siding/wood{ + dir = 4; color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/obj/structure/chair/left{ - dir = 1 - }, -/obj/effect/overlay/fog/fog2{ - plane = -2 - }, -/obj/structure/window/bronze{ - plane = -3 - }, -/turf/open/floor/wood_common{ - color = "#99BBBB" - }, -/area/f13/fb/bar) -"BC" = ( -/obj/structure/chair/f13chair1{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/turf/open/floor/carpet/royalblue, -/area/f13/fb/bar) -"BN" = ( -/obj/structure/window/bronze{ - plane = -3; - density = 0; - mouse_opacity = 0; - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/structure/chess/blackpawn, -/turf/open/floor/plasteel/white, -/area/f13/fb/bar) -"Ca" = ( -/obj/structure/chair/f13chair1{ - dir = 8 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/fb/bar) -"Cc" = ( -/obj/structure/chair/f13chair1{ - dir = 4 + }, +/turf/open/floor/carpet/royalblue, +/area/f13/fb/bar) +"BS" = ( +/obj/structure/chair/f13chair1, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/fb/bar) +"Cc" = ( +/obj/structure/chair/f13chair1{ + dir = 4 }, /obj/effect/turf_decal/siding/wood{ dir = 8; @@ -2846,15 +2685,17 @@ light_color = "#BAF8FF" }, /area/f13/caves) -"Cg" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" +"Cl" = ( +/obj/structure/railing{ + color = "#A47449"; + dir = 4 }, -/obj/machinery/light{ - dir = 8 +/obj/effect/overlay/fog/fog2{ + plane = -2 + }, +/turf/open/floor/wood_common{ + color = "#779999" }, -/turf/open/floor/carpet/royalblue, /area/f13/fb/bar) "Cp" = ( /obj/machinery/light/small{ @@ -2884,16 +2725,6 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"CE" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/turf/open/floor/carpet/black, -/area/f13/fb/bar) "CP" = ( /obj/structure/table/wood/settler, /obj/item/paper_bin, @@ -2904,6 +2735,16 @@ }, /turf/open/floor/carpet/royalblue, /area/f13/fb/bar) +"CW" = ( +/obj/machinery/libraryscanner, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/fb/bar) +"CY" = ( +/obj/structure/table/wood/settler, +/obj/item/paper_bin, +/obj/item/pen, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/fb/bar) "Dd" = ( /obj/machinery/light/small{ color = "#444499"; @@ -2934,6 +2775,16 @@ /obj/structure/chair/stool/retro/tan, /turf/open/floor/carpet/black, /area/f13/fb/bar) +"Dh" = ( +/obj/machinery/light/small{ + light_power = 2; + light_range = 2; + light_color = "#E1D5D5"; + color = "#E1D5D5" + }, +/obj/item/kirbyplants/random, +/turf/open/floor/carpet/red, +/area/f13/fb/bar) "Do" = ( /obj/structure/glowshroom/shadowshroom, /obj/effect/overlay/fog/fog2{ @@ -2960,19 +2811,13 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"DD" = ( -/obj/structure/table/abductor, -/obj/effect/overlay/fog/fog2{ - plane = -2 - }, -/turf/open/floor/wood_common{ - color = "#99BBBB" +"DC" = ( +/obj/structure/chess/whitepawn, +/turf/open/floor/plasteel/white{ + light_color = null; + color = "#666666" }, /area/f13/fb/bar) -"DF" = ( -/obj/structure/closet/crate/bin, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/fb/bar) "DJ" = ( /turf/open/floor/carpet/blue, /area/f13/fb/bar) @@ -2983,6 +2828,18 @@ }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/fb/bar) +"DY" = ( +/obj/structure/window/fulltile/wood{ + layer = 3 + }, +/obj/structure/curtain{ + color = "#c40e0e" + }, +/obj/effect/overlay/fog/fog2{ + plane = -2 + }, +/turf/open/floor/wood_common, +/area/f13/fb/bar) "Ec" = ( /obj/machinery/light/small{ light_power = 2; @@ -2993,18 +2850,6 @@ }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/fb/bar) -"Ef" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/obj/structure/chess/whiteknight, -/obj/structure/window/bronze{ - plane = -6; - density = 0; - mouse_opacity = 0 - }, -/turf/open/floor/plasteel/white, -/area/f13/fb/bar) "Eh" = ( /obj/structure/rug/big/rug_yellow{ layer = 2.8 @@ -3016,18 +2861,9 @@ color = "#CCCCCC" }, /area/f13/fb/bar) -"Ei" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/carpet/royalblue, +"Ek" = ( +/obj/structure/bookcase, +/turf/open/floor/wood_common/wood_common_dark, /area/f13/fb/bar) "Eo" = ( /obj/structure/sign/painting/library{ @@ -3039,18 +2875,17 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"Er" = ( -/obj/structure/window/bronze{ - plane = -3; - density = 0; - mouse_opacity = 0; - dir = 8 - }, +"Ew" = ( +/obj/structure/window/bronze/fulltile, /obj/effect/turf_decal/siding/wood{ - dir = 8; + dir = 1; color = "#3B2B1A" }, -/turf/open/floor/plasteel/white, +/obj/structure/curtain{ + color = "#c40e0e"; + open = 0 + }, +/turf/open/floor/wood_common/wood_common_dark, /area/f13/fb/bar) "Ex" = ( /obj/structure/chair/wood/wings{ @@ -3058,13 +2893,15 @@ }, /turf/open/floor/carpet/red, /area/f13/fb/bar) -"Ez" = ( -/obj/structure/window/bronze{ - dir = 1; - light_color = "#b5a642"; - light_range = 1 +"EE" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" }, -/turf/open/transparent/openspace, +/obj/machinery/computer/slot_machine{ + pixel_y = -4; + density = 0 + }, +/turf/open/floor/carpet/black, /area/f13/fb/bar) "EF" = ( /obj/machinery/light/small{ @@ -3095,6 +2932,40 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"EN" = ( +/obj/structure/railing{ + color = "#A47449"; + dir = 4 + }, +/obj/effect/overlay/fog/fog2{ + plane = -2 + }, +/obj/machinery/light/small{ + color = "#444499"; + dir = 1; + light_color = "#444499"; + light_power = 2; + light_range = 2; + pixel_y = 13 + }, +/turf/open/floor/wood_common{ + color = "#779999" + }, +/area/f13/fb/bar) +"EP" = ( +/obj/structure/window/bronze{ + plane = -3; + density = 0; + mouse_opacity = 0; + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/obj/structure/chess/blackking, +/turf/open/floor/plasteel/white, +/area/f13/fb/bar) "EQ" = ( /turf/open/floor/wood_common/wood_common_dark, /area/f13/caves) @@ -3107,60 +2978,122 @@ }, /turf/open/floor/carpet/red, /area/f13/fb/bar) -"Fg" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" +"EX" = ( +/obj/structure/sign/painting/library{ + pixel_x = -32 }, /obj/effect/turf_decal/siding/wood{ + dir = 8; color = "#3B2B1A" }, -/turf/open/floor/carpet/black, -/area/f13/fb/bar) -"Fq" = ( -/obj/structure/glowshroom/glowcap, +/obj/structure/table/abductor, +/obj/item/reagent_containers/food/condiment/saltshaker{ + pixel_x = -7; + pixel_y = 5; + layer = 4 + }, +/obj/item/reagent_containers/food/condiment/peppermill{ + pixel_x = -9; + pixel_y = 1; + layer = 4 + }, +/obj/item/reagent_containers/food/condiment/ketchup{ + pixel_y = 6; + pixel_x = -12 + }, /obj/effect/overlay/fog/fog2{ plane = -2 }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) -"FN" = ( -/obj/structure/chair/sofa{ - color = "#475340" - }, /obj/machinery/light/small{ color = "#444499"; - dir = 1; + dir = 8; light_color = "#444499"; light_power = 2; light_range = 2; pixel_y = 13 }, -/obj/effect/decal/cleanable/glitter/white{ - color = "#884444" +/turf/open/floor/wood_common{ + color = "#99BBBB" + }, +/area/f13/fb/bar) +"EY" = ( +/obj/structure/window/bronze{ + plane = -3; + density = 0; + mouse_opacity = 0; + dir = 1 }, /obj/effect/turf_decal/siding/wood{ dir = 1; color = "#3B2B1A" }, -/turf/open/floor/carpet/black, +/obj/structure/chess/blackqueen, +/turf/open/floor/plasteel/white{ + light_color = null; + color = "#666666" + }, /area/f13/fb/bar) -"FQ" = ( +"Fg" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1; + dir = 4; color = "#3B2B1A" }, -/obj/structure/sign/poster/contraband/pinup_topless{ - pixel_y = 32 - }, -/obj/machinery/mineral/wasteland_vendor/special{ - pixel_y = 14; - pixel_x = 5; - density = 0 +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"FS" = ( +"Fo" = ( +/obj/structure/window/bronze{ + dir = 1; + light_color = "#b5a642"; + light_range = 1 + }, +/turf/open/transparent/openspace, +/area/f13/fb/bar) +"Fq" = ( +/obj/structure/glowshroom/glowcap, +/obj/effect/overlay/fog/fog2{ + plane = -2 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) +"Fv" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/machinery/computer/slot_machine{ + pixel_y = -4; + density = 0 + }, +/turf/open/floor/carpet/black, +/area/f13/fb/bar) +"FN" = ( +/obj/structure/chair/sofa{ + color = "#475340" + }, +/obj/machinery/light/small{ + color = "#444499"; + dir = 1; + light_color = "#444499"; + light_power = 2; + light_range = 2; + pixel_y = 13 + }, +/obj/effect/decal/cleanable/glitter/white{ + color = "#884444" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/turf/open/floor/carpet/black, +/area/f13/fb/bar) +"FS" = ( /obj/structure/table/abductor, /turf/open/floor/carpet/black, /area/f13/fb/bar) @@ -3196,25 +3129,41 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"GL" = ( -/obj/effect/overlay/fog/fog2{ - plane = -2 +"Gv" = ( +/obj/machinery/computer/slot_machine{ + pixel_y = 16; + density = 0 }, -/obj/machinery/light/small{ - color = "#444499"; +/obj/effect/turf_decal/siding/wood{ dir = 1; - light_color = "#444499"; - light_power = 2; - light_range = 2; - pixel_y = 13 + color = "#3B2B1A" }, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/structure/chair/stool/retro/tan, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" }, +/turf/open/floor/carpet/black, /area/f13/fb/bar) -"Hj" = ( -/obj/structure/bookcase, -/turf/open/floor/wood_common/wood_common_dark, +"GE" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/carpet/royalblue, +/area/f13/fb/bar) +"GM" = ( +/obj/machinery/door/unpowered/securedoor, +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/turf/open/floor/carpet/red, /area/f13/fb/bar) "Hn" = ( /obj/structure/spacevine{ @@ -3236,15 +3185,6 @@ }, /area/f13/caves) "Ht" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/obj/structure/chess/whitebishop, -/obj/structure/window/bronze{ - plane = -6; - density = 0; - mouse_opacity = 0 - }, /turf/open/floor/plasteel/white{ light_color = null; color = "#666666" @@ -3268,6 +3208,34 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) +"HH" = ( +/obj/machinery/photocopier, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/fb/bar) +"HK" = ( +/obj/machinery/computer/arcade{ + density = 0 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/obj/structure/railing{ + color = "#A47449"; + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/turf/open/floor/carpet/arcade, +/area/f13/fb/bar) "HT" = ( /obj/structure/decoration/vent, /obj/structure/urinal{ @@ -3286,33 +3254,6 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"In" = ( -/obj/structure/window/bronze{ - plane = -3; - density = 0; - mouse_opacity = 0; - dir = 1 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" - }, -/obj/structure/chess/blackbishop, -/turf/open/floor/plasteel/white{ - light_color = null; - color = "#666666" - }, -/area/f13/fb/bar) -"Iu" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/obj/structure/curtain{ - color = "#c40e0e"; - open = 0 - }, -/turf/open/floor/carpet/royalblue, -/area/f13/fb/bar) "IC" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -3365,35 +3306,10 @@ }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/caves) -"IY" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/obj/structure/chess/whitequeen, -/obj/structure/window/bronze{ - plane = -6; - density = 0; - mouse_opacity = 0 - }, -/turf/open/floor/plasteel/white{ - light_color = null; - color = "#666666" - }, -/area/f13/fb/bar) "Jb" = ( /obj/structure/chair/f13chair1, /turf/open/floor/carpet/royalblue, /area/f13/fb/bar) -"Jj" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 4 - }, -/obj/effect/overlay/fog/fog2{ - plane = -2 - }, -/turf/open/transparent/openspace, -/area/f13/fb/bar) "Jp" = ( /obj/effect/turf_decal/siding/wood{ dir = 4; @@ -3401,25 +3317,47 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"Ju" = ( -/obj/machinery/door/unpowered/securedoor, +"Jq" = ( /obj/effect/turf_decal/siding/wood{ dir = 1; color = "#3B2B1A" }, -/turf/open/floor/carpet/royalblue, -/area/f13/fb/bar) -"JU" = ( -/obj/structure/window/fulltile/wood{ - layer = 3 +/obj/machinery/computer/arcade{ + density = 0 }, -/obj/structure/curtain{ - color = "#c40e0e" +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" }, +/turf/open/floor/carpet/arcade, +/area/f13/fb/bar) +"JQ" = ( /obj/effect/overlay/fog/fog2{ plane = -2 }, -/turf/open/floor/wood_common, +/obj/structure/railing{ + color = "#A47449"; + dir = 1 + }, +/obj/structure/railing{ + color = "#A47449"; + layer = 4; + pixel_y = -2 + }, +/turf/open/floor/wood_common{ + color = "#779999" + }, +/area/f13/fb/bar) +"JX" = ( +/obj/structure/curtain{ + color = "#c40e0e"; + open = 0 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/turf/open/floor/carpet/black, /area/f13/fb/bar) "JZ" = ( /obj/structure/simple_door/repaired, @@ -3447,42 +3385,27 @@ color = "#CCCCCC" }, /area/f13/fb/bar) -"Ki" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 1 - }, -/turf/open/transparent/openspace, -/area/f13/fb/bar) "Kp" = ( /obj/effect/decal/cleanable/glitter/blue{ color = "#444499" }, /turf/open/floor/plasteel/neutral, /area/f13/fb/bar) -"Ku" = ( -/obj/structure/sign/painting/library{ - pixel_x = -32 +"Kz" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" }, /obj/effect/turf_decal/siding/wood{ dir = 8; color = "#3B2B1A" }, -/obj/structure/table/abductor, -/obj/item/reagent_containers/food/condiment/saltshaker{ - pixel_x = 11; - pixel_y = 5; - layer = 4 - }, -/obj/item/reagent_containers/food/condiment/peppermill{ - pixel_x = 10; - pixel_y = 1; - layer = 4 - }, -/obj/item/reagent_containers/food/condiment/ketchup{ - pixel_y = 6; - pixel_x = 4 +/obj/machinery/light{ + dir = 8 }, +/turf/open/floor/carpet/royalblue, +/area/f13/fb/bar) +"KH" = ( /obj/effect/overlay/fog/fog2{ plane = -2 }, @@ -3495,73 +3418,29 @@ pixel_y = 13 }, /turf/open/floor/wood_common{ - color = "#99BBBB" - }, -/area/f13/fb/bar) -"KK" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/turf/open/floor/carpet/red, -/area/f13/fb/bar) -"KM" = ( -/obj/structure/window/bronze{ - plane = -3; - density = 0; - mouse_opacity = 0; - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/structure/chess/whiterook, -/obj/structure/window/bronze{ - plane = -6; - density = 0; - mouse_opacity = 0 - }, -/turf/open/floor/plasteel/white, -/area/f13/fb/bar) -"KU" = ( -/obj/machinery/light/small{ - color = "#444499"; - dir = 1; - light_color = "#444499"; - light_power = 2; - light_range = 2; - pixel_y = 13 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" - }, -/turf/open/floor/carpet/black{ - color = "#CCCCCC" - }, -/area/f13/fb/bar) -"KZ" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" + color = "#779999" }, -/obj/machinery/light, -/turf/open/floor/carpet/royalblue, /area/f13/fb/bar) -"Lk" = ( -/obj/structure/window/bronze{ - plane = -3; - density = 0; - mouse_opacity = 0; - dir = 1 +"KN" = ( +/obj/machinery/bookbinder, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/fb/bar) +"KU" = ( +/obj/machinery/light/small{ + color = "#444499"; + dir = 1; + light_color = "#444499"; + light_power = 2; + light_range = 2; + pixel_y = 13 }, /obj/effect/turf_decal/siding/wood{ dir = 1; color = "#3B2B1A" }, -/obj/structure/chess/blackking, -/turf/open/floor/plasteel/white, +/turf/open/floor/carpet/black{ + color = "#CCCCCC" + }, /area/f13/fb/bar) "Ll" = ( /obj/machinery/light/small{ @@ -3578,28 +3457,13 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"Lo" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/turf/open/floor/carpet/green, -/area/f13/fb/bar) "LC" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" - }, -/obj/structure/decoration/sign{ - icon_state = "vault_lounge"; - pixel_y = 30 - }, -/turf/open/floor/carpet/black{ - color = "#CCCCCC" +/obj/machinery/light/floor{ + light_color = "#444499"; + color = "#444499"; + alpha = 10 }, +/turf/open/floor/carpet/black, /area/f13/fb/bar) "LE" = ( /obj/effect/decal/cleanable/glitter/white{ @@ -3607,6 +3471,19 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) +"LF" = ( +/obj/structure/window/bronze{ + plane = -3; + density = 0; + mouse_opacity = 0; + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/turf/open/floor/plasteel/white, +/area/f13/fb/bar) "Mv" = ( /obj/structure/chair/sofa/right{ dir = 1; @@ -3617,6 +3494,17 @@ }, /turf/open/floor/carpet/blue, /area/f13/fb/bar) +"MD" = ( +/obj/structure/table/wood/settler, +/obj/machinery/computer/libraryconsole/bookmanagement, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/fb/bar) +"MM" = ( +/obj/effect/turf_decal/huge/heaven{ + pixel_x = 0 + }, +/turf/open/floor/carpet/black, +/area/f13/fb/bar) "MX" = ( /obj/machinery/libraryscanner, /obj/effect/turf_decal/siding/wood{ @@ -3625,13 +3513,18 @@ }, /turf/open/floor/carpet/royalblue, /area/f13/fb/bar) -"Nu" = ( -/obj/structure/window/bronze/fulltile, -/obj/structure/curtain{ - color = "#c40e0e"; - open = 0 +"Nf" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/obj/structure/table/abductor, +/obj/effect/overlay/fog/fog2{ + plane = -2 + }, +/turf/open/floor/wood_common{ + color = "#99BBBB" }, -/turf/open/floor/wood_common/wood_common_dark, /area/f13/fb/bar) "Nz" = ( /obj/structure/rug/big/rug_yellow{ @@ -3646,6 +3539,13 @@ }, /turf/open/floor/carpet/blue, /area/f13/fb/bar) +"NB" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/item/kirbyplants/random, +/turf/open/floor/carpet/black, +/area/f13/fb/bar) "NE" = ( /obj/structure/chair/sofa/corner{ color = "#475340"; @@ -3660,31 +3560,30 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"NX" = ( -/obj/machinery/computer/slot_machine{ - pixel_y = 16; - density = 0 - }, +"NT" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1; + dir = 4; color = "#3B2B1A" }, -/obj/structure/chair/stool/retro/tan, +/obj/item/kirbyplants/random, +/turf/open/floor/carpet/black, +/area/f13/fb/bar) +"NW" = ( /obj/effect/turf_decal/siding/wood{ dir = 8; color = "#3B2B1A" }, -/turf/open/floor/carpet/black, -/area/f13/fb/bar) -"On" = ( -/obj/effect/decal/cleanable/glitter/white{ - color = "#884444" - }, /obj/effect/turf_decal/siding/wood{ dir = 1; color = "#3B2B1A" }, -/turf/open/floor/carpet/black, +/obj/structure/decoration/sign{ + icon_state = "vault_lounge"; + pixel_y = 30 + }, +/turf/open/floor/carpet/black{ + color = "#CCCCCC" + }, /area/f13/fb/bar) "Oo" = ( /obj/effect/turf_decal/siding/wideplating/dark{ @@ -3754,40 +3653,32 @@ }, /turf/open/floor/carpet/blue, /area/f13/fb/bar) -"Pg" = ( -/obj/structure/sign/painting/library{ - pixel_x = -32 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/obj/structure/table/abductor, -/obj/item/reagent_containers/food/condiment/saltshaker{ - pixel_x = -7; - pixel_y = 5; - layer = 4 - }, -/obj/item/reagent_containers/food/condiment/peppermill{ - pixel_x = -9; - pixel_y = 1; - layer = 4 - }, -/obj/item/reagent_containers/food/condiment/ketchup{ - pixel_y = 6; - pixel_x = -12 - }, +"OF" = ( /obj/effect/overlay/fog/fog2{ - plane = -2; - pixel_y = 0 + plane = -2 }, -/obj/effect/overlay/fog/fog2{ - plane = -2; +/obj/structure/railing{ + color = "#A47449"; + dir = 4 + }, +/obj/machinery/light/small{ + color = "#444499"; + light_color = "#444499"; + light_power = 2; + light_range = 2; pixel_y = 0 }, /turf/open/floor/wood_common{ - color = "#99BBBB" + color = "#779999" + }, +/area/f13/fb/bar) +"Pc" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" }, +/obj/structure/chair/stool/retro/tan, +/turf/open/floor/carpet/black, /area/f13/fb/bar) "Pq" = ( /obj/structure/closet/cabinet, @@ -3803,22 +3694,6 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"Pr" = ( -/obj/effect/overlay/fog/fog2{ - plane = -2 - }, -/obj/machinery/light/small{ - color = "#444499"; - dir = 4; - light_color = "#444499"; - light_power = 2; - light_range = 2; - pixel_y = 13 - }, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/fb/bar) "Ps" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -3877,32 +3752,50 @@ color = "#CCCCCC" }, /area/f13/fb/bar) -"PC" = ( +"PD" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/turf/open/floor/carpet/black, +/area/f13/fb/bar) +"PV" = ( /obj/structure/window/bronze{ plane = -3; density = 0; mouse_opacity = 0; - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 + dir = 1 }, -/turf/open/floor/plasteel/white, -/area/f13/fb/bar) -"PJ" = ( /obj/structure/window/bronze{ plane = -3; density = 0; mouse_opacity = 0; - dir = 4 + dir = 8 }, /obj/effect/turf_decal/siding/wood{ - dir = 4 + dir = 8; + color = "#3B2B1A" }, -/turf/open/floor/plasteel/white{ - light_color = null; - color = "#666666" +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" }, +/obj/structure/chess/blackrook, +/turf/open/floor/plasteel/white, +/area/f13/fb/bar) +"PW" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/carpet/royalblue, /area/f13/fb/bar) "PZ" = ( /obj/effect/turf_decal/siding/wood{ @@ -3917,6 +3810,16 @@ "Qe" = ( /turf/open/transparent/openspace, /area/f13/fb/bar) +"Qf" = ( +/obj/structure/railing{ + color = "#A47449"; + dir = 4 + }, +/obj/effect/overlay/fog/fog2{ + plane = -2 + }, +/turf/open/transparent/openspace, +/area/f13/fb/bar) "Qg" = ( /obj/structure/simple_door/repaired, /obj/item/lock_bolt, @@ -3928,6 +3831,21 @@ }, /turf/open/floor/carpet/blue, /area/f13/fb/bar) +"QF" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/structure/chess/whiteknight, +/obj/structure/window/bronze{ + plane = -6; + density = 0; + mouse_opacity = 0 + }, +/turf/open/floor/plasteel/white{ + light_color = null; + color = "#666666" + }, +/area/f13/fb/bar) "QJ" = ( /obj/structure/table/wood/settler, /obj/machinery/computer/libraryconsole/bookmanagement, @@ -3937,22 +3855,48 @@ }, /turf/open/floor/carpet/royalblue, /area/f13/fb/bar) -"QS" = ( +"QR" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/obj/structure/chair/left, +/obj/effect/overlay/fog/fog2{ + plane = -2 + }, /obj/structure/window/bronze{ - plane = -3; - density = 0; - mouse_opacity = 0; dir = 1 }, +/turf/open/floor/wood_common{ + color = "#99BBBB" + }, +/area/f13/fb/bar) +"QT" = ( +/obj/structure/table/abductor, +/obj/item/dice/d6{ + pixel_y = 12; + pixel_x = 6 + }, +/obj/item/dice/d6{ + pixel_y = 0; + pixel_x = -5 + }, +/obj/item/storage/bag/dice_cup, +/turf/open/floor/carpet/black{ + color = "#CCCCCC" + }, +/area/f13/fb/bar) +"QY" = ( +/obj/machinery/door/unpowered/securedoor, /obj/effect/turf_decal/siding/wood{ dir = 1; color = "#3B2B1A" }, -/obj/structure/chess/blackknight, -/turf/open/floor/plasteel/white{ - light_color = null; - color = "#666666" - }, +/turf/open/floor/carpet/royalblue, /area/f13/fb/bar) "Ra" = ( /obj/structure/sign/poster/contraband/pinup_ride{ @@ -3964,6 +3908,14 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) +"Re" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/obj/structure/table/wood/settler, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/fb/bar) "Ri" = ( /obj/structure/table/abductor, /obj/effect/turf_decal/siding/wood{ @@ -3974,17 +3926,6 @@ color = "#CCCCCC" }, /area/f13/fb/bar) -"Rj" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" - }, -/obj/structure/curtain{ - color = "#c40e0e"; - open = 0 - }, -/turf/open/floor/carpet/royalblue, -/area/f13/fb/bar) "Rm" = ( /obj/machinery/light{ dir = 8 @@ -4020,31 +3961,28 @@ color = "#B18770" }, /area/f13/caves) -"Rv" = ( -/obj/structure/chair/sofa/left{ - dir = 8; - pixel_x = 8 +"Rs" = ( +/obj/structure/table/wood/settler, +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" }, /obj/effect/turf_decal/siding/wood{ + dir = 4; color = "#3B2B1A" }, -/turf/open/floor/carpet/blue, +/turf/open/floor/wood_common/wood_common_dark, /area/f13/fb/bar) -"RI" = ( -/obj/structure/chess/blackpawn, -/turf/open/floor/plasteel/white{ - light_color = null; - color = "#666666" +"Rv" = ( +/obj/structure/chair/sofa/left{ + dir = 8; + pixel_x = 8 }, -/area/f13/fb/bar) -"RJ" = ( /obj/effect/turf_decal/siding/wood{ - dir = 8; color = "#3B2B1A" }, -/turf/open/floor/carpet/black, +/turf/open/floor/carpet/blue, /area/f13/fb/bar) -"Sa" = ( +"RF" = ( /obj/effect/turf_decal/siding/wood{ dir = 8; color = "#3B2B1A" @@ -4053,51 +3991,65 @@ dir = 1; color = "#3B2B1A" }, -/turf/open/floor/carpet/black{ - color = "#CCCCCC" +/obj/structure/chair/right{ + dir = 2 + }, +/obj/effect/overlay/fog/fog2{ + plane = -2 + }, +/obj/structure/window/bronze{ + dir = 1 + }, +/turf/open/floor/wood_common{ + color = "#99BBBB" }, /area/f13/fb/bar) -"Sf" = ( +"RJ" = ( /obj/effect/turf_decal/siding/wood{ dir = 8; color = "#3B2B1A" }, -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" +/turf/open/floor/carpet/black, +/area/f13/fb/bar) +"RS" = ( +/obj/effect/overlay/fog/fog2{ + plane = -2 }, -/obj/structure/table/wood/settler, -/obj/machinery/light{ - dir = 8 +/obj/machinery/light/small{ + color = "#444499"; + dir = 1; + light_color = "#444499"; + light_power = 2; + light_range = 2; + pixel_y = 13 }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/fb/bar) -"Si" = ( -/obj/structure/window/bronze{ - plane = -3; - density = 0; - mouse_opacity = 0; - dir = 1 +/turf/open/floor/wood_common{ + color = "#779999" }, +/area/f13/fb/bar) +"RU" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1; + dir = 8; color = "#3B2B1A" }, -/obj/structure/chess/blackknight, -/turf/open/floor/plasteel/white, +/obj/structure/decoration/sign{ + icon_state = "vault_dorm"; + pixel_x = -32 + }, +/turf/open/floor/carpet/black, /area/f13/fb/bar) -"Sk" = ( +"Sa" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1; + dir = 8; color = "#3B2B1A" }, /obj/effect/turf_decal/siding/wood{ - dir = 8; + dir = 1; color = "#3B2B1A" }, -/obj/machinery/light{ - dir = 8 +/turf/open/floor/carpet/black{ + color = "#CCCCCC" }, -/turf/open/floor/carpet/royalblue, /area/f13/fb/bar) "SP" = ( /obj/structure/spacevine{ @@ -4125,12 +4077,15 @@ light_color = "#BAF8FF" }, /area/f13/caves) -"Tj" = ( +"SZ" = ( /obj/effect/turf_decal/siding/wood{ + dir = 1; color = "#3B2B1A" }, -/obj/item/kirbyplants/random, -/turf/open/floor/carpet/black, +/obj/machinery/computer/arcade{ + density = 0 + }, +/turf/open/floor/carpet/arcade, /area/f13/fb/bar) "Tm" = ( /obj/effect/turf_decal/siding/wood{ @@ -4158,6 +4113,24 @@ color = "#B18770" }, /area/f13/caves) +"Ts" = ( +/obj/effect/decal/cleanable/glitter/white{ + color = "#884444" + }, +/obj/structure/chair/stool/retro/tan, +/obj/structure/railing{ + color = "#A47449"; + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/turf/open/floor/carpet/arcade, +/area/f13/fb/bar) "Tt" = ( /obj/structure/chair/sofa/right{ dir = 1; @@ -4168,21 +4141,20 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"TL" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" +"Tu" = ( +/obj/structure/window/bronze{ + plane = -3; + density = 0; + mouse_opacity = 0; + dir = 4 }, -/obj/machinery/light{ - dir = 1 +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, -/turf/open/floor/carpet/royalblue, -/area/f13/fb/bar) -"TN" = ( -/obj/structure/chair/f13chair1{ - dir = 1 +/turf/open/floor/plasteel/white{ + light_color = null; + color = "#666666" }, -/turf/open/floor/wood_common/wood_common_dark, /area/f13/fb/bar) "TR" = ( /obj/structure/chair/f13chair1{ @@ -4227,23 +4199,31 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"Ue" = ( -/obj/structure/sign/painting/library{ - pixel_x = -32 +"Ud" = ( +/obj/structure/window/bronze{ + plane = -3; + density = 0; + mouse_opacity = 0; + dir = 1 + }, +/obj/structure/window/bronze{ + plane = -3; + density = 0; + mouse_opacity = 0; + dir = 4 }, /obj/effect/turf_decal/siding/wood{ - dir = 8; + dir = 1; color = "#3B2B1A" }, -/obj/machinery/light/small{ - color = "#444499"; - dir = 8; - light_color = "#444499"; - light_power = 2; - light_range = 2; - pixel_y = 13 +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/chess/blackrook, +/turf/open/floor/plasteel/white{ + light_color = null; + color = "#666666" }, -/turf/open/floor/carpet/black, /area/f13/fb/bar) "Uf" = ( /obj/structure/chair/sofa/corner{ @@ -4280,6 +4260,27 @@ light_color = "#BAF8FF" }, /area/f13/caves) +"Up" = ( +/obj/structure/window/bronze{ + plane = -3; + density = 0; + mouse_opacity = 0; + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/chess/whiterook, +/obj/structure/window/bronze{ + plane = -6; + density = 0; + mouse_opacity = 0 + }, +/turf/open/floor/plasteel/white, +/area/f13/fb/bar) "Uw" = ( /obj/effect/turf_decal/siding/wood{ color = "#3B2B1A" @@ -4299,18 +4300,44 @@ }, /turf/open/floor/plasteel/neutral, /area/f13/fb/bar) -"UG" = ( +"UB" = ( /obj/effect/turf_decal/siding/wood{ color = "#3B2B1A" }, -/obj/structure/chair/f13chair1{ - dir = 8 +/obj/structure/chair/bench, +/turf/open/floor/carpet/black, +/area/f13/fb/bar) +"UK" = ( +/obj/structure/railing{ + color = "#A47449"; + layer = 4; + pixel_y = -2 + }, +/obj/structure/railing{ + color = "#A47449"; + dir = 1 + }, +/obj/effect/overlay/fog/fog2{ + plane = -2 + }, +/turf/open/floor/wood_common{ + color = "#779999" }, -/turf/open/floor/wood_common/wood_common_dark, /area/f13/fb/bar) -"UT" = ( -/obj/structure/chair/f13chair1, -/turf/open/floor/wood_common/wood_common_dark, +"UY" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/structure/chess/whitequeen, +/obj/structure/window/bronze{ + plane = -6; + density = 0; + mouse_opacity = 0 + }, +/turf/open/floor/plasteel/white{ + light_color = null; + color = "#666666" + }, /area/f13/fb/bar) "Vk" = ( /obj/structure/spacevine{ @@ -4370,15 +4397,36 @@ light_power = 2; light_color = "#BAF8FF" }, -/area/f13/caves) -"Vq" = ( -/obj/structure/curtain{ - color = "#c40e0e"; - open = 0 +/area/f13/caves) +"Vq" = ( +/obj/structure/curtain{ + color = "#c40e0e"; + open = 0 + }, +/turf/open/floor/carpet/black, +/area/f13/fb/bar) +"Vs" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/obj/structure/chair/left{ + dir = 1 + }, +/obj/effect/overlay/fog/fog2{ + plane = -2 + }, +/obj/structure/window/bronze{ + plane = -3 + }, +/turf/open/floor/wood_common{ + color = "#99BBBB" }, -/turf/open/floor/carpet/black, /area/f13/fb/bar) -"Vw" = ( +"VG" = ( /obj/effect/turf_decal/siding/wood{ dir = 8; color = "#3B2B1A" @@ -4386,10 +4434,15 @@ /obj/effect/turf_decal/siding/wood{ color = "#3B2B1A" }, -/obj/machinery/computer/slot_machine{ - pixel_y = -4; - density = 0 +/obj/machinery/light/small{ + color = "#444499"; + dir = 8; + light_color = "#444499"; + light_power = 2; + light_range = 2; + pixel_y = 13 }, +/obj/item/kirbyplants/random, /turf/open/floor/carpet/black, /area/f13/fb/bar) "VN" = ( @@ -4415,24 +4468,6 @@ }, /turf/open/floor/carpet/blue, /area/f13/fb/bar) -"VT" = ( -/obj/machinery/computer/arcade{ - density = 0 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" - }, -/obj/structure/railing{ - color = "#A47449"; - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/turf/open/floor/carpet/arcade, -/area/f13/fb/bar) "Wh" = ( /obj/structure/chair/stool/retro/backed{ dir = 4 @@ -4447,6 +4482,31 @@ }, /turf/open/floor/carpet/royalblue, /area/f13/fb/bar) +"Wr" = ( +/obj/structure/window/bronze{ + plane = -6; + density = 0; + mouse_opacity = 0 + }, +/obj/structure/window/bronze{ + plane = -3; + density = 0; + mouse_opacity = 0; + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/obj/structure/chess/whiterook, +/turf/open/floor/plasteel/white{ + light_color = null; + color = "#666666" + }, +/area/f13/fb/bar) "Wx" = ( /obj/structure/sign/painting/library{ pixel_x = -32 @@ -4464,31 +4524,26 @@ }, /turf/open/floor/carpet/black, /area/f13/fb/bar) -"Wy" = ( -/obj/structure/window/bronze{ - plane = -3; - density = 0; - mouse_opacity = 0; - dir = 1 - }, -/obj/structure/window/bronze{ - plane = -3; - density = 0; - mouse_opacity = 0; - dir = 4 - }, +"Wz" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1; + dir = 8; color = "#3B2B1A" }, /obj/effect/turf_decal/siding/wood{ - dir = 4 + color = "#3B2B1A" }, -/obj/structure/chess/blackrook, -/turf/open/floor/plasteel/white{ - light_color = null; - color = "#666666" +/obj/structure/table/wood/settler, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/fb/bar) +"WO" = ( +/obj/structure/railing{ + color = "#A47449"; + dir = 1 }, +/turf/open/transparent/openspace, /area/f13/fb/bar) "WW" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -4522,6 +4577,13 @@ color = "#CCCCCC" }, /area/f13/fb/bar) +"XK" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/turf/open/floor/carpet/green, +/area/f13/fb/bar) "XN" = ( /obj/effect/turf_decal/siding/wood{ dir = 1; @@ -4567,38 +4629,20 @@ light_color = "#BAF8FF" }, /area/f13/caves) -"XW" = ( +"XR" = ( /obj/effect/overlay/fog/fog2{ plane = -2 }, -/turf/open/indestructible/ground/inside/mountain, -/area/f13/caves) -"Yc" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 4 +/turf/open/floor/wood_common{ + color = "#779999" }, -/turf/open/transparent/openspace, /area/f13/fb/bar) -"Yh" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/obj/item/kirbyplants/random, -/obj/machinery/light/small{ - color = "#444499"; - dir = 4; - light_color = "#444499"; - light_power = 2; - light_range = 2; - pixel_y = 13 +"XW" = ( +/obj/effect/overlay/fog/fog2{ + plane = -2 }, -/turf/open/floor/carpet/black, -/area/f13/fb/bar) +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "Ys" = ( /obj/structure/closet{ pixel_x = 8 @@ -4635,34 +4679,9 @@ light_color = "#BAF8FF" }, /area/f13/caves) -"Yx" = ( -/obj/machinery/light/small{ - color = "#444499"; - dir = 8; - light_color = "#444499"; - light_power = 2; - light_range = 2; - pixel_y = 13 - }, -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/obj/structure/chair/left{ - dir = 1 - }, -/obj/effect/overlay/fog/fog2{ - plane = -2 - }, -/obj/structure/window/bronze{ - plane = -3 - }, -/turf/open/floor/wood_common{ - color = "#99BBBB" - }, +"Yw" = ( +/obj/machinery/door/unpowered/securedoor, +/turf/open/floor/carpet/royalblue, /area/f13/fb/bar) "YC" = ( /obj/structure/chair/sofa/left{ @@ -4709,13 +4728,20 @@ light_color = "#BAF8FF" }, /area/f13/caves) -"YM" = ( -/obj/effect/overlay/fog/fog2{ - plane = -2 +"YO" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" }, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/structure/sign/poster/contraband/pinup_topless{ + pixel_y = 32 + }, +/obj/machinery/mineral/wasteland_vendor/special{ + pixel_y = 14; + pixel_x = 5; + density = 0 }, +/turf/open/floor/carpet/black, /area/f13/fb/bar) "YQ" = ( /obj/structure/table/glass, @@ -4725,59 +4751,33 @@ /obj/structure/sign/poster/contraband/pinup_bed, /turf/closed/wall/mineral/brick, /area/f13/fb/bar) -"Zx" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/turf/open/floor/carpet/royalblue, -/area/f13/fb/bar) -"ZN" = ( -/obj/structure/table/wood/settler, -/obj/item/storage/box/dice{ - pixel_x = 1; - pixel_y = 5 +"ZQ" = ( +/obj/machinery/light/small{ + color = "#444499"; + dir = 4; + light_color = "#444499"; + light_power = 2; + light_range = 2; + pixel_y = 13 }, -/obj/item/storage/bag/dice_cup, /obj/effect/turf_decal/siding/wood{ dir = 4; color = "#3B2B1A" }, -/turf/open/floor/wood_common/wood_common_dark, +/turf/open/floor/carpet/black, /area/f13/fb/bar) -"ZS" = ( +"ZT" = ( +/obj/effect/overlay/fog/fog2{ + plane = -2 + }, /obj/structure/railing{ color = "#A47449"; dir = 4 }, -/obj/effect/overlay/fog/fog2{ - plane = -2 - }, /turf/open/floor/wood_common{ color = "#779999" }, /area/f13/fb/bar) -"ZV" = ( -/obj/machinery/photocopier, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/sign/painting/library{ - pixel_x = 32 - }, -/turf/open/floor/wood_common/wood_common_dark, -/area/f13/fb/bar) -"ZW" = ( -/obj/machinery/light/floor{ - light_color = "#444499"; - color = "#444499"; - alpha = 10 - }, -/turf/open/floor/carpet/black, -/area/f13/fb/bar) (1,1,1) = {" nZ @@ -7664,14 +7664,14 @@ il il il il -aT -aT -aT -aT -aT -aT -aT -aT +wB +wB +wB +wB +wB +wB +wB +wB nZ nZ nZ @@ -7909,10 +7909,10 @@ nZ nZ il il -NX +Gv Ll -pO -Vw +Pc +Fv il YQ rk @@ -7921,14 +7921,14 @@ kf wn ki il -yl -Pg -Yx -aT -yl -hC -Yx -aT +RF +dz +nM +wB +RF +EX +nM +wB nZ nZ nZ @@ -8169,7 +8169,7 @@ il yx zr gn -sn +EE il DS kf @@ -8178,14 +8178,14 @@ kf vU Ex il -ey -DD -vc -aT -ey -DD -vc -JU +qW +if +oI +wB +qW +if +oI +DY nZ nZ nZ @@ -8417,32 +8417,32 @@ il ns Nz il -fD -ox +PD +eM il ns sd il -FQ +YO zr Xy -sn +EE il nc kf YQ kf vU -uw +Dh il -ob -tb -bA -aT -ob -tb -bA -JU +QR +Nf +lR +wB +QR +Nf +lR +DY nZ nZ nZ @@ -8680,10 +8680,10 @@ eu jA Rv il -qG +kX zr zr -Tj +NB il YQ YQ @@ -8692,14 +8692,14 @@ kf vU ln il -YM -YM -YM -aT -YM -YM -YM -JU +XR +XR +XR +wB +XR +XR +XR +DY nZ nZ nZ @@ -8939,8 +8939,8 @@ il il Ib zr -ZW -cW +LC +UB il iA pj @@ -8949,14 +8949,14 @@ Oq vv cs il -Jj -jN -Jj -aT -Jj -qP -Jj -JU +Qf +UK +Qf +wB +Qf +JQ +Qf +DY nZ nZ nZ @@ -9197,7 +9197,7 @@ il nX zr ph -cW +UB il wM vU @@ -9206,14 +9206,14 @@ vv vv Ex il -AK -YM -YM -aT -YM -YM -AK -JU +vb +XR +XR +wB +XR +XR +vb +DY nZ nZ nZ @@ -9451,26 +9451,26 @@ eu DJ Mv il -lG +dm zr zr hj il -An -cV -rp -Nu +Ew +ad +GM +tH il il il -dn -ZS -lK -wc -lK -lK -al -JU +EN +Cl +ZT +yJ +ZT +ZT +OF +DY nZ nZ nZ @@ -9713,11 +9713,11 @@ gi zr zr Ll -oV +cQ vU -KK -kQ -Ez +zL +VG +Fo Qe Qe Qe @@ -9727,7 +9727,7 @@ Qe Qe Qe Qe -JU +DY nZ nZ nZ @@ -9959,22 +9959,22 @@ il ns sd il -On +cV hj il ns Nz il -VT -sh +HK +Ts zr zr zr zr vU -KK +zL hj -Ez +Fo Qe Qe Qe @@ -9984,7 +9984,7 @@ Qe Qe Qe Qe -JU +DY nZ nZ nZ @@ -10222,16 +10222,16 @@ eu DJ xI il -fx -pu +SZ +vE zr ph zr zr vU -KK +zL hj -Ez +Fo Qe Qe Qe @@ -10241,7 +10241,7 @@ Qe Qe Qe Qe -JU +DY nZ nZ nZ @@ -10479,16 +10479,16 @@ il Za il il -xr -cL +Jq +mN zr -ZW +LC zr zr -jo -Lo +XK +mu hj -Ez +Fo Qe Qe Qe @@ -10498,7 +10498,7 @@ Qe Qe Qe Qe -JU +DY nZ nZ nZ @@ -10732,10 +10732,10 @@ RJ RJ zr zr -zq +RU Af RJ -Ue +dy zr zr zr @@ -10745,7 +10745,7 @@ ph ea Wj hj -Ez +Fo Qe Qe Qe @@ -10755,7 +10755,7 @@ Qe Qe Qe Qe -JU +DY nZ nZ nZ @@ -10992,7 +10992,7 @@ zr zr zr zr -rC +MM zr ph zr @@ -11002,7 +11002,7 @@ zr ea Wj hj -Ez +Fo Qe Qe Qe @@ -11012,7 +11012,7 @@ Qe Qe Qe Qe -JU +DY nZ nZ nZ @@ -11254,22 +11254,22 @@ zr zr zr zr -ak -nz +ZQ +NT ea Wj -Yh -Ez +bP +Fo Qe Qe -Yc -Yc -Yc -Yc -Yc -Yc -Yc -JU +hT +hT +hT +hT +hT +hT +hT +DY nZ nZ nZ @@ -11512,21 +11512,21 @@ zr zr hj il -Nu -Ju -lL -Nu +tH +QY +Yw +tH il il il -GL -YM -YM -Pr -YM -YM -pF -JU +RS +XR +XR +KH +XR +XR +tL +DY nZ nZ nZ @@ -11760,30 +11760,30 @@ nZ il nX zr -nn +zu Jp Jp Jp -nn +zu Jp Jp -CE +vk il -jS +rm ea Wj -UT -Bf -Sf +BS +Re +Wz il -zW -YM -lK -aT -lK -YM -zW -JU +eI +XR +ZT +wB +ZT +XR +eI +DY nZ nZ nZ @@ -12015,7 +12015,7 @@ nZ nZ nZ il -la +JX Vq il aH @@ -12026,21 +12026,21 @@ aH aH aH il -Hj +Ek ea Wj -UT -ZN -fg +BS +gT +Rs il -uX -rj -Ki -aT -uX -rj -rq -JU +bt +oB +WO +wB +bt +oB +bB +DY nZ nZ nZ @@ -12272,7 +12272,7 @@ nZ nZ nZ il -LC +NW gs il XN @@ -12286,18 +12286,18 @@ il pq ea qp -Wj -Ca -UG +nH +aL +gy il -YM -YM -YM -aT -YM -YM -YM -JU +XR +XR +XR +wB +XR +XR +XR +DY nZ nZ nZ @@ -12540,21 +12540,21 @@ KU Wh pd il -xM -zG +CY +wl qp qp ag -Zx +nH il -yl -ap -Bv -aT -yl -ap -Bv -JU +RF +wo +Vs +wB +RF +wo +Vs +DY nZ nZ nZ @@ -12794,24 +12794,24 @@ jf bg il ys -qD +QT bg il -dr -TN -zG -aG +MD +fw +wl +tY qp Wj il -ey -DD -vc -aT -ey -DD -vc -JU +qW +if +oI +wB +qW +if +oI +DY nZ nZ nZ @@ -13054,21 +13054,21 @@ XH oA EK il -zT -vW -ZV -DF +KN +CW +HH +kQ ea Wj il -ob -Ku -bA -aT -ob -Ku -bA -aT +QR +yl +lR +wB +QR +yl +lR +wB nZ nZ nZ @@ -13315,17 +13315,17 @@ il il il il -Rj -Iu +bI +ub il -aT -aT -aT -aT -aT -aT -aT -aT +wB +wB +wB +wB +wB +wB +wB +wB nZ nZ nZ @@ -13567,18 +13567,18 @@ nZ nZ nZ il -Sk +Kz ag ag ag -Cg +GE qp qp -Cg +GE ag ag ag -wa +vB il nZ nZ @@ -14083,14 +14083,14 @@ nZ il ea qp -hK -hD -Er -Am -Er -Am -rD -cG +PV +ry +LF +sJ +LF +sJ +zZ +Wr qp Wj il @@ -14340,14 +14340,14 @@ nZ il ea qp -QS -qw -oi -Be -oi -Be -ax -Ef +uQ +jY +Ht +wV +Ht +wV +DC +ym qp Wj il @@ -14595,18 +14595,18 @@ nZ nZ nZ il -TL +tu qp -zR -RI -Be -oi -Be -oi -mA +ic +Ba +wV Ht +wV +Ht +eL +mv qp -KZ +rA il nZ nZ @@ -14854,14 +14854,14 @@ nZ il ea qp -jF -qw -oi -Be -oi -Be -ax -jX +EY +jY +Ht +wV +Ht +wV +DC +ud qp Wj il @@ -15111,14 +15111,14 @@ nZ il ea qp -Lk -RI -Be -oi -Be -oi -mA -IY +EP +Ba +wV +Ht +wV +Ht +eL +UY qp Wj il @@ -15366,18 +15366,18 @@ nZ nZ nZ il -TL +tu qp -In -qw -oi -Be -oi -Be -ax -jE +fo +jY +Ht +wV +Ht +wV +DC +se qp -KZ +rA il nZ nZ @@ -15625,14 +15625,14 @@ nZ il ea qp -Si -RI -Be -oi -Be -oi -mA -yC +sw +Ba +wV +Ht +wV +Ht +eL +QF qp Wj il @@ -15882,14 +15882,14 @@ nZ il ea qp -Wy -BN -PJ -PC -PJ -PC -vd -KM +Ud +yE +Tu +ve +Tu +ve +lt +Up qp Wj il @@ -16394,18 +16394,18 @@ nZ nZ nZ il -uK -aG -aG -aG -rl -aG -aG -rl -aG -aG aG -Ei +tY +tY +tY +PW +tY +tY +PW +tY +tY +tY +qq il nZ nZ @@ -31300,7 +31300,7 @@ jf bg il ys -qD +QT bg il gh diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 4942f5ae2a..4236b47710 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -346,7 +346,7 @@ GLOBAL_LIST_EMPTY(chat_chuds) numb = 99999999 var/list/splitnumbers = list() /// splits numb into its digits, from most to least significant - while(numb > 0) + while(numb >= 0) splitnumbers += numb % 10 numb /= 10 numb = floor(numb) @@ -368,22 +368,39 @@ GLOBAL_LIST_EMPTY(chat_chuds) var/area/A = get_area(source) var/private = A.private var/datum/chatchud/CC = get_chatchud(source) - var/list/see_close = hearers(source, close_range) - var/list/see_far = hearers(source, long_range) - see_close + // var/list/see_close = hearers(source, close_range) + // var/list/see_far = hearers(source, long_range) - see_close + var/turf/myturf = get_turf(source) var/debug_i = 0 dingus: for(var/client/C in GLOB.clients) var/mob/M = C.mob - if(M.z != source.z) + var/turf/theyturf = get_turf(M) + if(myturf.z != theyturf.z) continue dingus - if(get_dist(M, source) > long_range) + if(get_dist(myturf, theyturf) > long_range) continue dingus - var/is_far = (M in see_far) - var/is_close = (M in see_close) + var/list/me2them = getline(myturf, theyturf) + var/is_arguably_visible = TRUE + if(!isturf(M.loc)) + is_arguably_visible = FALSE + else + bungus: + for(var/turf/tee as anything in me2them) + if(tee.opacity) + is_arguably_visible = FALSE + break + for(var/atom/movable/AM as anything in tee.contents) + if(AM.opacity) + is_arguably_visible = FALSE + break bungus // dont break my bungus + var/is_far = !is_arguably_visible || get_dist(myturf, theyturf) > close_range + var/is_close = is_arguably_visible && get_dist(myturf, theyturf) <= close_range if(is_far) - if(private) + if(private && !is_arguably_visible) continue dingus - CC.visible_far[M] = TRUE + else if(is_arguably_visible) + CC.visible_far[M] = TRUE continue dingus else if(is_close) CC.visible_close[M] = TRUE @@ -392,7 +409,7 @@ GLOBAL_LIST_EMPTY(chat_chuds) // continue dingus // they're too far away to hear // now the fun begins. Try to find a path to them // now the real fun begins - var/list/soundwalk = get_path_to(source, M, long_range, use_visibility = TRUE) + var/list/soundwalk = get_path_to(theyturf, myturf, long_range, use_visibility = TRUE) if(!islist(soundwalk)) CC.hidden_inaccessible[M] = TRUE continue dingus @@ -401,14 +418,17 @@ GLOBAL_LIST_EMPTY(chat_chuds) continue dingus // now walk through the path and find the first tile that can see the source donger: + debug_i = 0 + var/cole = SSchat.debug_chud && safepick("#FF0000", "#00FF00", "#0000FF", "#FFFF00", "#FF00FF", "#00FFFF") for(var/turf/T as anything in soundwalk) - var/list/seeline = getline(T, M) - debug_i = 0 - var/cole = pick("#FF0000", "#00FF00", "#0000FF", "#FFFF00", "#FF00FF", "#00FFFF") + var/list/seeline = getline(T, theyturf) + if(LAZYLEN(seeline) > SSchat.far_distance) + continue donger + if(SSchat.debug_chud) + new /obj/effect/temp_visual/numbers/backgrounded(T, debug_i, cole) + debug_i++ for(var/turf/TT as anything in seeline) // beeg american TTs - if(SSchat.debug_chud) - new /obj/effect/temp_visual/numbers/backgrounded(T, debug_i, cole) - debug_i++ + new /obj/effect/temp_visual/emp/pulse(TT) if(TT.opacity) continue donger for(var/atom/AM as anything in TT.contents) diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm index d4b7225c92..e8cd2663bd 100644 --- a/code/datums/chatmessage.dm +++ b/code/datums/chatmessage.dm @@ -7,7 +7,7 @@ #define CHAT_MESSAGE_WIDTH 100 // pixels #define CHAT_MESSAGE_MAX_LENGTH 200 // characters -// GLOBAL_LIST_EMPTY(verbal_punch_lasers) +GLOBAL_LIST_INIT(verbal_punch_lasers, list(null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,)) // im a genus /** * # Chat Message Overlay @@ -157,28 +157,38 @@ var/turf/ownerturf = get_turf(owner) message_loc = ownerturf var/angle_to_source = Get_Angle(ownerturf, message_loc) - // cus the damn angles are rotated 90 degrees clockwise, gotta change the angle 90 degrees counter - // // get us a verbal punch laser - // var/i = 1 - // var/datum/point/vector/punch_laser - // while(!punch_laser) - // punch_laser = GLOB.verbal_punch_lasers[i] - // if(!punch_laser) - // punch_laser = new /datum/point/vector() - // GLOB.verbal_punch_lasers[i] = punch_laser - // else if(punch_laser.inuse) - // i++ - // punch_laser = null - // punch_laser.initialize_location(ownerturf.x, ownerturf.y, ownerturf.z, 0, 0) - // punch_laser.initialize_trajectory(32*6, angle_to_source) // 32 pixels per tile, 6 tiles away - // punch_laser.increment(1) - var/turf/displayloc = get_turf_in_angle(angle_to_source, ownerturf, 6) + if(SSchat.debug_chud) + var/angle_it_probably_shoud_be = get_dir(owner, target) + var/actually_angle = dir2angle(angle_it_probably_shoud_be) + message_admins("Angle from [owner] to [message_loc] is [angle_to_source]. The dir from owner to target is [angle_it_probably_shoud_be], with an angle of [actually_angle]. Suck me off.") + // get us a verbal punch laser + var/i = 1 + var/datum/point/vector/punch_laser + var/tries = 100 + while(!punch_laser && tries-- > 1) + punch_laser = LAZYACCESS(GLOB.verbal_punch_lasers, i) + if(!punch_laser) + punch_laser = new /datum/point/vector() + if(GLOB.verbal_punch_lasers.len < i) + GLOB.verbal_punch_lasers.len = i + 4 // genius + GLOB.verbal_punch_lasers[i] = punch_laser + else if(punch_laser.inuse) + i++ + punch_laser = null + punch_laser.initialize_location(ownerturf.x, ownerturf.y, ownerturf.z, 0, 0) + punch_laser.initialize_trajectory(32*6, angle_to_source) // 32 pixels per tile, 6 tiles away + punch_laser.increment(1) + var/turf/displayloc = punch_laser.return_turf() // get_turf_in_angle(angle_to_source, ownerturf, 6) + if(SSchat.debug_chud) + var/angle_it_probably_shoud_be = get_dir(owner, displayloc) + var/actually_angle = dir2angle(angle_it_probably_shoud_be) + message_admins("Post-Nut Angle from [owner] to [displayloc] is [angle_to_source]. The dir from owner to target is [angle_it_probably_shoud_be], with an angle of [actually_angle]. Suck me off.") + new /obj/effect/temp_visual/monkeyify(displayloc) if(!displayloc) displayloc = ownerturf // whatevs message_loc = displayloc if(SSchat.debug_chud) ownerturf.Beam(displayloc, icon_state = "g_beam", time = 3 SECONDS) - if(!owned_by) return if (owned_by.seen_messages) From 5c90758cdc03e46210f48a79c098fe2f8d0b5b6e Mon Sep 17 00:00:00 2001 From: Superlagg Date: Sun, 14 Jul 2024 18:21:08 -0700 Subject: [PATCH 2/2] chore: Update chat display plane to prevent messages from being hidden by FoV --- code/__DEFINES/layers.dm | 3 +- code/__DEFINES/maths.dm | 5 + code/__HELPERS/game.dm | 132 +++++++++++---------- code/controllers/subsystem/chat.dm | 5 +- code/datums/beam.dm | 43 ++++++- code/datums/chatmessage.dm | 79 ++++++------ code/modules/mob/dead/observer/observer.dm | 16 ++- code/modules/mob/living/say.dm | 43 +++++-- code/modules/mob/mob_movement.dm | 2 +- 9 files changed, 191 insertions(+), 137 deletions(-) diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index f69fe1e7c7..2b30c31554 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -28,11 +28,12 @@ #define MOB_PLANE -3 // Used for mobs rendering. #define FIELD_OF_VISION_VISUAL_PLANE -2 //Yea, FoV does require quite a few planes to work with 513 filters to a decent degree. -#define CHAT_PLANE -1 //We don't want heard messages to be hidden by FoV. #define CHAT_LAYER 12.1 //Legacy, it doesn't matter that much because we are displayed above the game plane anyway. #define BLACKNESS_PLANE 0 //To keep from conflicts with SEE_BLACKNESS internals +#define CHAT_PLANE 2 //We don't want heard messages to be hidden by FoV. + #define SPACE_LAYER 1.8 //#define TURF_LAYER 2 //For easy recordkeeping; this is a byond define #define MID_TURF_LAYER 2.02 diff --git a/code/__DEFINES/maths.dm b/code/__DEFINES/maths.dm index ce0dcdf654..8ebc881ad6 100644 --- a/code/__DEFINES/maths.dm +++ b/code/__DEFINES/maths.dm @@ -270,6 +270,11 @@ var/roundie = 1 * (0.1**decimals) return "[round(number, roundie)][unit]" +/// checks if a given turf's x/y coordinates fall within a given rectangle +/// xwest, ynorth, xeast, ysouth are the bounds of the rectangle +/// N/S is Y, Y increases as you go north +/// E/W is X, X increases as you go east +#define TURF_IN_RECTANGLE(turf, xwest, ynorth, xeast, ysouth) (turf.x >= xwest && turf.x <= xeast && turf.y >= ynorth && turf.y <= ysouth) #define RANDOM(min, max) (rand(min*1000, max*1000)*0.001) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 4236b47710..20af86df47 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -309,15 +309,15 @@ GLOBAL_LIST_EMPTY(chat_chuds) /datum/chatchud var/list/visible_close = list() var/list/visible_far = list() - var/list/hidden_close_pathable = list() + var/list/hidden_pathable = list() var/list/hidden_inaccessible = list() var/ready = TRUE /datum/chatchud/proc/putback() visible_close.Cut() visible_far.Cut() - hidden_close_pathable.Cut() - ready = TRUE + hidden_pathable.Cut() + ready = TRUE // snip snip no jutsu wuz here /obj/effect/temp_visual/debug_heart name = "love heart" @@ -346,10 +346,14 @@ GLOBAL_LIST_EMPTY(chat_chuds) numb = 99999999 var/list/splitnumbers = list() /// splits numb into its digits, from most to least significant - while(numb >= 0) - splitnumbers += numb % 10 - numb /= 10 - numb = floor(numb) + if(numb <= 0) + splitnumbers += 0 + else + var/tries = 10 + while(numb > 0 && tries-- > 0) + splitnumbers += numb % 10 + numb /= 10 + numb = floor(numb) /// now we have to reverse the list splitnumbers = reverseList(splitnumbers) var/offset = 0 @@ -363,81 +367,83 @@ GLOBAL_LIST_EMPTY(chat_chuds) if(coler) color = coler +#define IS_IN_VIEWER_RECT(turf) TURF_IN_RECTANGLE(turf, westest, eastest, northest, southest) + /// returns a datum of players and how well they can hear the source /proc/get_listening(atom/source, close_range, long_range, quiet) var/area/A = get_area(source) var/private = A.private var/datum/chatchud/CC = get_chatchud(source) - // var/list/see_close = hearers(source, close_range) - // var/list/see_far = hearers(source, long_range) - see_close - var/turf/myturf = get_turf(source) + var/turf/source_turf = get_turf(source) var/debug_i = 0 dingus: for(var/client/C in GLOB.clients) var/mob/M = C.mob - var/turf/theyturf = get_turf(M) - if(myturf.z != theyturf.z) + var/turf/viewer_turf = get_turf(M) + if(source_turf.z != viewer_turf.z) continue dingus - if(get_dist(myturf, theyturf) > long_range) + var/westest = max(viewer_turf.x - 9, 1) + var/eastest = min(viewer_turf.x + 9, world.maxx) + var/northest = max(viewer_turf.y - 6, 1) + var/southest = min(viewer_turf.y + 6, world.maxy) + var/list/things_in_viewer_los = view(9, viewer_turf) + if(SSchat.debug_chud) + var/turf/t_northwest = locate(westest, northest, viewer_turf.z) + var/turf/t_southeast = locate(eastest, southest, viewer_turf.z) + var/turf/t_northeast = locate(eastest, northest, viewer_turf.z) + var/turf/t_southwest = locate(westest, southest, viewer_turf.z) + /// draw a beam box! + t_northeast.Beam(t_northwest, icon_state = "1-full", time = 3 SECONDS, show_to = list(C)) + t_northeast.Beam(t_southeast, icon_state = "1-full", time = 3 SECONDS, show_to = list(C)) + t_southeast.Beam(t_southwest, icon_state = "1-full", time = 3 SECONDS, show_to = list(C)) + t_southwest.Beam(t_northwest, icon_state = "1-full", time = 3 SECONDS, show_to = list(C)) + var/in_close_view = (source_turf in things_in_viewer_los) + var/in_rect = IS_IN_VIEWER_RECT(source_turf) + if(!in_rect && get_dist(source_turf, viewer_turf) > long_range) continue dingus - var/list/me2them = getline(myturf, theyturf) - var/is_arguably_visible = TRUE - if(!isturf(M.loc)) - is_arguably_visible = FALSE - else - bungus: - for(var/turf/tee as anything in me2them) - if(tee.opacity) - is_arguably_visible = FALSE - break - for(var/atom/movable/AM as anything in tee.contents) - if(AM.opacity) - is_arguably_visible = FALSE - break bungus // dont break my bungus - var/is_far = !is_arguably_visible || get_dist(myturf, theyturf) > close_range - var/is_close = is_arguably_visible && get_dist(myturf, theyturf) <= close_range - if(is_far) - if(private && !is_arguably_visible) + // basic visibility, fulfills these conditions: + // 1. must be in the box of visibility, so we dont have to play with pathing nonsense + // 2. must be in the line of sight of the hearer, so it shouldnt be over darkness + // basically if they're on screen, and either of the ranges are met, they're visible and we can skip the pathing + if(in_rect && in_close_view) + if(get_dist(source_turf, viewer_turf) <= close_range) + CC.visible_close[M] = TRUE continue dingus - else if(is_arguably_visible) + else if(get_dist(source_turf, viewer_turf) <= long_range) CC.visible_far[M] = TRUE + continue dingus + // if the source is in a Private area, + // and the viewer is either not in the line of sight or not in the box of visibility, + // then they're hidden, so we dont bleat out a bunch of horny moaning to the whole world + if(private) continue dingus - else if(is_close) - CC.visible_close[M] = TRUE - continue dingus - // if(get_dist(M, source) > long_range) - // continue dingus // they're too far away to hear // now the fun begins. Try to find a path to them - // now the real fun begins - var/list/soundwalk = get_path_to(theyturf, myturf, long_range, use_visibility = TRUE) + var/list/soundwalk = get_path_to(source_turf, viewer_turf, long_range, use_visibility = TRUE) + // they're closed off, no path to them, but they're still within long range if(!islist(soundwalk)) - CC.hidden_inaccessible[M] = TRUE + CC.hidden_inaccessible[M] = TRUE // mark them as hidden continue dingus + // the path from source to viewer is too long, so we consider them out of range if(!LAZYLEN(soundwalk) || LAZYLEN(soundwalk) > long_range) - CC.hidden_inaccessible[M] = TRUE continue dingus - // now walk through the path and find the first tile that can see the source - donger: - debug_i = 0 - var/cole = SSchat.debug_chud && safepick("#FF0000", "#00FF00", "#0000FF", "#FFFF00", "#FF00FF", "#00FFFF") - for(var/turf/T as anything in soundwalk) - var/list/seeline = getline(T, theyturf) - if(LAZYLEN(seeline) > SSchat.far_distance) - continue donger - if(SSchat.debug_chud) - new /obj/effect/temp_visual/numbers/backgrounded(T, debug_i, cole) - debug_i++ - for(var/turf/TT as anything in seeline) // beeg american TTs - new /obj/effect/temp_visual/emp/pulse(TT) - if(TT.opacity) - continue donger - for(var/atom/AM as anything in TT.contents) - if(AM.opacity) - continue donger - if(SSchat.debug_chud) - new /obj/effect/temp_visual/debug_heart(T) - CC.hidden_close_pathable[M] = T - continue dingus + // now walk through the path and find the first tile that can fulfill all of these conditions: + // 1. must be in the box of visibility + // 2. must be in the line of sight of the hearer + debug_i = 0 + var/cole = SSchat.debug_chud && safepick("#FF0000", "#00FF00", "#0000FF", "#FFFF00", "#FF00FF", "#00FFFF") + for(var/turf/T as anything in soundwalk) // for each step we take... + if(SSchat.debug_chud) + new /obj/effect/temp_visual/numbers/backgrounded(T, debug_i, cole) + debug_i++ + if(!IS_IN_VIEWER_RECT(T)) // ...check if our turf is in the viewer's box of visibility + continue // we can't see them + if(!(T in things_in_viewer_los)) // if they're in the box but not in the line of sight, + continue // we can't see them + // at this point, we have met these conditions + if(SSchat.debug_chud) + new /obj/effect/temp_visual/debug_heart(T) + CC.hidden_pathable[M] = T + continue dingus // couldnt find anything! mark them as hidden CC.hidden_inaccessible[M] = TRUE return CC diff --git a/code/controllers/subsystem/chat.dm b/code/controllers/subsystem/chat.dm index cfafdbb7c6..d1ee2ecdcb 100644 --- a/code/controllers/subsystem/chat.dm +++ b/code/controllers/subsystem/chat.dm @@ -20,11 +20,12 @@ SUBSYSTEM_DEF(chat) var/extended_whisper_distance = 3 var/base_sing_distance = 15 - var/extended_sing_distance = INFINITY + var/extended_sing_distance = 150 var/base_yell_distance = 15 - var/extended_yell_distance = INFINITY + var/extended_yell_distance = 150 var/far_distance = 6 // how far until they're considered offscreen + var/chat_display_plane = LIGHTING_PLANE + 1 // FUKCUAING FUKCING LIGHTING EATING AS //CHAT_PLANE var/list/payload_by_client = list() /// All the lookups for translating emotes to say prefixes diff --git a/code/datums/beam.dm b/code/datums/beam.dm index 3b3bbd3384..b7ddfdc1af 100644 --- a/code/datums/beam.dm +++ b/code/datums/beam.dm @@ -11,12 +11,13 @@ var/finished = 0 var/turf/target_oldloc var/turf/origin_oldloc + var/list/showing_to = list() var/static_beam = 0 var/beam_type = /obj/effect/ebeam //must be subtype var/timing_id = null var/recalculating = FALSE -/datum/beam/New(beam_origin,beam_target,beam_icon='icons/effects/beam.dmi',beam_icon_state="b_beam",time=50,maxdistance=10,btype = /obj/effect/ebeam,beam_sleep_time=3) +/datum/beam/New(beam_origin,beam_target,beam_icon='icons/effects/beam.dmi',beam_icon_state="b_beam",time=50,maxdistance=10,btype = /obj/effect/ebeam,beam_sleep_time=3,list/show_to) origin = beam_origin origin_oldloc = get_turf(origin) target = beam_target @@ -29,6 +30,12 @@ icon = beam_icon icon_state = beam_icon_state beam_type = btype + if(!isnull(show_to)) + var/list/to_show = islist(show_to) ? show_to : list(show_to) + for(var/thing in to_show) + var/client/C = extract_client(thing) + if(C) + showing_to += C if(time < INFINITY) addtimer(CALLBACK(src,PROC_REF(End)), time) @@ -83,6 +90,11 @@ /datum/beam/proc/Reset() for(var/obj/effect/ebeam/B in elements) + if(B.mypic && LAZYLEN(showing_to)) + for(var/client/C in showing_to) + if(!C) + continue + C.images -= B.mypic qdel(B) elements.Cut() @@ -109,7 +121,7 @@ for(N in 0 to length-1 step 32)//-1 as we want < not <=, but we want the speed of X in Y to Z and step X if(finished) break - var/obj/effect/ebeam/X = new beam_type(origin_oldloc) + var/obj/effect/ebeam/X = new beam_type(origin_oldloc, showing_to) X.owner = src elements += X @@ -148,6 +160,14 @@ X.pixel_x = Pixel_x X.pixel_y = Pixel_y + if(showing_to) + // snapshot no jutsu + var/image/II = image(X.icon, X.loc, X.icon_state, X.layer, X.dir, X.pixel_x, X.pixel_y) + II.transform = X.transform + X.mypic = II + for(var/client/C in showing_to) + if(C) + C.images += II CHECK_TICK afterDraw() @@ -155,6 +175,12 @@ mouse_opacity = MOUSE_OPACITY_TRANSPARENT anchored = TRUE var/datum/beam/owner + var/image/mypic + +/obj/effect/ebeam/Initialize(mapload, shows) + . = ..() + if(shows) + invisibility = INVISIBILITY_ABSTRACT /obj/effect/ebeam/Destroy() owner = null @@ -165,7 +191,16 @@ /obj/effect/ebeam/singularity_act() return -/atom/proc/Beam(atom/BeamTarget,icon_state="b_beam",icon='icons/effects/beam.dmi',time=50, maxdistance=10,beam_type=/obj/effect/ebeam,beam_sleep_time = 3) - var/datum/beam/newbeam = new(src,BeamTarget,icon,icon_state,time,maxdistance,beam_type,beam_sleep_time) +/atom/proc/Beam( + atom/BeamTarget, + icon_state="b_beam", + icon='icons/effects/beam.dmi', + time=50, + maxdistance=10, + beam_type=/obj/effect/ebeam, + beam_sleep_time = 3, + list/show_to = list() +) + var/datum/beam/newbeam = new(src,BeamTarget,icon,icon_state,time,maxdistance,beam_type,beam_sleep_time,show_to) INVOKE_ASYNC(newbeam, TYPE_PROC_REF(/datum/beam/,Start)) return newbeam diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm index e8cd2663bd..eeea9fb1f9 100644 --- a/code/datums/chatmessage.dm +++ b/code/datums/chatmessage.dm @@ -51,7 +51,7 @@ GLOBAL_LIST_INIT(verbal_punch_lasers, list(null,null,null,null,null,null,null,nu qdel(src) return alt_display = data["display_turf"] || null - if((get_dist(owner, (alt_display || target)) > 6 || data["is_far"]) && CHECK_PREFS(owner, SEE_FANCY_OFF_SCREEN_RUNECHAT)) // SD screens are 7 radius, but the UI covers a bit of that + if(data["is_far"] && CHECK_PREFS(owner, SEE_FANCY_OFF_SCREEN_RUNECHAT)) // SD screens are 7 radius, but the UI covers a bit of that offscreen = TRUE eavesdrop = data["is_eaves"] || FALSE INVOKE_ASYNC(src,PROC_REF(generate_image), text, target, owner, extra_classes, lifespan) @@ -140,7 +140,6 @@ GLOBAL_LIST_INIT(verbal_punch_lasers, list(null,null,null,null,null,null,null,nu // We dim italicized text to make it more distinguishable from regular text var/tgt_color = extra_classes.Find("italics") ? target.chat_color_darkened : target.chat_color - // Approximate text height // Note we have to replace HTML encoded metacharacters otherwise MeasureText will return a zero height // BYOND Bug #2563917 @@ -151,50 +150,36 @@ GLOBAL_LIST_INIT(verbal_punch_lasers, list(null,null,null,null,null,null,null,nu approx_lines = max(1, mheight / CHAT_MESSAGE_APPROX_LHEIGHT) // Translate any existing messages upwards, apply exponential decay factors to timers - var/atom/remembered_location = alt_display || target message_loc = alt_display || target if(offscreen) // if its offscreen, put it somewhere they can see it var/turf/ownerturf = get_turf(owner) - message_loc = ownerturf - var/angle_to_source = Get_Angle(ownerturf, message_loc) - if(SSchat.debug_chud) - var/angle_it_probably_shoud_be = get_dir(owner, target) - var/actually_angle = dir2angle(angle_it_probably_shoud_be) - message_admins("Angle from [owner] to [message_loc] is [angle_to_source]. The dir from owner to target is [angle_it_probably_shoud_be], with an angle of [actually_angle]. Suck me off.") - // get us a verbal punch laser - var/i = 1 - var/datum/point/vector/punch_laser - var/tries = 100 - while(!punch_laser && tries-- > 1) - punch_laser = LAZYACCESS(GLOB.verbal_punch_lasers, i) - if(!punch_laser) - punch_laser = new /datum/point/vector() - if(GLOB.verbal_punch_lasers.len < i) - GLOB.verbal_punch_lasers.len = i + 4 // genius - GLOB.verbal_punch_lasers[i] = punch_laser - else if(punch_laser.inuse) - i++ - punch_laser = null - punch_laser.initialize_location(ownerturf.x, ownerturf.y, ownerturf.z, 0, 0) - punch_laser.initialize_trajectory(32*6, angle_to_source) // 32 pixels per tile, 6 tiles away - punch_laser.increment(1) - var/turf/displayloc = punch_laser.return_turf() // get_turf_in_angle(angle_to_source, ownerturf, 6) - if(SSchat.debug_chud) - var/angle_it_probably_shoud_be = get_dir(owner, displayloc) - var/actually_angle = dir2angle(angle_it_probably_shoud_be) - message_admins("Post-Nut Angle from [owner] to [displayloc] is [angle_to_source]. The dir from owner to target is [angle_it_probably_shoud_be], with an angle of [actually_angle]. Suck me off.") - new /obj/effect/temp_visual/monkeyify(displayloc) - if(!displayloc) - displayloc = ownerturf // whatevs - message_loc = displayloc - if(SSchat.debug_chud) - ownerturf.Beam(displayloc, icon_state = "g_beam", time = 3 SECONDS) + var/turf/targetturf = get_turf(message_loc) + var/westest = max(ownerturf.x - 9, 1) + var/eastest = min(ownerturf.x + 9, world.maxx) + var/northest = max(ownerturf.y - 9, 1) + var/southest = min(ownerturf.y + 9, world.maxy) + var/list/turfe = getline(targetturf, ownerturf) + var/turf/where = null + for(var/turf/check in turfe) + if(SSchat.debug_chud) + new /obj/effect/temp_visual/monkeyify(check) + if(!TURF_IN_RECTANGLE(check, westest, northest, eastest, southest)) + continue + if(!(check in view(10, ownerturf))) + continue + message_loc = check + where = check + if(SSchat.debug_chud) + new /obj/effect/temp_visual/love_heart(message_loc) + break + if(!where) + message_loc = ownerturf // whatevs if(!owned_by) return if (owned_by.seen_messages) var/idx = 1 var/combined_height = approx_lines - for(var/msg in owned_by.seen_messages[remembered_location]) + for(var/msg in owned_by.seen_messages[message_loc]) var/datum/chatmessage/m = msg if(m.message) animate(m.message, pixel_y = m.message.pixel_y + mheight, time = CHAT_MESSAGE_SPAWN_TIME) @@ -205,9 +190,15 @@ GLOBAL_LIST_INIT(verbal_punch_lasers, list(null,null,null,null,null,null,null,nu m.scheduled_destruction = world.time + remaining_time addtimer(CALLBACK(m,PROC_REF(end_of_life)), remaining_time, TIMER_UNIQUE|TIMER_OVERRIDE) + if(SSchat.debug_chud) + var/turf/ownerturf = get_turf(owner) + var/turf/targetturf = get_turf(message_loc) + ownerturf.Beam(targetturf, icon_state = "g_beam", time = 3 SECONDS) + ownerturf.Beam(get_turf(target), icon_state = "1-full", time = 3 SECONDS) + // Build message image message = image(loc = message_loc, layer = CHAT_LAYER) - message.plane = CHAT_PLANE + message.plane = SSchat.chat_display_plane message.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA | KEEP_APART message.alpha = 0 var/hight = (alt_display || offscreen) ? 0 : owner.bound_height @@ -219,14 +210,14 @@ GLOBAL_LIST_INIT(verbal_punch_lasers, list(null,null,null,null,null,null,null,nu message.maptext = complete_text var/alphatomakeit = 255 if(eavesdrop) - message.alpha /= 2 + message.pixel_x = rand(-16, 16) + message.pixel_y = rand(-16, 16) + alphatomakeit /= 2 if(offscreen) - message.alpha /= 2 - // message.pixel_x = rand(-40, 40) - // message.pixel_y = rand(-40, 40) + alphatomakeit /= 2 // View the message - LAZYADDASSOC(owned_by.seen_messages, remembered_location, src) + LAZYADDASSOC(owned_by.seen_messages, message_loc, src) owned_by.images |= message animate(message, alpha = alphatomakeit, time = CHAT_MESSAGE_SPAWN_TIME) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 94dbedda09..6e96d24dcf 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -141,11 +141,13 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) INVOKE_ASYNC(src, PROC_REF(slam_dunk_to_main_menu)) /mob/dead/observer/proc/slam_dunk_to_main_menu() - if(check_rights(R_ADMIN, FALSE)) - return - if(ckey) + if(IsAdminGhost(src, TRUE)) + return TRUE + if(client) + if(check_rights_for(client, R_ADMIN)) + return TRUE abandon_mob() - return + return TRUE sleep(0.5 SECONDS) INVOKE_ASYNC(src, PROC_REF(slam_dunk_to_main_menu)) @@ -432,11 +434,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp destination = get_step(destination, WEST) abstract_move(destination)//Get out of closets and such as a ghost - if(check_rights(R_ADMIN, FALSE)) - return - if(ckey) - abandon_mob() - return + slam_dunk_to_main_menu() /mob/dead/observer/verb/reenter_corpse() set category = "Ghost" diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index adfa08076c..6c842362e4 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -199,6 +199,13 @@ // Create map text prior to modifying message for goonchat if (client?.prefs?.chat_on_map && stat != UNCONSCIOUS && (client.prefs.see_chat_non_mob || ismob(speaker)) && can_hear()) data["message_mode"] = message_mode + // make a second one, for in case we go from not seeing them to seeing them + if(data["is_eaves"] || data["is_far"] || data["display_turf"]) + var/list/cooldata = data + data["is_eaves"] = FALSE + data["is_far"] = FALSE + data["display_turf"] = null + create_chat_message(speaker, message_language, raw_message, spans, NONE, cooldata) create_chat_message(speaker, message_language, raw_message, spans, NONE, data) if(just_chat) @@ -253,8 +260,9 @@ var/list/listening = get_hearers_in_view(message_range, src, TRUE) var/datum/chatchud/CC = get_listening(src, message_range, max_range, quietness) var/list/visible_close = CC.visible_close.Copy() - var/list/visible_far = CC.visible_far.Copy() - var/list/hidden_close_pathable = CC.hidden_close_pathable.Copy() + // var/list/visible_far = CC.visible_far.Copy() + var/list/hidden_pathable = CC.hidden_pathable.Copy() + // var/list/hidden_inaccessible = CC.hidden_inaccessible.Copy() CC.putback() @@ -298,23 +306,32 @@ for(var/mob/mvc in visible_close) mvc.Hear(rendered, src, message_language, message, null, spans, message_mode, source, just_chat) sblistening |= mvc.client - for(var/mob/mvf in visible_far) - var/list/coolspans = spans - coolspans += SPAN_SMALL - var/list/data = list() - data["is_eaves"] = TRUE - data["is_far"] = TRUE - mvf.Hear(eavesrendered, src, message_language, eavesdropping, null, coolspans, message_mode, source, just_chat, data) - sblistening |= mvf.client - for(var/mob/mhp in hidden_close_pathable) - var/turf/hearfrom = hidden_close_pathable[mhp] + // for(var/mob/mvf in visible_far) + // var/list/coolspans = spans + // coolspans += SPAN_SMALL + // var/list/data = list() + // data["is_eaves"] = TRUE + // data["display_turf"] = src + // mvf.Hear(eavesrendered, src, message_language, eavesdropping, null, coolspans, message_mode, source, just_chat, data) + // sblistening |= mvf.client + for(var/mob/mhp in hidden_pathable) + var/turf/hearfrom = hidden_pathable[mhp] var/list/cooler_spans = spans - cooler_spans += SPAN_SMALLER + cooler_spans += SPAN_SMALL var/list/data = list() data["is_eaves"] = TRUE data["display_turf"] = hearfrom mhp.Hear(eavesrendered, src, message_language, eavesdropping, null, cooler_spans, message_mode, source, just_chat, data) sblistening |= mhp.client + // for(var/mob/mhp in hidden_inaccessible) + // var/turf/hearfrom = hidden_inaccessible[mhp] + // var/list/cooler_spans = spans + // cooler_spans += SPAN_SMALLER + // var/list/data = list() + // data["is_eaves"] = TRUE + // data["is_far"] = TRUE + // mhp.Hear(eavesrendered, src, message_language, eavesdropping, null, cooler_spans, message_mode, source, just_chat, data) + // sblistening |= mhp.client SEND_GLOBAL_SIGNAL(COMSIG_GLOB_LIVING_SAY_SPECIAL, src, message) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index beb76bd199..470f16465c 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -48,7 +48,7 @@ if(!isliving(mob)) return mob.Move(n, direction) if(mob.stat == DEAD) - mob.ghostize() + // mob.ghostize() return FALSE if(mob.force_moving) return FALSE