From 8ae85cdcb2ec17141f0934b9881d18faf6d8a869 Mon Sep 17 00:00:00 2001 From: Tk420634 Date: Fri, 22 Nov 2024 12:30:03 -0600 Subject: [PATCH] Just some touch up updates. --- _maps/map_files/coyote_bayou/foxybar.dmm | 182 +++++++++--------- _maps/map_files/coyote_bayou/foxybarupper.dmm | 100 ++++++++-- code/game/objects/grope_kiss.dm | 1 + code/modules/client/preferences.dm | 20 +- 4 files changed, 180 insertions(+), 123 deletions(-) diff --git a/_maps/map_files/coyote_bayou/foxybar.dmm b/_maps/map_files/coyote_bayou/foxybar.dmm index 16360cf113..6a1b0e4d4c 100644 --- a/_maps/map_files/coyote_bayou/foxybar.dmm +++ b/_maps/map_files/coyote_bayou/foxybar.dmm @@ -491,6 +491,23 @@ name = "dirty floor" }, /area/f13/fb/bar) +"cDo" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/obj/effect/overlay/fog/fog2{ + plane = -2; + alpha = 175 + }, +/turf/open/floor/wood_fancy{ + color = "#779999" + }, +/area/f13/fb/bar) "cFj" = ( /obj/effect/decal/cleanable/glitter/white{ color = "#884444" @@ -645,14 +662,6 @@ }, /turf/open/floor/circuit/telecomms/mainframe, /area/f13/wasteland/city/newboston/outdoors) -"dzm" = ( -/obj/machinery/icecream_vat, -/turf/open/floor/f13{ - color = "#ffe9de"; - icon_state = "darkrusty"; - name = "dirty floor" - }, -/area/f13/fb/bar) "dAC" = ( /obj/structure/chair/stool, /obj/effect/overlay/fog/fog2{ @@ -1655,25 +1664,29 @@ /area/f13/wasteland/city/newboston/outdoors) "hBy" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1; + dir = 4; color = "#3B2B1A" }, -/obj/effect/turf_decal/siding/wood{ +/obj/effect/turf_decal/siding/wood/corner{ dir = 4; color = "#3B2B1A" }, -/obj/effect/overlay/fog/fog2{ - plane = -2; - alpha = 175 +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8; + color = "#3B2B1A" }, /obj/effect/turf_decal/siding/wood/corner{ - dir = 4; + dir = 1; color = "#3B2B1A" }, /obj/effect/turf_decal/siding/wood/corner{ - dir = 8; + dir = 2; color = "#3B2B1A" }, +/obj/effect/overlay/fog/fog2{ + plane = -2; + alpha = 175 + }, /turf/open/floor/wood_fancy{ color = "#779999" }, @@ -1834,9 +1847,9 @@ plane = -2 }, /turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaloutermain0" + icon_state = "horizontalbottomborderbottom0" }, -/area/f13/fb/bar) +/area/f13/wasteland/city/newboston/outdoors) "iDj" = ( /obj/machinery/telecomms/server/presets/legion, /turf/open/floor/circuit/telecomms/mainframe, @@ -1904,6 +1917,36 @@ }, /turf/open/floor/carpet/royalblack, /area/f13/fb/bar) +"jmf" = ( +/obj/effect/overlay/fog/fog2{ + plane = -2; + alpha = 175 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/obj/hilbertshotel, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1; + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4; + color = "#3B2B1A" + }, +/turf/open/floor/wood_fancy{ + color = "#779999" + }, +/area/f13/fb/bar) "jnG" = ( /obj/item/mop, /obj/item/broom, @@ -1966,7 +2009,8 @@ "jUQ" = ( /obj/hilbertshotel, /obj/effect/overlay/fog/fog2{ - plane = -2 + plane = -2; + alpha = 175 }, /turf/open/indestructible/ground/outside/road{ color = "#999999" @@ -2278,14 +2322,6 @@ }, /turf/open/floor/plasteel/freezer, /area/f13/fb/bar) -"lvh" = ( -/obj/machinery/processor, -/turf/open/floor/f13{ - color = "#ffe9de"; - icon_state = "darkrusty"; - name = "dirty floor" - }, -/area/f13/fb/bar) "lyo" = ( /obj/effect/turf_decal/siding/wood{ dir = 8; @@ -2492,7 +2528,7 @@ /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop0" }, -/area/f13/fb/bar) +/area/f13/wasteland/city/newboston/outdoors) "mRP" = ( /obj/effect/overlay/fog/fog2{ plane = -2; @@ -2573,9 +2609,9 @@ plane = -2 }, /turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaloutermain0" + icon_state = "horizontalbottomborderbottom0" }, -/area/f13/fb/bar) +/area/f13/wasteland/city/newboston/outdoors) "nsz" = ( /obj/machinery/telecomms/server/presets/service, /turf/open/floor/circuit/telecomms/mainframe, @@ -2615,17 +2651,6 @@ }, /turf/open/floor/carpet/purple, /area/f13/fb/bar) -"nPu" = ( -/obj/structure/chair/bench{ - pixel_y = 12 - }, -/obj/effect/overlay/fog/fog2{ - plane = -2 - }, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontalbottomborderbottom2" - }, -/area/f13/wasteland/city/newboston/outdoors) "nVa" = ( /obj/machinery/telecomms/server/presets/town, /turf/open/floor/circuit/telecomms/mainframe, @@ -2912,16 +2937,10 @@ }, /area/f13/wasteland/city/newboston/outdoors) "pMf" = ( -/obj/machinery/microwave/stove, -/obj/machinery/light/small{ - light_color = "#884444"; - dir = 4 - }, -/turf/open/floor/f13{ - color = "#ffe9de"; - icon_state = "darkrusty"; - name = "dirty floor" +/obj/effect/overlay/fog/fog2{ + plane = -2 }, +/turf/closed/indestructible/f13/matrix, /area/f13/fb/bar) "pNr" = ( /obj/item/storage/box/dice, @@ -3188,9 +3207,9 @@ plane = -2 }, /turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaloutermain0" + icon_state = "horizontalbottomborderbottom0" }, -/area/f13/fb/bar) +/area/f13/wasteland/city/newboston/outdoors) "roB" = ( /obj/machinery/telecomms/hub/preset, /turf/open/floor/circuit/telecomms/mainframe, @@ -3312,14 +3331,6 @@ }, /turf/open/floor/carpet/purple, /area/f13/fb/bar) -"seA" = ( -/obj/machinery/food_cart, -/turf/open/floor/f13{ - color = "#ffe9de"; - icon_state = "darkrusty"; - name = "dirty floor" - }, -/area/f13/fb/bar) "srN" = ( /obj/structure/sign/poster/contraband/pinup_funk{ pixel_y = 32 @@ -3519,7 +3530,7 @@ /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "outerbordercorner - W" }, -/area/f13/fb/bar) +/area/f13/wasteland/city/newboston/outdoors) "tPi" = ( /obj/effect/turf_decal/siding/wood{ dir = 4; @@ -3598,23 +3609,6 @@ }, /turf/open/floor/plasteel/freezer, /area/f13/fb/bar) -"uwy" = ( -/obj/effect/decal/cleanable/glitter/blue{ - color = "#993311"; - layer = 3 - }, -/obj/effect/overlay/fog/fog2{ - plane = -2; - alpha = 175 - }, -/obj/effect/overlay/fog/fog2{ - plane = -2; - alpha = 175 - }, -/turf/open/floor/wood_fancy{ - color = "#779999" - }, -/area/f13/fb/bar) "uOS" = ( /obj/effect/turf_decal/siding/wood{ dir = 4; @@ -6336,11 +6330,11 @@ xNF xNF xNF xNF -xNF -xNF bPG +pMf +jmf hBy -bAd +cDo bAd cYv cYv @@ -6453,8 +6447,8 @@ xNF xNF xNF xNF -xNF -xNF +bPG +bPG bPG bPG bPG @@ -6462,7 +6456,7 @@ bPG bPG bPG thm -uwy +iku nuu goB goB @@ -7414,7 +7408,7 @@ okV bNh lel maZ -nPu +usf hAy tkO eYY @@ -7531,8 +7525,8 @@ cIc cIc san kke -kke -kke +mdh +mLV gzw xYP xYP @@ -7865,8 +7859,8 @@ bhg llj hov bPG -dzm -vJz +bPG +bPG vJz vJz vJz @@ -7982,8 +7976,8 @@ fxb pNr lel bPG -seA -vJz +bPG +bPG qlV vJz vJz @@ -8099,8 +8093,8 @@ gGC ghq tPi bPG -lvh -pMf +bPG +bPG fzg ryu cxG @@ -8233,8 +8227,8 @@ bPG bPG bPG bPG -bPG -bPG +sbi +sbi sbi sbi sbi diff --git a/_maps/map_files/coyote_bayou/foxybarupper.dmm b/_maps/map_files/coyote_bayou/foxybarupper.dmm index e613805513..7a460bdf6b 100644 --- a/_maps/map_files/coyote_bayou/foxybarupper.dmm +++ b/_maps/map_files/coyote_bayou/foxybarupper.dmm @@ -1527,6 +1527,21 @@ }, /turf/open/floor/wood_common, /area/f13/fb/bar) +"ou" = ( +/obj/machinery/light/small{ + color = "#444499"; + dir = 8; + light_color = "#444499"; + light_power = 2; + light_range = 2; + pixel_y = 0 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/turf/open/floor/carpet/black, +/area/f13/fb/bar) "oA" = ( /obj/structure/chair/stool/retro/backed{ dir = 8 @@ -2503,6 +2518,20 @@ }, /turf/closed/wall/mineral/brick, /area/f13/fb/bar) +"xu" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/obj/machinery/light/small{ + light_power = 2; + light_range = 2; + light_color = "#E1D5D5"; + color = "#33FF33"; + dir = 1 + }, +/turf/open/floor/carpet/black, +/area/f13/fb/bar) "xv" = ( /obj/structure/simple_door/room{ name = "changing rooms" @@ -2677,6 +2706,9 @@ plane = -2; pixel_y = 32 }, +/obj/structure/sign/poster/contraband/eat{ + pixel_y = 33 + }, /turf/open/floor/wood_common{ color = "#99BBBB" }, @@ -2702,6 +2734,14 @@ density = 0 }, /obj/effect/sound_emitter/foxybar/machinery, +/obj/machinery/light/small{ + light_power = 2; + light_range = 2; + light_color = "#E1D5D5"; + color = "#33FF33"; + dir = 1; + plane = -6 + }, /turf/open/floor/carpet/black, /area/f13/fb/bar) "yE" = ( @@ -2761,6 +2801,10 @@ light_range = 2; pixel_y = 13 }, +/obj/structure/curtain{ + color = "#c40e0e"; + open = 0 + }, /turf/open/floor/wood_common{ color = "#779999" }, @@ -3518,6 +3562,20 @@ color = "#666666" }, /area/f13/fb/bar) +"Hu" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/structure/chair/bench, +/obj/machinery/light/small{ + color = "#FF3333"; + light_color = "#FF3333"; + light_power = 2; + light_range = 2; + pixel_y = 0 + }, +/turf/open/floor/carpet/black, +/area/f13/fb/bar) "HH" = ( /obj/machinery/photocopier, /obj/machinery/light{ @@ -3796,6 +3854,10 @@ light_range = 2; pixel_y = 13 }, +/obj/structure/curtain{ + color = "#c40e0e"; + open = 0 + }, /turf/open/floor/wood_common{ color = "#779999" }, @@ -4924,19 +4986,21 @@ /turf/open/floor/plasteel/freezer, /area/f13/fb/bar) "VT" = ( -/obj/effect/overlay/fog/fog2{ - plane = -2; - pixel_y = 32 - }, -/obj/structure/sign/poster/contraband/eat{ - pixel_y = 33 +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" }, -/obj/effect/overlay/fog/fog2{ - plane = -2 +/obj/machinery/computer/arcade{ + density = 0; + dir = 1 }, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/machinery/light/small{ + color = "#FF3333"; + light_color = "#FF3333"; + light_power = 2; + light_range = 2; + pixel_y = 0 }, +/turf/open/floor/carpet/black, /area/f13/fb/bar) "Wa" = ( /obj/effect/turf_decal/siding/wood{ @@ -6872,7 +6936,7 @@ kk Iu il Gv -Ll +ou Pc Fv il @@ -6991,7 +7055,7 @@ il yx zr Xy -NB +VT il DS kf @@ -7232,9 +7296,9 @@ YQ YQ kf vU -ln +vv il -VT +be XR UD wB @@ -7349,7 +7413,7 @@ pj Oq Oq MX -cs +ln il xS UK @@ -7456,17 +7520,17 @@ il VN uu il -nX +xu zr zr -UB +Hu il wM vU vv vv -vv Ex +cs il lB XR diff --git a/code/game/objects/grope_kiss.dm b/code/game/objects/grope_kiss.dm index fea0ade3b0..9ac27b1db5 100644 --- a/code/game/objects/grope_kiss.dm +++ b/code/game/objects/grope_kiss.dm @@ -289,6 +289,7 @@ GLOBAL_LIST_EMPTY(shotglass_gropers) "grabbing", // Dan continues [grabbing] (the back of my neck) "grabbed", // Dan [grabbed] (the back of Tia's neck) ) + var/list/mouth_back_action_harm = list( "squish", //I squish the back of Tia's neck "squishes", //Dan grabs the back of my neck diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index ebc1ec1316..fe62748af5 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1085,15 +1085,15 @@ GLOBAL_LIST_EMPTY(preferences_datums) else dat += "[TextPreview(features["ooc_notes"])]...
" - dat += "Set Background Info Notes
" - var/background_info_notes_len = length(features["background_info_notes"]) - if(background_info_notes_len <= 40) - if(!background_info_notes_len) - dat += "\[...\]
" - else - dat += "[features["background_info_notes"]]
" - else - dat += "[TextPreview(features["background_info_notes"])]...
" + // dat += "Set Background Info Notes
" + // var/background_info_notes_len = length(features["background_info_notes"]) + // if(background_info_notes_len <= 40) + // if(!background_info_notes_len) + // dat += "\[...\]
" + // else + // dat += "[features["background_info_notes"]]
" + // else + // dat += "[TextPreview(features["background_info_notes"])]...
" //outside link stuff dat += "

Outer hyper-links settings

" @@ -1116,8 +1116,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += APPEARANCE_CATEGORY_COLUMN dat += "

Voice

" - dat += "Custom Tongue:
" - dat += "[custom_tongue]
" // Coyote ADD: Blurbleblurhs dat += "Voice Sound:[features_speech["typing_indicator_sound"]]
"