From f64315f1a893d69441dd49f4a5aefac356e22bd8 Mon Sep 17 00:00:00 2001 From: Tk420634 Date: Wed, 10 Jul 2024 14:27:27 -0500 Subject: [PATCH] mo shit --- _maps/map_files/coyote_bayou/foxybar.dmm | 4008 +++++++++-------- _maps/map_files/coyote_bayou/foxybarupper.dmm | 667 +-- code/__DEFINES/mobs.dm | 10 +- code/__DEFINES/traits.dm | 2 + code/_onclick/hud/_defines.dm | 44 +- code/_onclick/hud/hud.dm | 16 +- code/_onclick/hud/human.dm | 4 + .../hud/screen_objects/character_actions.dm | 54 + code/controllers/subsystem/artifacts.dm | 2 +- code/controllers/subsystem/pornhud.dm | 54 +- .../effects/decals/turfdecal/markings.dm | 1 + code/game/sound.dm | 4 +- code/modules/arousal/organs/penis.dm | 2 +- code/modules/client/preferences.dm | 2 +- code/modules/fallout/turf/walls.dm | 1 - .../modules/mob/dead/new_player/new_player.dm | 2 +- code/modules/mob/dead/observer/observer.dm | 17 +- code/modules/mob/living/carbon/carbon.dm | 2 +- code/modules/mob/living/carbon/emote.dm | 20 + .../mob/living/carbon/human/examine.dm | 9 + .../mob/living/carbon/human/species.dm | 26 +- code/modules/mob/mob_helpers.dm | 33 + .../chemistry/reagents/medicine_reagents.dm | 2 + icons/mob/hud.dmi | Bin 18659 -> 18672 bytes icons/mob/screen_gen.dmi | Bin 134169 -> 134797 bytes 25 files changed, 2691 insertions(+), 2291 deletions(-) diff --git a/_maps/map_files/coyote_bayou/foxybar.dmm b/_maps/map_files/coyote_bayou/foxybar.dmm index 548a058fdb5..6a8b6a1e45a 100644 --- a/_maps/map_files/coyote_bayou/foxybar.dmm +++ b/_maps/map_files/coyote_bayou/foxybar.dmm @@ -1,18 +1,9 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "abA" = ( -/obj/structure/railing{ - color = "#A47449"; - layer = 4; - pixel_y = -2 - }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "smokey fog"; - mouse_opacity = 0; - layer = 2.9 +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" }, -/obj/structure/chair/stool/retro/tan, /obj/effect/turf_decal/siding/wood{ dir = 1; color = "#3B2B1A" @@ -37,12 +28,6 @@ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) -"ach" = ( -/obj/machinery/telecomms/server/presets/ncr, -/turf/open/floor/plasteel/f13{ - icon_state = "darkrustysolid" - }, -/area/f13/wasteland/city/newboston/outdoors) "adh" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -80,8 +65,19 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/f13/wasteland/city/newboston/bar) "aff" = ( -/obj/machinery/telecomms/server/presets/security, -/turf/open/floor/circuit/telecomms/mainframe, +/obj/machinery/telecomms/server/presets/ranger, +/turf/open/floor/plasteel/f13{ + icon_state = "darkrustysolid" + }, +/area/f13/wasteland/city/newboston/outdoors) +"afL" = ( +/obj/structure/flora/rock/pile/largejungle, +/obj/structure/flora/rock/pile/largejungle{ + icon_state = "bush3"; + pixel_y = -6; + layer = 3.0 + }, +/turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland/city/newboston/outdoors) "agk" = ( /obj/effect/decal/cleanable/glitter/blue{ @@ -121,22 +117,46 @@ }, /area/f13/wasteland/city/newboston/bar) "ahF" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "smokey fog"; + mouse_opacity = 0; + layer = 2.9 }, /obj/effect/turf_decal/siding/wood{ dir = 1; color = "#3B2B1A" }, -/turf/open/floor/carpet/purple, +/turf/open/floor/wood_worn, /area/f13/wasteland/city/newboston/bar) "akT" = ( /obj/effect/landmark/latejoin, +/obj/machinery/light/small{ + dir = 1; + light_color = "red"; + pixel_y = 22 + }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom0" }, /area/f13/wasteland/city/newboston/outdoors) +"aoR" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/turf/open/floor/wood_worn, +/area/f13/wasteland/city/newboston/bar) +"apF" = ( +/obj/effect/turf_decal/stripes/asteroid/corner{ + dir = 8 + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) "avK" = ( /obj/structure/curtain{ color = "#c40e0e" @@ -149,6 +169,24 @@ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) +"awD" = ( +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "smokey fog"; + mouse_opacity = 0; + layer = 2.9 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/turf/open/floor/wood_worn, +/area/f13/wasteland/city/newboston/bar) "ays" = ( /obj/structure/chair/sofa/corp/right{ dir = 4; @@ -162,9 +200,20 @@ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) -"aBY" = ( -/turf/open/floor/circuit/telecomms/mainframe, +"azu" = ( +/obj/effect/landmark/start/f13/barkeep, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom2left" + }, /area/f13/wasteland/city/newboston/outdoors) +"aBY" = ( +/obj/structure/sign/poster/contraband/pinup_couch{ + pixel_y = 32 + }, +/turf/open/floor/wood_common{ + color = "#779999" + }, +/area/f13/wasteland/city/newboston/bar) "aEB" = ( /obj/machinery/light/small{ color = "#444499"; @@ -187,47 +236,63 @@ color = "#99BBBB" }, /area/f13/wasteland/city/newboston/bar) +"aFk" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 4 + }, +/obj/machinery/telecomms/broadcaster/preset_right, +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) +"aJA" = ( +/obj/structure/curtain{ + color = "#c40e0e" + }, +/obj/effect/fake_stairs/west{ + color = "#845f58" + }, +/turf/open/floor/wood_common{ + color = "#779999" + }, +/area/f13/wasteland/city/newboston/bar) "aLE" = ( /obj/effect/decal/cleanable/glitter/white{ color = "#884444" }, /turf/open/floor/carpet/royalblack, /area/f13/wasteland/city/newboston/bar) -"aLO" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 9 - }, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) -"aQA" = ( +"aTn" = ( /obj/effect/turf_decal/siding/wood{ dir = 4; color = "#3B2B1A" }, /obj/effect/turf_decal/siding/wood{ + dir = 1; color = "#3B2B1A" }, -/turf/open/floor/wood_worn, +/turf/open/floor/wood_common{ + color = "#99BBBB" + }, +/area/f13/wasteland/city/newboston/bar) +"aZA" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/turf/open/floor/wood_common{ + color = "#99BBBB" + }, /area/f13/wasteland/city/newboston/bar) -"aTZ" = ( +"bbJ" = ( /obj/effect/turf_decal/stripes/asteroid/line{ - dir = 4 + dir = 8 }, -/obj/machinery/telecomms/receiver/preset_right, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) -"aUs" = ( -/obj/machinery/telecomms/server/presets/den, /turf/open/floor/plasteel/f13{ icon_state = "darkrustysolid" }, /area/f13/wasteland/city/newboston/outdoors) -"bad" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/turf/open/floor/carpet/royalblack, -/area/f13/wasteland/city/newboston/bar) "bcw" = ( /obj/structure/simple_door/room{ name = "storage" @@ -241,6 +306,12 @@ name = "dirty floor" }, /area/f13/wasteland/city/newboston/bar) +"bfR" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/grass{ + color = "#777777" + }, +/area/f13/wasteland/city/newboston/outdoors) "bgG" = ( /obj/structure/table/abductor, /turf/open/floor/wood_common{ @@ -253,14 +324,6 @@ icon_state = "horizontaltopbordertop2" }, /area/f13/wasteland/city/newboston/outdoors) -"bnr" = ( -/obj/machinery/light/floor{ - light_color = "#883388"; - pixel_x = 26; - pixel_y = -7 - }, -/turf/open/floor/wood_worn, -/area/f13/wasteland/city/newboston/bar) "bpA" = ( /obj/effect/decal/cleanable/glitter/white{ color = "#884444" @@ -268,66 +331,30 @@ /obj/structure/table/abductor, /turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/bar) -"bte" = ( -/obj/structure/flora/ausbushes/grassybush, -/turf/open/indestructible/ground/outside/water, -/area/f13/wasteland/city/newboston/outdoors) "btj" = ( /obj/effect/decal/cleanable/glitter/pink, /obj/structure/table/abductor, /turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/bar) "bxY" = ( -/obj/structure/railing/corner{ - dir = 4; - color = "#A47449"; - pixel_y = 8 - }, -/obj/structure/curtain{ - color = "#c40e0e"; - open = 0 - }, -/obj/effect/decal/cleanable/glitter/pink, -/obj/structure/table/abductor, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "smokey fog"; - mouse_opacity = 0; - layer = 2.9; - opacity = 1 +/obj/effect/turf_decal/weather/dirt{ + dir = 8 }, -/turf/open/floor/carpet/purple, -/area/f13/wasteland/city/newboston/bar) +/turf/open/indestructible/ground/outside/water, +/area/f13/wasteland/city/newboston/outdoors) "bzc" = ( -/obj/structure/closet/cabinet/anchored, -/obj/item/clothing/under/f13/mprostitute, -/obj/item/clothing/under/f13/fprostitute, -/obj/item/clothing/under/f13/erpdress, -/obj/item/clothing/under/dress/corset, -/obj/item/clothing/under/misc/stripper, -/obj/item/clothing/under/misc/stripper/green, -/obj/item/clothing/under/misc/stripper/mankini, -/obj/item/clothing/under/maid, -/obj/item/clothing/under/janimaid, -/obj/item/clothing/head/maid, -/obj/item/clothing/accessory/maidapron, -/obj/item/clothing/suit/armor/outfit/overalls/sexymaid, -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 5 }, -/turf/open/floor/carpet/orange, -/area/f13/wasteland/city/newboston/bar) +/obj/machinery/telecomms/bus/preset_two, +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) "bAd" = ( /obj/structure/railing{ color = "#A47449"; dir = 1; pixel_y = 8 }, -/obj/machinery/light/floor{ - light_color = "#883388" - }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, @@ -337,37 +364,26 @@ }, /turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/bar) -"bAT" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/wasteland/city/newboston/bar) "bBZ" = ( /obj/effect/decal/marking, /turf/closed/indestructible/f13/matrix, /area/f13/wasteland/city/newboston/outdoors) -"bKi" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/turf/open/floor/wood_common{ - color = "#779999" +"bIX" = ( +/obj/machinery/autolathe, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, +/turf/open/floor/f13{ + color = "#ffe9de"; + icon_state = "darkrusty"; + name = "dirty floor" }, /area/f13/wasteland/city/newboston/bar) -"bLo" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 6 - }, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) "bNh" = ( /obj/structure/railing{ color = "#A47449"; @@ -383,11 +399,6 @@ icon_state = "horizontaltopbordertop2left" }, /area/f13/wasteland/city/newboston/outdoors) -"bRc" = ( -/turf/open/floor/plasteel/f13{ - icon_state = "darkrustysolid" - }, -/area/f13/wasteland/city/newboston/outdoors) "bUG" = ( /obj/structure/window/fulltile/wood{ layer = 3 @@ -397,30 +408,50 @@ }, /turf/open/floor/wood_common, /area/f13/wasteland/city/newboston/bar) +"bXW" = ( +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "smokey fog"; + mouse_opacity = 0; + layer = 2.9 + }, +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/turf/open/floor/wood_worn, +/area/f13/wasteland/city/newboston/bar) "cdu" = ( /obj/structure/table/abductor{ density = 0 }, /turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/bar) -"cgI" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/lamp_post/doubles/bent{ - dir = 4; - density = 0; - pixel_y = -14; - pixel_x = -42; - light_range = 16 +"cdA" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 }, -/obj/machinery/light{ - light_color = "#e8eaff"; - dir = 1; - pixel_y = 64; - pixel_x = 17; - plane = -6 +/obj/structure/flora/ausbushes/leafybush{ + pixel_x = 4; + alpha = 80; + mouse_opacity = 0 }, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontalbottomborderbottom0" +/turf/open/indestructible/ground/outside/water, +/area/f13/wasteland/city/newboston/outdoors) +"cgn" = ( +/obj/item/toy/tennis/blue{ + density = 1; + mouse_opacity = 0; + alpha = 0; + anchored = 1 + }, +/turf/open/indestructible/ground/outside/road{ + color = "#999999"; + icon_state = "horizontaltopborderbottom0" }, /area/f13/wasteland/city/newboston/outdoors) "cht" = ( @@ -429,11 +460,9 @@ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) -"ckd" = ( -/obj/machinery/telecomms/processor/preset_two, -/obj/machinery/light/floor, -/turf/open/floor/plasteel/f13{ - icon_state = "darkrustysolid" +"cnb" = ( +/turf/open/floor/grass{ + color = "#777777" }, /area/f13/wasteland/city/newboston/outdoors) "cuN" = ( @@ -442,26 +471,21 @@ }, /area/f13/wasteland/city/newboston/outdoors) "cvh" = ( -/obj/effect/decal/cleanable/glitter/white{ - color = "#884444" - }, -/obj/machinery/light/small{ - dir = 8; - pixel_y = 13; - light_color = "#884444"; - light_power = 2; - light_range = 2; - color = "#884444" +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "smokey fog"; + mouse_opacity = 0; + layer = 2.9 }, -/obj/structure/chair/sofa/corp/right{ - color = "#BED0FD"; - dir = 4 +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" }, /obj/effect/turf_decal/siding/wood{ - dir = 8; color = "#3B2B1A" }, -/turf/open/floor/carpet/purple, +/turf/open/floor/wood_worn, /area/f13/wasteland/city/newboston/bar) "cwC" = ( /obj/effect/landmark/start/f13/wastelander, @@ -478,10 +502,23 @@ /turf/open/floor/carpet/royalblack, /area/f13/wasteland/city/newboston/bar) "cAt" = ( +/obj/structure/chair/stool/retro/backed{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/turf/open/floor/carpet/royalblack, +/area/f13/wasteland/city/newboston/bar) +"cAY" = ( /obj/effect/turf_decal/siding/wood{ dir = 4; color = "#3B2B1A" }, +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, /turf/open/floor/wood_common{ color = "#779999" }, @@ -495,45 +532,54 @@ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) -"cLm" = ( -/obj/structure/sign/painting/library{ - pixel_x = -32 +"cQG" = ( +/obj/structure/dresser{ + pixel_x = -15; + density = 0 }, -/obj/item/kirbyplants/random, /obj/machinery/light/small{ - color = "#444499"; dir = 8; - light_color = "#444499"; + pixel_y = 13; + light_color = "#884444"; light_power = 2; light_range = 2; - pixel_y = 13 + color = "#884444" }, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" }, +/turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/bar) -"cQX" = ( -/obj/machinery/telecomms/server/presets/legion, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) -"cTO" = ( -/obj/machinery/telecomms/server/presets/engineering, -/turf/open/floor/circuit/telecomms/mainframe, +"cRl" = ( +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "smokey fog"; + mouse_opacity = 0; + layer = 2.9 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/turf/open/floor/wood_worn, +/area/f13/wasteland/city/newboston/bar) +"cWl" = ( +/obj/machinery/telecomms/server/presets/supply, +/turf/open/floor/plasteel/f13{ + icon_state = "darkrustysolid" + }, /area/f13/wasteland/city/newboston/outdoors) "dcH" = ( -/obj/effect/turf_decal/stripes/asteroid/corner{ - dir = 8 +/obj/structure/flora/chomp/thicket2{ + color = "#224422" }, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) -"dcM" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 8 +/turf/open/floor/grass{ + color = "#777777" }, -/obj/machinery/telecomms/receiver/preset_left, -/turf/open/floor/circuit/telecomms/mainframe, /area/f13/wasteland/city/newboston/outdoors) -"dkE" = ( +"ddh" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; icon_state = "smoke"; @@ -541,15 +587,21 @@ mouse_opacity = 0; layer = 2.9 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, /obj/effect/turf_decal/siding/wood{ dir = 1; color = "#3B2B1A" }, /turf/open/floor/wood_worn, /area/f13/wasteland/city/newboston/bar) -"dli" = ( -/obj/structure/nest/frog, -/turf/open/indestructible/ground/outside/water, +"dpG" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 9 + }, +/turf/open/floor/circuit/telecomms/mainframe, /area/f13/wasteland/city/newboston/outdoors) "dCS" = ( /obj/structure/spacevine{ @@ -568,77 +620,69 @@ icon_state = "horizontalbottomborderbottom2" }, /area/f13/wasteland/city/newboston/outdoors) -"dHN" = ( -/obj/effect/landmark/start/f13/barkeep, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontalbottomborderbottom2left" - }, -/area/f13/wasteland/city/newboston/outdoors) -"dIq" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 1 - }, -/obj/machinery/ntnet_relay, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) -"dJK" = ( -/obj/machinery/recycler, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "outerborder - E" +"dME" = ( +/obj/structure/chair/stool/retro/backed, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" }, -/area/f13/wasteland/city/newboston/outdoors) -"dJP" = ( +/turf/open/floor/carpet/royalblack, +/area/f13/wasteland/city/newboston/bar) +"dOV" = ( /obj/effect/turf_decal/siding/wood{ dir = 8; color = "#3B2B1A" }, /obj/effect/turf_decal/siding/wood{ + dir = 1; color = "#3B2B1A" }, /turf/open/floor/wood_common{ color = "#99BBBB" }, /area/f13/wasteland/city/newboston/bar) -"dME" = ( -/obj/structure/chair/stool/retro/backed, -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" +"dPZ" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 8 }, -/turf/open/floor/carpet/royalblack, -/area/f13/wasteland/city/newboston/bar) -"dOq" = ( -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "smokey fog"; - mouse_opacity = 0; - layer = 2.9 +/obj/machinery/telecomms/server/presets/bos, +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) +"dRv" = ( +/obj/structure/sign/painting/library{ + pixel_x = -32 }, -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" +/obj/structure/railing{ + color = "#A47449"; + layer = 4; + pixel_y = -2 }, +/obj/effect/decal/cleanable/glitter/pink, +/obj/structure/chair/stool/retro/tan, /obj/effect/turf_decal/siding/wood{ - dir = 8; + dir = 1; color = "#3B2B1A" }, -/turf/open/floor/wood_worn, +/turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/bar) +"dSz" = ( +/obj/effect/turf_decal/stripes/asteroid/line, +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) "dUG" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "verticalrightborderright3" }, /area/f13/wasteland/city/newboston/outdoors) "dXY" = ( -/obj/structure/sign/painting/library{ - pixel_x = -32 - }, /obj/structure/railing{ color = "#A47449"; dir = 1; pixel_y = 8 }, -/obj/effect/decal/cleanable/glitter/pink, +/obj/machinery/light/floor{ + light_color = "#883388" + }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, @@ -654,60 +698,39 @@ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) +"ecT" = ( +/obj/effect/landmark/start/f13/wastelander, +/turf/open/indestructible/ground/outside/sidewalk, +/area/f13/wasteland/city/newboston/outdoors) "edK" = ( -/obj/item/lipstick/random{ - pixel_y = 10; - pixel_x = 10 - }, -/obj/item/restraints/handcuffs/fake/kinky, -/obj/item/clothing/neck/petcollar{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/structure/table/wood/settler, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/turf/open/floor/carpet/purple, -/area/f13/wasteland/city/newboston/bar) -"eis" = ( -/obj/structure/railing/corner{ - color = "#A47449"; - pixel_y = -1 - }, -/obj/structure/curtain{ - color = "#c40e0e"; - open = 0 - }, -/obj/effect/decal/cleanable/glitter/pink, -/obj/structure/table/abductor, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "smokey fog"; - mouse_opacity = 0; - layer = 2.9; - opacity = 1 +/obj/machinery/telecomms/server/presets/responders, +/turf/open/floor/plasteel/f13{ + icon_state = "darkrustysolid" }, -/turf/open/floor/carpet/purple, -/area/f13/wasteland/city/newboston/bar) -"ekb" = ( -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "smokey fog"; - mouse_opacity = 0; - layer = 2.9 +/area/f13/wasteland/city/newboston/outdoors) +"efM" = ( +/obj/item/fishingrod, +/obj/structure/flora/rock/pile/largejungle, +/obj/structure/flora/grass/coyote/one, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 }, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" +/turf/open/indestructible/ground/inside/dirt, +/area/f13/wasteland/city/newboston/outdoors) +"eip" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/ausbushes/brflowers{ + light_color = "#008080"; + light_power = 3; + light_range = 2 }, -/turf/open/floor/wood_common{ - color = "#779999" +/turf/open/floor/grass{ + color = "#777777" }, -/area/f13/wasteland/city/newboston/bar) +/area/f13/wasteland/city/newboston/outdoors) +"eis" = ( +/turf/open/indestructible/ground/outside/water, +/area/f13/wasteland/city/newboston/outdoors) "ekg" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/lamp_post/doubles/bent{ @@ -728,44 +751,6 @@ icon_state = "outerbordercorner - E" }, /area/f13/wasteland/city/newboston/outdoors) -"eow" = ( -/obj/structure/chair/stool/retro/backed{ - dir = 4 - }, -/obj/machinery/light/floor{ - light_color = "#883388" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/turf/open/floor/carpet/royalblack, -/area/f13/wasteland/city/newboston/bar) -"eoG" = ( -/obj/effect/decal/cleanable/glitter/white{ - color = "#884444" - }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ - pixel_y = 17; - pixel_x = -8 - }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ - pixel_y = 4 - }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ - pixel_x = 8; - pixel_y = 12 - }, -/obj/structure/table/abductor, -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/turf/open/floor/carpet/royalblack, -/area/f13/wasteland/city/newboston/bar) "esa" = ( /obj/structure/chair/sofa/corp/left{ dir = 8; @@ -782,34 +767,11 @@ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) -"etF" = ( -/obj/machinery/telecomms/processor/preset_one, -/obj/machinery/light/floor, -/turf/open/floor/plasteel/f13{ - icon_state = "darkrustysolid" - }, -/area/f13/wasteland/city/newboston/outdoors) "ewn" = ( -/obj/structure/curtain{ - color = "#c40e0e"; - open = 0 - }, -/obj/effect/decal/cleanable/glitter/pink, -/obj/structure/table/abductor, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "smokey fog"; - mouse_opacity = 0; - layer = 2.9; - opacity = 1 - }, -/turf/open/floor/carpet/purple, -/area/f13/wasteland/city/newboston/bar) -"eyf" = ( -/obj/effect/turf_decal/stripes/asteroid/corner{ - dir = 1 +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 9 }, +/obj/machinery/telecomms/bus/preset_one, /turf/open/floor/circuit/telecomms/mainframe, /area/f13/wasteland/city/newboston/outdoors) "eAc" = ( @@ -838,6 +800,10 @@ icon_state = "horizontalbottomborderbottom2left" }, /area/f13/wasteland/city/newboston/outdoors) +"eEU" = ( +/obj/effect/turf_decal/stripes/asteroid/corner, +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) "eHQ" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -857,13 +823,12 @@ }, /area/f13/wasteland/city/newboston/outdoors) "eMT" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 4; - pixel_x = 2 +/obj/item/fishingrod, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 }, -/turf/open/floor/carpet/purple, -/area/f13/wasteland/city/newboston/bar) +/turf/open/indestructible/ground/inside/dirt, +/area/f13/wasteland/city/newboston/outdoors) "ePQ" = ( /obj/effect/decal/cleanable/glitter/blue{ color = "#444499" @@ -881,12 +846,6 @@ }, /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) -"eQA" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 10 - }, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) "eUg" = ( /obj/machinery/light/small{ color = "#444499"; @@ -910,6 +869,17 @@ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) +"eYJ" = ( +/obj/item/toy/tennis/blue{ + density = 1; + mouse_opacity = 0; + alpha = 0; + anchored = 1 + }, +/turf/open/indestructible/ground/outside/road{ + color = "#999999" + }, +/area/f13/wasteland/city/newboston/outdoors) "faD" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -951,20 +921,6 @@ icon_state = "verticalrightborderright2bottom" }, /area/f13/wasteland/city/newboston/outdoors) -"fio" = ( -/obj/effect/landmark/start/f13/wastelander/clubworker, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaltopbordertop2" - }, -/area/f13/wasteland/city/newboston/outdoors) -"fjp" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/wasteland/city/newboston/bar) "fmT" = ( /obj/machinery/vending/cigarette{ density = 0; @@ -974,16 +930,12 @@ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) -"fpY" = ( -/obj/item/toy/tennis/blue{ - density = 1; - mouse_opacity = 0; - alpha = 0; - anchored = 1 - }, -/turf/open/indestructible/ground/outside/road{ - color = "#999999" +"fvo" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 10 }, +/obj/machinery/telecomms/bus/preset_four, +/turf/open/floor/circuit/telecomms/mainframe, /area/f13/wasteland/city/newboston/outdoors) "fxb" = ( /obj/effect/landmark/latejoin, @@ -991,6 +943,40 @@ icon_state = "horizontaltopbordertop2right" }, /area/f13/wasteland/city/newboston/outdoors) +"fzg" = ( +/obj/structure/table/abductor, +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/turf/open/floor/carpet/royalblack, +/area/f13/wasteland/city/newboston/bar) +"fzC" = ( +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "smokey fog"; + mouse_opacity = 0; + layer = 2.9 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/turf/open/floor/wood_common{ + color = "#779999" + }, +/area/f13/wasteland/city/newboston/bar) +"fDb" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 8 + }, +/obj/machinery/telecomms/broadcaster/preset_left, +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) "fDO" = ( /obj/effect/landmark/latejoin, /turf/open/indestructible/ground/outside/sidewalk{ @@ -1009,14 +995,16 @@ name = "dirty floor" }, /area/f13/wasteland/city/newboston/bar) -"fMj" = ( -/obj/machinery/telecomms/server/presets/responders, -/turf/open/floor/plasteel/f13{ - icon_state = "darkrustysolid" +"fOk" = ( +/obj/structure/sign/poster/contraband/pinup_bed{ + pixel_y = 32 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom3" }, /area/f13/wasteland/city/newboston/outdoors) -"fOM" = ( -/obj/machinery/telecomms/hub/preset, +"fRv" = ( +/obj/machinery/telecomms/server/presets/science, /turf/open/floor/circuit/telecomms/mainframe, /area/f13/wasteland/city/newboston/outdoors) "fUR" = ( @@ -1035,6 +1023,26 @@ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) +"ggt" = ( +/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" + }, +/turf/open/floor/wood_common{ + color = "#99BBBB" + }, +/area/f13/wasteland/city/newboston/bar) "gkC" = ( /obj/structure/simple_door/room, /obj/item/lock_bolt{ @@ -1044,13 +1052,6 @@ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) -"gml" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/turf/closed/wall/mineral/brick, -/area/f13/wasteland/city/newboston/bar) "gmW" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -1066,18 +1067,17 @@ mouse_opacity = 0; layer = 2.9 }, +/obj/machinery/light/floor{ + light_color = "#444499"; + color = "#444499" + }, /turf/open/floor/wood_worn, /area/f13/wasteland/city/newboston/bar) "gnx" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 1; - pixel_y = 8 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" }, -/obj/structure/chair/stool/retro/tan, /obj/effect/turf_decal/siding/wood{ color = "#3B2B1A" }, @@ -1128,9 +1128,6 @@ layer = 4; pixel_y = -2 }, -/obj/machinery/light/floor{ - light_color = "#883388" - }, /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; icon_state = "smoke"; @@ -1152,61 +1149,35 @@ icon_state = "horizontaltopborderbottom0" }, /area/f13/wasteland/city/newboston/outdoors) -"gzx" = ( -/obj/structure/flora/ausbushes/reedbush{ - pixel_y = 7 - }, -/turf/open/indestructible/ground/outside/water, -/area/f13/wasteland/city/newboston/outdoors) -"gBv" = ( -/obj/structure/sign/painting/library{ - pixel_x = 32 - }, -/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/wood_common{ - color = "#779999" - }, -/area/f13/wasteland/city/newboston/bar) -"gDq" = ( -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "smokey fog"; - mouse_opacity = 0; - layer = 2.9 - }, -/obj/effect/landmark/start/f13/wastelander/clubworker, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaltopbordertop2left" - }, -/area/f13/wasteland/city/newboston/outdoors) "gGC" = ( /obj/effect/landmark/latejoin, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop0" }, /area/f13/wasteland/city/newboston/outdoors) -"gNj" = ( -/obj/structure/sign/painting/library{ - pixel_x = -32 +"gLq" = ( +/obj/machinery/telecomms/processor/preset_three, +/obj/machinery/light/floor, +/turf/open/floor/plasteel/f13{ + icon_state = "darkrustysolid" }, +/area/f13/wasteland/city/newboston/outdoors) +"gNj" = ( /obj/structure/railing{ color = "#A47449"; layer = 4; pixel_y = -2 }, -/obj/effect/decal/cleanable/glitter/pink, +/obj/machinery/light/floor{ + light_color = "#883388" + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "smokey fog"; + mouse_opacity = 0; + layer = 2.9 + }, /obj/structure/chair/stool/retro/tan, /obj/effect/turf_decal/siding/wood{ dir = 1; @@ -1214,32 +1185,19 @@ }, /turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/bar) -"gSq" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 6 - }, -/obj/machinery/telecomms/bus/preset_three, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) -"gTG" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 8 - }, -/obj/machinery/telecomms/server/presets/bos, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) -"gUn" = ( +"gOe" = ( /obj/effect/turf_decal/siding/wood{ - dir = 8; + dir = 1; color = "#3B2B1A" }, /turf/open/floor/wood_worn, /area/f13/wasteland/city/newboston/bar) -"gYu" = ( -/obj/machinery/light/floor, -/turf/open/floor/plasteel/f13{ - icon_state = "darkrustysolid" +"gVS" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 6 }, +/obj/machinery/telecomms/bus/preset_three, +/turf/open/floor/circuit/telecomms/mainframe, /area/f13/wasteland/city/newboston/outdoors) "gYw" = ( /obj/effect/turf_decal/siding/wood{ @@ -1253,17 +1211,36 @@ /turf/open/floor/carpet/royalblack, /area/f13/wasteland/city/newboston/bar) "hbT" = ( +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "smokey fog"; + mouse_opacity = 0; + layer = 2.9 + }, +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/turf/open/floor/wood_common{ + color = "#779999" + }, +/area/f13/wasteland/city/newboston/bar) +"hdN" = ( +/obj/structure/table/abductor, +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, +/obj/structure/sign/poster/contraband/robust_softdrinks{ + pixel_x = 32 + }, /obj/effect/turf_decal/siding/wood{ - dir = 1; color = "#3B2B1A" }, /obj/effect/turf_decal/siding/wood{ dir = 4; color = "#3B2B1A" }, -/turf/open/floor/wood_common{ - color = "#99BBBB" - }, +/turf/open/floor/carpet/royalblack, /area/f13/wasteland/city/newboston/bar) "hfS" = ( /obj/machinery/light{ @@ -1276,43 +1253,11 @@ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) -"hhr" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 8 - }, -/obj/machinery/telecomms/server/presets/enclave, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) "his" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "outerborder - N" }, /area/f13/wasteland/city/newboston/outdoors) -"hiO" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/turf/open/floor/wood_common{ - color = "#99BBBB" - }, -/area/f13/wasteland/city/newboston/bar) -"hiY" = ( -/obj/machinery/jukebox, -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/turf/open/floor/carpet/royalblack, -/area/f13/wasteland/city/newboston/bar) "hov" = ( /obj/machinery/light/sign/heaven{ pixel_y = 34 @@ -1336,6 +1281,27 @@ icon_state = "horizontaltopbordertop2left" }, /area/f13/wasteland/city/newboston/outdoors) +"hoG" = ( +/obj/structure/sign/poster/contraband/pinup_bed{ + pixel_x = -32 + }, +/obj/structure/piano/fancy, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/turf/open/floor/wood_common{ + color = "#779999" + }, +/area/f13/wasteland/city/newboston/bar) +"hqa" = ( +/obj/structure/nest/frog, +/turf/open/indestructible/ground/outside/water, +/area/f13/wasteland/city/newboston/outdoors) "hun" = ( /obj/machinery/light/small{ color = "#444499"; @@ -1357,10 +1323,14 @@ color = "#99BBBB" }, /area/f13/wasteland/city/newboston/bar) -"hvX" = ( -/obj/machinery/light/floor, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) +"hwv" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/turf/open/floor/wood_common{ + color = "#779999" + }, +/area/f13/wasteland/city/newboston/bar) "hAy" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop2left" @@ -1391,12 +1361,7 @@ name = "dirty floor" }, /area/f13/wasteland/city/newboston/bar) -"hJJ" = ( -/turf/open/indestructible/ground/outside/gravel{ - color = "#AAAAAA" - }, -/area/f13/wasteland/city/newboston/outdoors) -"hQS" = ( +"hEt" = ( /obj/structure/chair/sofa/corp/left{ color = "#BED0FD"; dir = 4 @@ -1407,6 +1372,53 @@ }, /turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/bar) +"hFw" = ( +/obj/machinery/telecomms/server/presets/den, +/turf/open/floor/plasteel/f13{ + icon_state = "darkrustysolid" + }, +/area/f13/wasteland/city/newboston/outdoors) +"hHE" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/turf/open/floor/wood_common{ + color = "#99BBBB" + }, +/area/f13/wasteland/city/newboston/bar) +"hJJ" = ( +/obj/structure/sink/greyscale{ + dir = 4; + pixel_y = 10; + pixel_x = 12 + }, +/obj/structure/table/abductor, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/obj/structure/sign/flag_texas{ + pixel_x = 32 + }, +/turf/open/floor/carpet/royalblack, +/area/f13/wasteland/city/newboston/bar) +"hQS" = ( +/obj/effect/decal/cleanable/glitter/white{ + color = "#884444" + }, +/obj/structure/railing{ + color = "#A47449"; + dir = 4; + pixel_y = 8; + pixel_x = 2 + }, +/turf/open/floor/carpet/purple, +/area/f13/wasteland/city/newboston/bar) "hRl" = ( /obj/structure/table/abductor, /turf/open/floor/carpet/royalblack, @@ -1419,6 +1431,26 @@ icon_state = "outerborder - E" }, /area/f13/wasteland/city/newboston/outdoors) +"ifs" = ( +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, +/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/wood_common{ + color = "#779999" + }, +/area/f13/wasteland/city/newboston/bar) "iku" = ( /obj/machinery/light/small{ color = "#444499"; @@ -1429,55 +1461,53 @@ }, /turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/bar) -"iub" = ( -/obj/machinery/door/unpowered/securedoor, -/turf/open/floor/wood_common{ - color = "#779999" +"inX" = ( +/obj/item/lipstick/random{ + pixel_y = 10; + pixel_x = 10 }, -/area/f13/wasteland/city/newboston/bar) -"iyo" = ( -/obj/structure/table/abductor, -/obj/structure/sign/painting/library{ - pixel_x = 32 +/obj/item/restraints/handcuffs/fake/kinky, +/obj/item/clothing/neck/petcollar{ + pixel_x = -6; + pixel_y = 8 }, +/obj/structure/table/wood/settler, /obj/effect/turf_decal/siding/wood{ - dir = 4; + dir = 8; color = "#3B2B1A" }, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/bar) -"iAY" = ( -/obj/machinery/telecomms/server/presets/ranger, -/turf/open/floor/plasteel/f13{ - icon_state = "darkrustysolid" +"isr" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 }, +/turf/open/indestructible/ground/outside/water, /area/f13/wasteland/city/newboston/outdoors) -"iEX" = ( -/obj/machinery/telecomms/server/presets/khans, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) -"iLI" = ( -/obj/effect/landmark/start/f13/wastelander/clubworker, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaltopbordertop2right" +"iub" = ( +/obj/machinery/door/unpowered/securedoor, +/turf/open/floor/wood_common{ + color = "#779999" + }, +/area/f13/wasteland/city/newboston/bar) +"iuL" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 5 }, +/turf/open/floor/circuit/telecomms/mainframe, /area/f13/wasteland/city/newboston/outdoors) -"iSv" = ( -/obj/machinery/telecomms/server/presets/common, +"iDj" = ( +/obj/machinery/telecomms/server/presets/legion, /turf/open/floor/circuit/telecomms/mainframe, /area/f13/wasteland/city/newboston/outdoors) -"iVQ" = ( -/obj/structure/table/abductor, -/turf/open/floor/carpet/purple, -/area/f13/wasteland/city/newboston/bar) -"iZM" = ( -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "smokey fog"; - mouse_opacity = 0; - layer = 2.9 +"iJV" = ( +/obj/machinery/telecomms/processor/preset_two, +/obj/machinery/light/floor, +/turf/open/floor/plasteel/f13{ + icon_state = "darkrustysolid" }, +/area/f13/wasteland/city/newboston/outdoors) +"iNU" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; icon_state = "smoke"; @@ -1486,23 +1516,17 @@ layer = 2.9 }, /obj/effect/turf_decal/siding/wood{ - dir = 4; + dir = 8; + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ color = "#3B2B1A" }, /turf/open/floor/wood_common{ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) -"jcm" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 1 - }, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) -"jfm" = ( -/obj/structure/sign/painting/library{ - pixel_x = -32 - }, +"iPP" = ( /obj/machinery/light/small{ color = "#444499"; dir = 8; @@ -1511,21 +1535,73 @@ light_range = 2; pixel_y = 13 }, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, /turf/open/floor/wood_common{ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) -"jfA" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" +"iVm" = ( +/obj/machinery/chem_dispenser/drinks/fullupgrade{ + dir = 8; + pixel_y = -1; + pixel_x = 14 }, +/obj/structure/table/abductor, /obj/effect/turf_decal/siding/wood{ dir = 4; color = "#3B2B1A" }, -/turf/open/floor/wood_common{ - color = "#99BBBB" - }, +/turf/open/floor/carpet/royalblack, +/area/f13/wasteland/city/newboston/bar) +"iVQ" = ( +/obj/structure/table/abductor, +/turf/open/floor/carpet/purple, +/area/f13/wasteland/city/newboston/bar) +"iYl" = ( +/obj/structure/closet/cabinet/anchored, +/obj/item/clothing/under/fancy_red_formaldress, +/obj/item/clothing/under/dress/blacktango, +/obj/item/clothing/under/costume/singer/yellow, +/obj/item/clothing/under/dress/westernbustle, +/obj/item/clothing/under/misc/black_dress, +/obj/item/clothing/under/f13/campfollowerfemale, +/obj/item/clothing/under/f13/campfollowermale, +/obj/machinery/light/small{ + dir = 8; + pixel_y = 13; + light_color = "#884444"; + light_power = 2; + light_range = 2; + color = "#884444" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/turf/open/floor/carpet/orange, +/area/f13/wasteland/city/newboston/bar) +"jfm" = ( +/obj/structure/sign/painting/library{ + pixel_x = -32 + }, +/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/wasteland/city/newboston/bar) "jgV" = ( /obj/machinery/light/small{ @@ -1541,28 +1617,126 @@ }, /area/f13/wasteland/city/newboston/bar) "jjA" = ( -/obj/structure/fence/pole_b{ - pixel_y = 7 +/obj/effect/decal/cleanable/glitter/white{ + color = "#884444" }, -/obj/structure/fence/pole_t{ - pixel_y = 36 +/obj/machinery/light/small{ + dir = 8; + pixel_y = 13; + light_color = "#884444"; + light_power = 2; + light_range = 2; + color = "#884444" + }, +/obj/structure/chair/sofa/corp/right{ + color = "#BED0FD"; + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" }, -/obj/structure/table/abductor, /turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/bar) "jqA" = ( /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland/city/newboston/outdoors) -"jSP" = ( +"jzx" = ( +/obj/structure/flora/ausbushes/brflowers{ + light_color = "#008080"; + light_power = 3; + light_range = 2 + }, +/turf/open/floor/grass{ + color = "#777777" + }, +/area/f13/wasteland/city/newboston/outdoors) +"jBL" = ( +/obj/structure/sink{ + icon_state = "water"; + name = "water"; + pixel_x = -1; + pixel_y = 12; + plane = 0 + }, +/obj/structure/sink{ + icon_state = "water"; + name = "water"; + pixel_x = 5; + pixel_y = 15; + plane = 0 + }, +/obj/structure/sink{ + icon_state = "water"; + name = "water"; + pixel_x = -6; + pixel_y = 7; + plane = 0 + }, +/obj/structure/sink{ + icon_state = "water"; + name = "water"; + pixel_x = -6; + pixel_y = 15; + plane = 0 + }, +/obj/structure/sink{ + icon_state = "water"; + name = "water"; + pixel_x = 5; + pixel_y = 7; + plane = 0 + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + layer = 2 + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + layer = 2; + pixel_x = 18 + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + layer = 2; + pixel_x = 18; + pixel_y = -14 + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + layer = 2; + pixel_y = -14 + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + layer = 2; + pixel_y = -14; + pixel_x = -19 + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + layer = 2; + pixel_x = -17 + }, /obj/effect/turf_decal/weather/dirt{ - dir = 1 + dir = 4 }, -/obj/structure/flora/ausbushes/leafybush{ - pixel_x = 4; - alpha = 80; - mouse_opacity = 0 +/turf/open/indestructible/ground/outside/water/running{ + name = "tribe river"; + color = "#A1BFFF" }, -/turf/open/indestructible/ground/outside/water, /area/f13/wasteland/city/newboston/outdoors) "jSX" = ( /obj/structure/sink/greyscale{ @@ -1576,97 +1750,76 @@ name = "dirty floor" }, /area/f13/wasteland/city/newboston/bar) -"kcI" = ( -/obj/structure/table/wood/settler, -/obj/item/stack/sheet/mineral/wood/fifty, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/wasteland/city/newboston/bar) -"klQ" = ( -/obj/effect/landmark/start/f13/wastelander, +"jYn" = ( +/obj/effect/landmark/start/f13/barkeep, /turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaltopbordertop0" + icon_state = "horizontalbottomborderbottom0" }, /area/f13/wasteland/city/newboston/outdoors) -"kop" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" +"jYx" = ( +/obj/structure/sign/poster/contraband/pinup_shower{ + pixel_y = 32 }, -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" +/obj/effect/decal/cleanable/glitter/blue{ + color = "#444499"; + layer = 3 }, /turf/open/floor/wood_common{ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) -"krL" = ( -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "smokey fog"; - mouse_opacity = 0; - layer = 2.9 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" +"kcI" = ( +/obj/structure/table/wood/settler, +/obj/item/stack/sheet/mineral/wood/fifty, +/turf/open/floor/wood_common{ + color = "#779999" }, -/turf/open/floor/wood_worn, /area/f13/wasteland/city/newboston/bar) -"kub" = ( -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "smokey fog"; - mouse_opacity = 0; - layer = 2.9 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" +"kgD" = ( +/obj/machinery/telecomms/server/presets/common, +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) +"kjJ" = ( +/obj/effect/landmark/start/f13/wastelander/clubworker, +/obj/structure/chair/bench{ + pixel_y = 12 }, -/turf/open/floor/wood_worn, -/area/f13/wasteland/city/newboston/bar) -"kwk" = ( -/obj/structure/chair/stool/retro/backed{ - dir = 4 +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom3" }, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" +/area/f13/wasteland/city/newboston/outdoors) +"kke" = ( +/obj/structure/sign/poster/contraband/pinup_pink{ + pixel_y = 32 }, -/turf/open/floor/carpet/royalblack, -/area/f13/wasteland/city/newboston/bar) -"kzR" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 8 +/obj/effect/landmark/start/f13/barkeep, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom2right" }, -/turf/open/indestructible/ground/outside/water, /area/f13/wasteland/city/newboston/outdoors) -"kDI" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" +"klQ" = ( +/obj/effect/landmark/start/f13/wastelander, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop0" }, -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" +/area/f13/wasteland/city/newboston/outdoors) +"kuO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/tree/jungle{ + pixel_x = -40; + pixel_y = 0; + density = 0; + mouse_opacity = 0 }, -/obj/effect/decal/cleanable/glitter/blue{ - color = "#444499"; - layer = 3 +/turf/open/floor/grass{ + color = "#777777" }, -/turf/open/floor/wood_common{ - color = "#779999" +/area/f13/wasteland/city/newboston/outdoors) +"kFu" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 4 }, -/area/f13/wasteland/city/newboston/bar) -"kFZ" = ( -/obj/machinery/telecomms/server/presets/science, +/obj/machinery/telecomms/server/presets/command, /turf/open/floor/circuit/telecomms/mainframe, /area/f13/wasteland/city/newboston/outdoors) "kMU" = ( @@ -1682,39 +1835,6 @@ color = "#999999" }, /area/f13/wasteland/city/newboston/outdoors) -"kUS" = ( -/obj/structure/sign/poster/contraband/pinup_shower{ - pixel_y = 32 - }, -/obj/effect/decal/cleanable/glitter/blue{ - color = "#444499"; - layer = 3 - }, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/wasteland/city/newboston/bar) -"kVA" = ( -/obj/item/reagent_containers/food/drinks/shaker{ - pixel_y = 12; - pixel_x = -6 - }, -/obj/machinery/chem_dispenser/drinks/beer{ - density = 0; - dir = 8; - pixel_x = 12; - pixel_y = 0 - }, -/obj/item/reagent_containers/glass/rag{ - pixel_x = -7 - }, -/obj/structure/table/abductor, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/turf/open/floor/carpet/royalblack, -/area/f13/wasteland/city/newboston/bar) "kWD" = ( /obj/structure/table/wood/settler, /obj/item/stack/sheet/cloth/ten, @@ -1724,24 +1844,11 @@ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) -"kWL" = ( -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "smokey fog"; - mouse_opacity = 0; - layer = 2.9 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, +"lcS" = ( /obj/effect/turf_decal/siding/wood{ color = "#3B2B1A" }, -/turf/open/floor/wood_common{ - color = "#779999" - }, +/turf/open/floor/carpet/royalblack, /area/f13/wasteland/city/newboston/bar) "lel" = ( /obj/structure/lamp_post{ @@ -1759,21 +1866,11 @@ icon_state = "verticalrightborderright0" }, /area/f13/wasteland/city/newboston/outdoors) -"lpN" = ( -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "verticalleftborderleft1" - }, -/area/f13/wasteland/city/newboston/outdoors) -"ltr" = ( -/obj/effect/landmark/start/f13/wastelander/clubworker, -/obj/structure/chair/bench{ - pixel_y = 12 - }, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontalbottomborderbottom2" - }, +"ljD" = ( +/obj/machinery/telecomms/server/presets/khans, +/turf/open/floor/circuit/telecomms/mainframe, /area/f13/wasteland/city/newboston/outdoors) -"lyo" = ( +"llj" = ( /obj/effect/turf_decal/siding/wood{ dir = 4; color = "#3B2B1A" @@ -1781,125 +1878,186 @@ /obj/effect/turf_decal/siding/wood{ color = "#3B2B1A" }, -/turf/open/floor/carpet/purple, -/area/f13/wasteland/city/newboston/bar) -"lzu" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 8; - pixel_y = 5; - pixel_x = -3 +/obj/effect/decal/cleanable/glitter/blue{ + color = "#444499"; + layer = 3 }, -/obj/structure/chair/stool/retro/tan, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" +/turf/open/floor/wood_common{ + color = "#779999" }, -/turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/bar) +"llK" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 1 + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) +"lpN" = ( +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft1" + }, +/area/f13/wasteland/city/newboston/outdoors) +"lzu" = ( +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) "lzG" = ( /obj/structure/simple_door/room, /obj/structure/table/abductor, -/obj/item/lock_bolt{ - dir = 8 +/obj/item/lock_bolt{ + dir = 8 + }, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/wasteland/city/newboston/bar) +"lEK" = ( +/obj/structure/flora/ausbushes/reedbush{ + pixel_y = 7 + }, +/turf/open/indestructible/ground/outside/water, +/area/f13/wasteland/city/newboston/outdoors) +"lHZ" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/water, +/area/f13/wasteland/city/newboston/outdoors) +"lIe" = ( +/obj/structure/flora/rock/pile/largejungle, +/obj/structure/flora/grass/coyote/one, +/turf/open/indestructible/ground/inside/dirt, +/area/f13/wasteland/city/newboston/outdoors) +"lNg" = ( +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalleftborderleft3" + }, +/area/f13/wasteland/city/newboston/outdoors) +"lQh" = ( +/obj/item/reagent_containers/food/drinks/shaker{ + pixel_y = 12; + pixel_x = -6 + }, +/obj/machinery/chem_dispenser/drinks/beer{ + density = 0; + dir = 8; + pixel_x = 12; + pixel_y = 0 + }, +/obj/item/reagent_containers/glass/rag{ + pixel_x = -7 + }, +/obj/structure/table/abductor, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" }, -/turf/open/floor/wood_fancy/wood_fancy_dark, +/turf/open/floor/carpet/royalblack, /area/f13/wasteland/city/newboston/bar) -"lBs" = ( -/obj/effect/landmark/start/f13/wastelander/clubworker, -/obj/structure/chair/bench{ - pixel_y = 12 - }, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontalbottomborderbottom3" +"lRV" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 }, -/area/f13/wasteland/city/newboston/outdoors) -"lLV" = ( -/obj/effect/turf_decal/weather/dirt, /obj/effect/turf_decal/weather/dirt{ dir = 8 }, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland/city/newboston/outdoors) -"lMi" = ( -/obj/structure/sign/poster/contraband/pinup_bed{ - pixel_y = 32 - }, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontalbottomborderbottom3" +"lSC" = ( +/obj/structure/railing{ + color = "#A47449"; + dir = 4; + pixel_x = 2 }, -/area/f13/wasteland/city/newboston/outdoors) -"lNg" = ( -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "verticalleftborderleft3" +/turf/open/floor/carpet/purple, +/area/f13/wasteland/city/newboston/bar) +"lUO" = ( +/obj/structure/decoration/vent/rusty{ + color = "#aaaaFE"; + alpha = 50 }, +/turf/open/indestructible/ground/outside/water, /area/f13/wasteland/city/newboston/outdoors) -"lQh" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 4 +"lXt" = ( +/obj/structure/railing/corner{ + dir = 4; + color = "#A47449"; + pixel_y = 8 }, -/obj/machinery/telecomms/server/presets/command, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) -"lRY" = ( -/obj/effect/turf_decal/stripes/asteroid/corner, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) -"lSC" = ( -/obj/structure/dresser{ - pixel_x = -15; - density = 0 +/obj/structure/curtain{ + color = "#c40e0e"; + open = 0 }, -/obj/machinery/light/small{ - dir = 8; - pixel_y = 13; - light_color = "#884444"; - light_power = 2; - light_range = 2; - color = "#884444" +/obj/effect/decal/cleanable/glitter/pink, +/obj/structure/table/abductor, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "smokey fog"; + mouse_opacity = 0; + layer = 2.9; + opacity = 1 }, +/turf/open/floor/carpet/purple, +/area/f13/wasteland/city/newboston/bar) +"maZ" = ( +/obj/item/kirbyplants/random, /obj/effect/turf_decal/siding/wood{ - dir = 8; color = "#3B2B1A" }, -/turf/open/floor/carpet/purple, -/area/f13/wasteland/city/newboston/bar) -"mbZ" = ( -/obj/machinery/light/floor{ - light_color = "#883388" +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" }, /turf/open/floor/wood_common{ - color = "#779999" + color = "#99BBBB" }, /area/f13/wasteland/city/newboston/bar) +"mbZ" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/indestructible/ground/inside/dirt, +/area/f13/wasteland/city/newboston/outdoors) "mdh" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom0" }, /area/f13/wasteland/city/newboston/outdoors) "meo" = ( -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "smokey fog"; - mouse_opacity = 0; - layer = 2.9 - }, /obj/effect/turf_decal/siding/wood{ - dir = 4; + dir = 1; color = "#3B2B1A" }, /obj/effect/turf_decal/siding/wood{ + dir = 4; color = "#3B2B1A" }, /turf/open/floor/wood_worn, /area/f13/wasteland/city/newboston/bar) -"mqF" = ( +"mip" = ( +/turf/open/indestructible/ground/inside/dirt, +/area/f13/wasteland/city/newboston/outdoors) +"msa" = ( +/obj/item/storage/box/drinkingglasses{ + pixel_y = 3; + pixel_x = 1 + }, +/obj/item/storage/box/drinkingglasses{ + pixel_y = 6; + pixel_x = -9 + }, +/obj/structure/table/abductor, +/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/wood_worn, +/turf/open/floor/carpet/royalblack, /area/f13/wasteland/city/newboston/bar) "mtY" = ( /obj/structure/chair/sofa/corp/right{ @@ -1942,91 +2100,38 @@ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) -"mDL" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 9 - }, -/obj/machinery/telecomms/bus/preset_one, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) -"mDM" = ( -/obj/machinery/telecomms/processor/preset_three, -/obj/machinery/light/floor, -/turf/open/floor/plasteel/f13{ - icon_state = "darkrustysolid" - }, -/area/f13/wasteland/city/newboston/outdoors) -"mFX" = ( -/obj/structure/table/abductor, -/obj/structure/sign/painting/library{ - pixel_x = 32 - }, -/obj/structure/sign/poster/contraband/robust_softdrinks{ - pixel_x = 32 - }, -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/turf/open/floor/carpet/royalblack, -/area/f13/wasteland/city/newboston/bar) -"mGX" = ( -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "smokey fog"; - mouse_opacity = 0; - layer = 2.9 - }, -/obj/effect/turf_decal/huge/heaven, -/turf/open/floor/wood_worn, -/area/f13/wasteland/city/newboston/bar) -"mHS" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 8 - }, -/turf/open/floor/plasteel/f13{ - icon_state = "darkrustysolid" - }, -/area/f13/wasteland/city/newboston/outdoors) -"mML" = ( -/obj/item/kirbyplants/random, +"mGF" = ( /obj/effect/turf_decal/siding/wood{ dir = 8; color = "#3B2B1A" }, /obj/effect/turf_decal/siding/wood{ - dir = 1; color = "#3B2B1A" }, /turf/open/floor/wood_common{ - color = "#99BBBB" + color = "#779999" }, /area/f13/wasteland/city/newboston/bar) +"mNp" = ( +/obj/effect/turf_decal/weather/dirt, +/turf/open/indestructible/ground/outside/water, +/area/f13/wasteland/city/newboston/outdoors) "mOz" = ( -/obj/structure/closet/cabinet/anchored, -/obj/item/clothing/under/fancy_red_formaldress, -/obj/item/clothing/under/dress/blacktango, -/obj/item/clothing/under/costume/singer/yellow, -/obj/item/clothing/under/dress/westernbustle, -/obj/item/clothing/under/misc/black_dress, -/obj/item/clothing/under/f13/campfollowerfemale, -/obj/item/clothing/under/f13/campfollowermale, -/obj/machinery/light/small{ - dir = 8; - pixel_y = 13; - light_color = "#884444"; - light_power = 2; - light_range = 2; - color = "#884444" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, +/obj/structure/table/wood/settler, +/obj/item/melee/onehanded/slavewhip, +/obj/item/melee/chainofcommand/tailwhip/kitty, +/obj/item/cane, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs/fake/kinky, +/obj/item/clothing/neck/petcollar, +/obj/item/clothing/neck/spikecollar, +/obj/item/clothing/neck/sapphirecollar, +/obj/item/clothing/neck/rubycollar, +/obj/item/clothing/neck/petcollar/locked, +/obj/item/clothing/neck/petcollar/leather, +/obj/item/clothing/neck/petcollar/choker, +/obj/item/clothing/neck/heartcollar, +/obj/item/clothing/mask/muzzle, /obj/effect/turf_decal/siding/wood{ dir = 1; color = "#3B2B1A" @@ -2034,8 +2139,17 @@ /turf/open/floor/carpet/orange, /area/f13/wasteland/city/newboston/bar) "mSr" = ( -/obj/effect/turf_decal/weather/dirt, -/turf/open/indestructible/ground/outside/water, +/obj/machinery/light/floor, +/turf/open/floor/plasteel/f13{ + icon_state = "darkrustysolid" + }, +/area/f13/wasteland/city/newboston/outdoors) +"mWI" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 4 + }, +/obj/machinery/telecomms/receiver/preset_right, +/turf/open/floor/circuit/telecomms/mainframe, /area/f13/wasteland/city/newboston/outdoors) "nbY" = ( /turf/open/indestructible/ground/outside/sidewalk{ @@ -2073,6 +2187,10 @@ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) +"nsz" = ( +/obj/machinery/telecomms/server/presets/service, +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) "nuu" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -2085,13 +2203,6 @@ icon_state = "verticalleftborderleft2bottom" }, /area/f13/wasteland/city/newboston/outdoors) -"nuI" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 10 - }, -/obj/machinery/telecomms/bus/preset_four, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) "nwa" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -2111,23 +2222,38 @@ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) +"nyA" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/turf/open/floor/wood_common{ + color = "#779999" + }, +/area/f13/wasteland/city/newboston/bar) +"nPu" = ( +/obj/effect/landmark/start/f13/wastelander/clubworker, +/obj/structure/chair/bench{ + pixel_y = 12 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom2" + }, +/area/f13/wasteland/city/newboston/outdoors) "nQS" = ( /obj/effect/landmark/latejoin, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "outerborder - S" }, -/area/f13/wasteland/city/newboston/outdoors) -"nWd" = ( -/obj/structure/flora/chomp/bones/lrock4, -/turf/open/indestructible/ground/outside/water, -/area/f13/wasteland/city/newboston/outdoors) -"nXC" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" - }, -/turf/open/floor/wood_worn, -/area/f13/wasteland/city/newboston/bar) +/area/f13/wasteland/city/newboston/outdoors) +"nVa" = ( +/obj/machinery/telecomms/server/presets/town, +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) +"nVF" = ( +/obj/structure/flora/rock/pile/largejungle, +/turf/open/indestructible/ground/inside/dirt, +/area/f13/wasteland/city/newboston/outdoors) "ocQ" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -2144,22 +2270,18 @@ icon_state = "horizontalbottomborderbottom0" }, /area/f13/wasteland/city/newboston/outdoors) -"ohm" = ( -/obj/effect/turf_decal/stripes/asteroid/line, -/obj/machinery/telecomms/message_server, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) -"ohF" = ( -/obj/machinery/telecomms/processor/preset_four, -/obj/machinery/light/floor, -/turf/open/floor/plasteel/f13{ - icon_state = "darkrustysolid" +"ohS" = ( +/obj/machinery/jukebox, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" }, -/area/f13/wasteland/city/newboston/outdoors) -"oiu" = ( -/obj/effect/landmark/start/f13/wastelander, -/turf/open/indestructible/ground/outside/sidewalk, -/area/f13/wasteland/city/newboston/outdoors) +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/turf/open/floor/carpet/royalblack, +/area/f13/wasteland/city/newboston/bar) "okV" = ( /obj/structure/chair/folding{ dir = 4 @@ -2182,6 +2304,91 @@ icon_state = "horizontaltopbordertop2" }, /area/f13/wasteland/city/newboston/outdoors) +"orp" = ( +/obj/structure/sink{ + icon_state = "water"; + name = "water"; + pixel_x = -1; + pixel_y = 12; + plane = 0 + }, +/obj/structure/sink{ + icon_state = "water"; + name = "water"; + pixel_x = 5; + pixel_y = 15; + plane = 0 + }, +/obj/structure/sink{ + icon_state = "water"; + name = "water"; + pixel_x = -6; + pixel_y = 7; + plane = 0 + }, +/obj/structure/sink{ + icon_state = "water"; + name = "water"; + pixel_x = -6; + pixel_y = 15; + plane = 0 + }, +/obj/structure/sink{ + icon_state = "water"; + name = "water"; + pixel_x = 5; + pixel_y = 7; + plane = 0 + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + layer = 2 + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + layer = 2; + pixel_x = 18 + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + layer = 2; + pixel_x = 18; + pixel_y = -14 + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + layer = 2; + pixel_y = -14 + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + layer = 2; + pixel_y = -14; + pixel_x = -19 + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + layer = 2; + pixel_x = -17 + }, +/obj/effect/turf_decal/weather/dirt, +/turf/open/indestructible/ground/outside/water/running{ + name = "tribe river"; + color = "#A1BFFF" + }, +/area/f13/wasteland/city/newboston/outdoors) "orZ" = ( /obj/machinery/processor, /turf/open/floor/f13{ @@ -2190,22 +2397,15 @@ name = "dirty floor" }, /area/f13/wasteland/city/newboston/bar) -"ouH" = ( -/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 = 8; - color = "#3B2B1A" +"ouY" = ( +/obj/structure/fence/pole_b{ + pixel_y = 7 }, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/structure/fence/pole_t{ + pixel_y = 36 }, +/obj/structure/table/abductor, +/turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/bar) "oKw" = ( /obj/structure/chair/stool/retro/backed{ @@ -2261,25 +2461,18 @@ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) -"piu" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 4 +"pwT" = ( +/obj/structure/sign/painting/library{ + pixel_x = -32 }, -/turf/open/indestructible/ground/outside/water, -/area/f13/wasteland/city/newboston/outdoors) -"prY" = ( +/obj/item/kirbyplants/random, /obj/effect/turf_decal/siding/wood{ - dir = 1; + dir = 8; color = "#3B2B1A" }, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" +/turf/open/floor/wood_common{ + color = "#779999" }, -/turf/open/floor/wood_worn, /area/f13/wasteland/city/newboston/bar) "pxC" = ( /obj/structure/table/abductor, @@ -2306,6 +2499,13 @@ }, /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) +"pGx" = ( +/obj/machinery/telecomms/processor/preset_one, +/obj/machinery/light/floor, +/turf/open/floor/plasteel/f13{ + icon_state = "darkrustysolid" + }, +/area/f13/wasteland/city/newboston/outdoors) "pMf" = ( /obj/effect/decal/cleanable/glitter/white{ color = "#884444" @@ -2315,40 +2515,66 @@ "pQh" = ( /turf/open/floor/carpet/royalblack, /area/f13/wasteland/city/newboston/bar) -"pWN" = ( -/obj/effect/landmark/start/f13/barkeep, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontalbottomborderbottom0" +"pSY" = ( +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "smokey fog"; + mouse_opacity = 0; + layer = 2.9 + }, +/obj/item/toy/tennis/blue{ + density = 1; + mouse_opacity = 0; + alpha = 0; + anchored = 1 + }, +/turf/open/indestructible/ground/outside/road{ + color = "#999999" }, /area/f13/wasteland/city/newboston/outdoors) -"qeV" = ( -/obj/effect/turf_decal/stripes/asteroid/corner{ - dir = 4 +"qjR" = ( +/obj/structure/flora/chomp/bones/lrock4, +/turf/open/indestructible/ground/outside/water, +/area/f13/wasteland/city/newboston/outdoors) +"qwR" = ( +/obj/machinery/recycler, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "outerborder - E" }, -/turf/open/floor/circuit/telecomms/mainframe, /area/f13/wasteland/city/newboston/outdoors) "qxx" = ( -/obj/structure/table/wood/settler, -/obj/item/melee/onehanded/slavewhip, -/obj/item/melee/chainofcommand/tailwhip/kitty, -/obj/item/cane, -/obj/item/restraints/handcuffs, -/obj/item/restraints/handcuffs/fake/kinky, -/obj/item/clothing/neck/petcollar, -/obj/item/clothing/neck/spikecollar, -/obj/item/clothing/neck/sapphirecollar, -/obj/item/clothing/neck/rubycollar, -/obj/item/clothing/neck/petcollar/locked, -/obj/item/clothing/neck/petcollar/leather, -/obj/item/clothing/neck/petcollar/choker, -/obj/item/clothing/neck/heartcollar, -/obj/item/clothing/mask/muzzle, +/obj/structure/closet/cabinet/anchored, +/obj/item/clothing/under/f13/mprostitute, +/obj/item/clothing/under/f13/fprostitute, +/obj/item/clothing/under/f13/erpdress, +/obj/item/clothing/under/dress/corset, +/obj/item/clothing/under/misc/stripper, +/obj/item/clothing/under/misc/stripper/green, +/obj/item/clothing/under/misc/stripper/mankini, +/obj/item/clothing/under/maid, +/obj/item/clothing/under/janimaid, +/obj/item/clothing/head/maid, +/obj/item/clothing/accessory/maidapron, +/obj/item/clothing/suit/armor/outfit/overalls/sexymaid, /obj/effect/turf_decal/siding/wood{ dir = 1; color = "#3B2B1A" }, /turf/open/floor/carpet/orange, /area/f13/wasteland/city/newboston/bar) +"qAX" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/turf/open/floor/wood_common{ + color = "#99BBBB" + }, +/area/f13/wasteland/city/newboston/bar) "qCA" = ( /turf/open/floor/f13{ color = "#ffe9de"; @@ -2375,66 +2601,54 @@ icon_state = "outerbordercorner - W" }, /area/f13/wasteland/city/newboston/outdoors) -"qNN" = ( -/obj/machinery/autolathe, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, -/turf/open/floor/f13{ - color = "#ffe9de"; - icon_state = "darkrusty"; - name = "dirty floor" +"qLB" = ( +/obj/machinery/telecomms/server/presets/security, +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) +"qQu" = ( +/obj/structure/sign/poster/contraband/pinup_ride{ + pixel_y = 32 + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "smokey fog"; + mouse_opacity = 0; + layer = 2.9 + }, +/turf/open/floor/wood_common{ + color = "#779999" }, /area/f13/wasteland/city/newboston/bar) -"rcC" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 +"qSj" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 4 + }, +/turf/open/floor/plasteel/f13{ + icon_state = "darkrustysolid" + }, +/area/f13/wasteland/city/newboston/outdoors) +"qZW" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 10 }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) +"rbl" = ( /obj/structure/flora/ausbushes/grassybush, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland/city/newboston/outdoors) -"reN" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" +"rbU" = ( +/turf/open/floor/plasteel/f13{ + icon_state = "darkrustysolid" }, -/turf/open/floor/wood_worn, -/area/f13/wasteland/city/newboston/bar) +/area/f13/wasteland/city/newboston/outdoors) "rnf" = ( /turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/bar) "roB" = ( -/obj/effect/decal/cleanable/glitter/white{ - color = "#884444" - }, -/obj/structure/chair/stool/retro/backed{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/turf/open/floor/carpet/royalblack, -/area/f13/wasteland/city/newboston/bar) -"rsh" = ( -/obj/effect/landmark/start/f13/wastelander/clubworker, -/obj/structure/chair/bench{ - pixel_y = 12 - }, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontalbottomborderbottom0" - }, +/obj/machinery/telecomms/hub/preset, +/turf/open/floor/circuit/telecomms/mainframe, /area/f13/wasteland/city/newboston/outdoors) "rvy" = ( /obj/structure/spacevine{ @@ -2460,57 +2674,39 @@ name = "dirty floor" }, /area/f13/wasteland/city/newboston/bar) +"rBJ" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/indestructible/ground/outside/water, +/area/f13/wasteland/city/newboston/outdoors) "rDF" = ( /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontalbottomborderbottom2right" }, /area/f13/wasteland/city/newboston/outdoors) -"rMD" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#3B2B1A" - }, -/obj/effect/decal/cleanable/glitter/blue{ - color = "#444499"; - layer = 3 - }, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/wasteland/city/newboston/bar) -"rNu" = ( -/obj/structure/curtain{ - color = "#c40e0e" - }, -/obj/effect/fake_stairs/west{ - color = "#845f58" - }, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/wasteland/city/newboston/bar) -"rOK" = ( +"rGK" = ( /obj/effect/turf_decal/stripes/asteroid/line{ - dir = 5 + dir = 8 }, +/obj/machinery/telecomms/receiver/preset_left, /turf/open/floor/circuit/telecomms/mainframe, /area/f13/wasteland/city/newboston/outdoors) -"rTA" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 8; - pixel_x = -3 - }, -/obj/machinery/light/floor{ - light_color = "#883388" +"rNu" = ( +/obj/effect/landmark/start/f13/wastelander/clubworker, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop2" }, -/obj/structure/chair/stool/retro/tan, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" +/area/f13/wasteland/city/newboston/outdoors) +"rTA" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 }, -/turf/open/floor/carpet/purple, -/area/f13/wasteland/city/newboston/bar) +/turf/open/indestructible/ground/inside/dirt, +/area/f13/wasteland/city/newboston/outdoors) "rWC" = ( /obj/machinery/vending/cola/red{ density = 0; @@ -2523,30 +2719,59 @@ "rYw" = ( /turf/closed, /area) +"rZT" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/structure/flora/ausbushes/grassybush, +/turf/open/indestructible/ground/outside/water, +/area/f13/wasteland/city/newboston/outdoors) "sbi" = ( /turf/closed/indestructible/f13/matrix, /area/f13/wasteland/city/newboston/outdoors) -"sdV" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 4 +"sel" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" }, -/turf/open/floor/plasteel/f13{ - icon_state = "darkrustysolid" +/turf/open/floor/wood_worn, +/area/f13/wasteland/city/newboston/bar) +"seA" = ( +/obj/structure/railing/corner{ + color = "#A47449"; + pixel_y = -1 }, -/area/f13/wasteland/city/newboston/outdoors) -"snc" = ( -/obj/structure/sink/greyscale{ - dir = 4; - pixel_y = 10; - pixel_x = 12 +/obj/structure/curtain{ + color = "#c40e0e"; + open = 0 }, +/obj/effect/decal/cleanable/glitter/pink, /obj/structure/table/abductor, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "smokey fog"; + mouse_opacity = 0; + layer = 2.9; + opacity = 1 + }, +/turf/open/floor/carpet/purple, +/area/f13/wasteland/city/newboston/bar) +"shG" = ( /obj/effect/turf_decal/siding/wood{ dir = 4; color = "#3B2B1A" }, -/obj/structure/sign/flag_texas{ - pixel_x = 32 +/turf/closed/wall/mineral/brick, +/area/f13/wasteland/city/newboston/bar) +"skf" = ( +/obj/structure/chair/stool/retro/backed, +/obj/machinery/light/floor{ + light_color = "#883388" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" }, /turf/open/floor/carpet/royalblack, /area/f13/wasteland/city/newboston/bar) @@ -2578,167 +2803,50 @@ color = "#999999" }, /area/f13/wasteland/city/newboston/outdoors) -"sxE" = ( -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaltopbordertop1" - }, -/area/f13/wasteland/city/newboston/outdoors) -"syd" = ( -/obj/structure/sign/poster/contraband/pinup_pink{ - pixel_y = 32 - }, -/obj/effect/landmark/start/f13/barkeep, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontalbottomborderbottom2right" - }, -/area/f13/wasteland/city/newboston/outdoors) -"sAg" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 5 - }, -/obj/machinery/telecomms/bus/preset_two, +"ste" = ( +/obj/machinery/telecomms/server/presets/engineering, /turf/open/floor/circuit/telecomms/mainframe, /area/f13/wasteland/city/newboston/outdoors) -"sCW" = ( -/obj/structure/sign/painting/library{ - pixel_x = -32 - }, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/wasteland/city/newboston/bar) -"sIE" = ( -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "smokey fog"; - mouse_opacity = 0; - layer = 2.9 - }, +"sxE" = ( /turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "horizontaltopbordertop2right" - }, -/area/f13/wasteland/city/newboston/outdoors) -"sTd" = ( -/obj/structure/bonfire/prelit, -/turf/open/indestructible/ground/outside/gravel{ - color = "#AAAAAA" - }, -/area/f13/wasteland/city/newboston/outdoors) -"sXl" = ( -/obj/structure/decoration/vent/rusty{ - color = "#aaaaFE"; - alpha = 50 - }, -/turf/open/indestructible/ground/outside/water, -/area/f13/wasteland/city/newboston/outdoors) -"sYD" = ( -/obj/structure/sink{ - icon_state = "water"; - name = "water"; - pixel_x = -1; - pixel_y = 12; - plane = 0 - }, -/obj/structure/sink{ - icon_state = "water"; - name = "water"; - pixel_x = 5; - pixel_y = 15; - plane = 0 - }, -/obj/structure/sink{ - icon_state = "water"; - name = "water"; - pixel_x = -6; - pixel_y = 7; - plane = 0 - }, -/obj/structure/sink{ - icon_state = "water"; - name = "water"; - pixel_x = -6; - pixel_y = 15; - plane = 0 - }, -/obj/structure/sink{ - icon_state = "water"; - name = "water"; - pixel_x = 5; - pixel_y = 7; - plane = 0 - }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam"; - layer = 2 - }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam"; - layer = 2; - pixel_x = 18 - }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam"; - layer = 2; - pixel_x = 18; - pixel_y = -14 - }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam"; - layer = 2; - pixel_y = -14 + icon_state = "horizontaltopbordertop1" }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam"; - layer = 2; - pixel_y = -14; - pixel_x = -19 +/area/f13/wasteland/city/newboston/outdoors) +"sCW" = ( +/obj/structure/sign/painting/library{ + pixel_x = -32 + }, +/turf/open/floor/wood_common{ + color = "#779999" }, +/area/f13/wasteland/city/newboston/bar) +"sIE" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; icon_state = "smoke"; - name = "steam"; - layer = 2; - pixel_x = -17 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 4 + name = "smokey fog"; + mouse_opacity = 0; + layer = 2.9 }, -/turf/open/indestructible/ground/outside/water/running{ - name = "tribe river"; - color = "#A1BFFF" +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop2right" }, /area/f13/wasteland/city/newboston/outdoors) -"tdz" = ( -/obj/structure/sign/poster/contraband/pinup_couch{ - pixel_y = 32 +"sXl" = ( +/obj/structure/railing{ + color = "#A47449"; + dir = 8; + pixel_x = -3 }, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/machinery/light/floor{ + light_color = "#883388" }, -/area/f13/wasteland/city/newboston/bar) -"teC" = ( +/obj/structure/chair/stool/retro/tan, /obj/effect/turf_decal/siding/wood{ dir = 4; color = "#3B2B1A" }, -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#3B2B1A" - }, -/turf/open/floor/wood_common{ - color = "#99BBBB" - }, +/turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/bar) "tkO" = ( /turf/open/indestructible/ground/outside/road{ @@ -2746,20 +2854,8 @@ icon_state = "horizontaltopborderbottom0" }, /area/f13/wasteland/city/newboston/outdoors) -"tnx" = ( -/obj/effect/turf_decal/stripes/asteroid/line, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) "tot" = ( -/obj/structure/sign/poster/contraband/pinup_bed{ - pixel_x = -32 - }, -/obj/structure/piano/fancy, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/wasteland/city/newboston/bar) -"try" = ( +/obj/item/kirbyplants/random, /obj/effect/turf_decal/siding/wood{ dir = 8; color = "#3B2B1A" @@ -2796,10 +2892,6 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/f13/wasteland/city/newboston/bar) -"tBo" = ( -/obj/machinery/telecomms/server/presets/service, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) "tCf" = ( /obj/effect/decal/cleanable/glitter/blue{ color = "#444499"; @@ -2812,79 +2904,42 @@ /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) "tCv" = ( -/obj/item/fishingrod, -/turf/open/indestructible/ground/outside/gravel{ - color = "#AAAAAA" - }, -/area/f13/wasteland/city/newboston/outdoors) -"tDM" = ( -/obj/structure/chair/stool/retro/backed, -/obj/machinery/light/floor{ - light_color = "#883388" - }, /obj/effect/turf_decal/siding/wood{ - dir = 1; + dir = 4; color = "#3B2B1A" }, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/wood_worn, /area/f13/wasteland/city/newboston/bar) -"tKv" = ( -/obj/structure/flora/ausbushes/leafybush{ - pixel_x = 4; - alpha = 80; - mouse_opacity = 0 - }, -/turf/open/indestructible/ground/outside/water, -/area/f13/wasteland/city/newboston/outdoors) "tLM" = ( /turf/open/floor/plating/f13/outside/road{ icon_state = "cross1"; color = "#999999" }, /area/f13/wasteland/city/newboston/outdoors) -"ubS" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/turf/open/floor/wood_common{ - color = "#99BBBB" +"tSj" = ( +/obj/effect/decal/cleanable/glitter/white{ + color = "#884444" }, -/area/f13/wasteland/city/newboston/bar) -"ueB" = ( -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "smokey fog"; - mouse_opacity = 0; - layer = 2.9 +/obj/structure/chair/stool/retro/backed{ + dir = 4 }, /obj/effect/turf_decal/siding/wood{ - dir = 1; + dir = 8; color = "#3B2B1A" }, /obj/effect/turf_decal/siding/wood{ - dir = 8; color = "#3B2B1A" }, -/turf/open/floor/wood_worn, +/turf/open/floor/carpet/royalblack, /area/f13/wasteland/city/newboston/bar) -"ueH" = ( -/obj/item/toy/tennis/blue{ - density = 1; - mouse_opacity = 0; - alpha = 0; - anchored = 1 - }, -/turf/open/indestructible/ground/outside/road{ - color = "#999999"; - icon_state = "horizontaltopborderbottom0" +"tTr" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 8 }, +/obj/machinery/telecomms/server/presets/enclave, +/turf/open/floor/circuit/telecomms/mainframe, /area/f13/wasteland/city/newboston/outdoors) -"ulN" = ( +"uie" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; icon_state = "smoke"; @@ -2896,20 +2951,63 @@ dir = 8; color = "#3B2B1A" }, -/turf/open/floor/wood_worn, -/area/f13/wasteland/city/newboston/bar) -"uyE" = ( -/obj/structure/sign/poster/contraband/pinup_funk{ - pixel_y = 32 - }, /turf/open/floor/wood_common{ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) -"uzz" = ( +"ukJ" = ( +/obj/structure/closet/crate/trashcart, +/turf/open/indestructible/ground/inside/dirt, +/area/f13/wasteland/city/newboston/outdoors) +"ukT" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 4 + }, +/obj/machinery/telecomms/server/presets/vault, +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) +"urh" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/lamp_post/doubles/bent{ + dir = 4; + density = 0; + pixel_y = -14; + pixel_x = -42; + light_range = 16 + }, +/obj/machinery/light{ + light_color = "#e8eaff"; + dir = 1; + pixel_y = 64; + pixel_x = 17; + plane = -6 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland/city/newboston/outdoors) +"usf" = ( +/obj/effect/landmark/start/f13/wastelander/clubworker, +/obj/structure/chair/bench{ + pixel_y = 12 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/f13/wasteland/city/newboston/outdoors) +"uvk" = ( +/obj/effect/turf_decal/stripes/asteroid/line, +/obj/machinery/telecomms/message_server, +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) +"uyD" = ( +/obj/structure/flora/ausbushes/reedbush{ + pixel_y = 7 + }, /obj/effect/turf_decal/weather/dirt{ - dir = 1 + dir = 4 }, +/obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/water, /area/f13/wasteland/city/newboston/outdoors) "uAb" = ( @@ -2928,7 +3026,7 @@ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) -"uKE" = ( +"uFL" = ( /obj/effect/landmark/latejoin, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "horizontaltopbordertop1" @@ -2949,46 +3047,13 @@ color = "#99BBBB" }, /area/f13/wasteland/city/newboston/bar) -"uRc" = ( -/obj/machinery/telecomms/server/presets/medical, -/turf/open/floor/plasteel/f13{ - icon_state = "darkrustysolid" - }, -/area/f13/wasteland/city/newboston/outdoors) -"uTa" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ +"uWD" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/effect/turf_decal/weather/dirt{ dir = 8 }, -/obj/machinery/telecomms/broadcaster/preset_left, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) -"uVD" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 4 - }, -/obj/machinery/telecomms/server/presets/vault, -/turf/open/floor/circuit/telecomms/mainframe, +/turf/open/indestructible/ground/outside/water, /area/f13/wasteland/city/newboston/outdoors) -"uWD" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 8; - pixel_x = -3 - }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "smokey fog"; - mouse_opacity = 0; - layer = 2.9 - }, -/obj/structure/chair/stool/retro/tan, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/turf/open/floor/carpet/purple, -/area/f13/wasteland/city/newboston/bar) "uWY" = ( /turf/open/indestructible/ground/outside/road{ color = "#999999" @@ -3017,64 +3082,86 @@ icon_state = "outerborder - W" }, /area/f13/wasteland/city/newboston/outdoors) +"vlJ" = ( +/obj/effect/turf_decal/stripes/asteroid/corner{ + dir = 4 + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) "vlV" = ( /obj/effect/landmark/latejoin, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "outerbordercorner - S" }, /area/f13/wasteland/city/newboston/outdoors) -"vwg" = ( -/obj/effect/decal/cleanable/glitter/blue{ - color = "#444499"; - layer = 3 +"vzp" = ( +/obj/structure/chair/stool/retro/backed{ + dir = 4 + }, +/obj/machinery/light/floor{ + light_color = "#883388" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/turf/open/floor/carpet/royalblack, +/area/f13/wasteland/city/newboston/bar) +"vDo" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" }, /turf/open/floor/wood_worn, /area/f13/wasteland/city/newboston/bar) -"vyY" = ( -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "smokey fog"; - mouse_opacity = 0; - layer = 2.9 +"vEu" = ( +/obj/structure/bed/dogbed, +/turf/open/floor/wood_common{ + color = "#779999" + }, +/area/f13/wasteland/city/newboston/bar) +"vHp" = ( +/obj/effect/decal/cleanable/glitter/white{ + color = "#884444" + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ + pixel_y = 17; + pixel_x = -8 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ + pixel_x = -8; + pixel_y = 7 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ + pixel_y = 4 }, -/obj/item/toy/tennis/blue{ - density = 1; - mouse_opacity = 0; - alpha = 0; - anchored = 1 +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ + pixel_x = 8; + pixel_y = 12 }, -/turf/open/indestructible/ground/outside/road{ - color = "#999999" +/obj/structure/table/abductor, +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" }, -/area/f13/wasteland/city/newboston/outdoors) -"vzp" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 4 +/turf/open/floor/carpet/royalblack, +/area/f13/wasteland/city/newboston/bar) +"vJz" = ( +/obj/structure/sign/painting/library{ + pixel_x = -32 }, -/obj/machinery/telecomms/broadcaster/preset_right, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) -"vFJ" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 4 +/obj/structure/railing{ + color = "#A47449"; + dir = 1; + pixel_y = 8 }, -/turf/open/indestructible/ground/outside/water, -/area/f13/wasteland/city/newboston/outdoors) -"vHU" = ( -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "smokey fog"; - mouse_opacity = 0; - layer = 2.9 +/obj/effect/decal/cleanable/glitter/pink, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 }, +/obj/structure/chair/stool/retro/tan, /obj/effect/turf_decal/siding/wood{ color = "#3B2B1A" }, -/turf/open/floor/wood_common{ - color = "#779999" - }, +/turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/bar) "vJD" = ( /obj/effect/decal/marking, @@ -3083,6 +3170,16 @@ color = "#999999" }, /area/f13/wasteland/city/newboston/outdoors) +"vKd" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/turf/open/floor/wood_worn, +/area/f13/wasteland/city/newboston/bar) "vQt" = ( /obj/structure/rack, /obj/item/toy/crayon/spraycan{ @@ -3099,142 +3196,94 @@ name = "dirty floor" }, /area/f13/wasteland/city/newboston/bar) -"vWI" = ( -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" - }, -/turf/open/floor/wood_worn, -/area/f13/wasteland/city/newboston/bar) -"vXB" = ( -/obj/structure/sink{ - icon_state = "water"; - name = "water"; - pixel_x = -1; - pixel_y = 12; - plane = 0 - }, -/obj/structure/sink{ - icon_state = "water"; - name = "water"; - pixel_x = 5; - pixel_y = 15; - plane = 0 +"waC" = ( +/obj/structure/bonfire/prelit, +/turf/open/indestructible/ground/inside/dirt, +/area/f13/wasteland/city/newboston/outdoors) +"wdd" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 6 }, -/obj/structure/sink{ - icon_state = "water"; - name = "water"; - pixel_x = -6; - pixel_y = 7; - plane = 0 +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) +"wgU" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 1 }, -/obj/structure/sink{ - icon_state = "water"; - name = "water"; - pixel_x = -6; - pixel_y = 15; - plane = 0 +/obj/machinery/ntnet_relay, +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) +"wjZ" = ( +/obj/structure/mirror{ + layer = 4; + pixel_x = -25; + pixel_y = 4 }, -/obj/structure/sink{ - icon_state = "water"; - name = "water"; - pixel_x = 5; - pixel_y = 7; - plane = 0 +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" }, +/turf/open/floor/carpet/purple, +/area/f13/wasteland/city/newboston/bar) +"wlx" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; icon_state = "smoke"; - name = "steam"; - layer = 2 + name = "smokey fog"; + mouse_opacity = 0; + layer = 2.9 }, /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; icon_state = "smoke"; - name = "steam"; - layer = 2; - pixel_x = 18 + name = "smokey fog"; + mouse_opacity = 0; + layer = 2.9 }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam"; - layer = 2; - pixel_x = 18; - pixel_y = -14 +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam"; - layer = 2; - pixel_y = -14 +/turf/open/floor/wood_common{ + color = "#779999" }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam"; - layer = 2; - pixel_y = -14; - pixel_x = -19 +/area/f13/wasteland/city/newboston/bar) +"wnw" = ( +/obj/machinery/telecomms/server/presets/medical, +/turf/open/floor/plasteel/f13{ + icon_state = "darkrustysolid" + }, +/area/f13/wasteland/city/newboston/outdoors) +"wqx" = ( +/obj/structure/railing{ + color = "#A47449"; + dir = 8; + pixel_x = -3 }, /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; icon_state = "smoke"; - name = "steam"; - layer = 2; - pixel_x = -17 - }, -/obj/effect/turf_decal/weather/dirt, -/turf/open/indestructible/ground/outside/water/running{ - name = "tribe river"; - color = "#A1BFFF" - }, -/area/f13/wasteland/city/newboston/outdoors) -"wjZ" = ( -/obj/structure/mirror{ - layer = 4; - pixel_x = -25; - pixel_y = 4 + name = "smokey fog"; + mouse_opacity = 0; + layer = 2.9 }, +/obj/structure/chair/stool/retro/tan, /obj/effect/turf_decal/siding/wood{ - dir = 8; + dir = 4; color = "#3B2B1A" }, /turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/bar) -"wmf" = ( -/obj/item/storage/box/drinkingglasses{ - pixel_y = 3; - pixel_x = 1 - }, -/obj/item/storage/box/drinkingglasses{ - pixel_y = 6; - pixel_x = -9 - }, -/obj/structure/table/abductor, -/obj/machinery/light/small{ +"wqW" = ( +/obj/effect/decal/cleanable/glitter/blue{ 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" + layer = 3 }, -/turf/open/floor/carpet/royalblack, -/area/f13/wasteland/city/newboston/bar) -"wmD" = ( -/obj/machinery/telecomms/server/presets/town, -/turf/open/floor/circuit/telecomms/mainframe, -/area/f13/wasteland/city/newboston/outdoors) -"wsM" = ( -/obj/structure/bed/dogbed, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/machinery/light/floor{ + light_color = "#444499"; + color = "#444499" }, +/turf/open/floor/wood_worn, /area/f13/wasteland/city/newboston/bar) "wum" = ( /obj/effect/landmark/start/f13/wastelander, @@ -3242,16 +3291,6 @@ icon_state = "verticalleftborderleft2" }, /area/f13/wasteland/city/newboston/outdoors) -"wvs" = ( -/obj/structure/flora/ausbushes/reedbush{ - pixel_y = 7 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 4 - }, -/obj/effect/turf_decal/weather/dirt, -/turf/open/indestructible/ground/outside/water, -/area/f13/wasteland/city/newboston/outdoors) "wxN" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -3264,25 +3303,56 @@ color = "#999999" }, /area/f13/wasteland/city/newboston/outdoors) -"wKq" = ( -/obj/machinery/light/small{ - color = "#444499"; +"wyJ" = ( +/obj/effect/turf_decal/siding/wood{ dir = 8; - light_color = "#444499"; - light_power = 2; - light_range = 2; - pixel_y = 13 + color = "#3B2B1A" + }, +/turf/open/floor/wood_common{ + color = "#779999" + }, +/area/f13/wasteland/city/newboston/bar) +"wEo" = ( +/obj/machinery/telecomms/server/presets/ncr, +/turf/open/floor/plasteel/f13{ + icon_state = "darkrustysolid" + }, +/area/f13/wasteland/city/newboston/outdoors) +"wIz" = ( +/obj/structure/flora/ausbushes/leafybush{ + pixel_x = 4; + alpha = 80; + mouse_opacity = 0 + }, +/turf/open/indestructible/ground/outside/water, +/area/f13/wasteland/city/newboston/outdoors) +"wJX" = ( +/obj/structure/sign/poster/contraband/pinup_funk{ + pixel_y = 32 + }, +/turf/open/floor/wood_common{ + color = "#779999" + }, +/area/f13/wasteland/city/newboston/bar) +"wPR" = ( +/obj/effect/turf_decal/stripes/asteroid/corner{ + dir = 1 }, -/obj/effect/turf_decal/siding/wood{ - color = "#3B2B1A" +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) +"wRL" = ( +/obj/structure/railing{ + color = "#A47449"; + dir = 8; + pixel_y = 5; + pixel_x = -3 }, +/obj/structure/chair/stool/retro/tan, /obj/effect/turf_decal/siding/wood{ - dir = 8; + dir = 4; color = "#3B2B1A" }, -/turf/open/floor/wood_common{ - color = "#99BBBB" - }, +/turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/bar) "wTs" = ( /turf/open/indestructible/ground/outside/sidewalk{ @@ -3301,6 +3371,20 @@ icon_state = "verticalrightborderright2bottom" }, /area/f13/wasteland/city/newboston/outdoors) +"xga" = ( +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "smokey fog"; + mouse_opacity = 0; + layer = 2.9 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/turf/open/floor/wood_worn, +/area/f13/wasteland/city/newboston/bar) "xlf" = ( /obj/structure/chair/stool/retro/backed{ dir = 8 @@ -3313,11 +3397,21 @@ color = "#99BBBB" }, /area/f13/wasteland/city/newboston/bar) -"xnl" = ( -/obj/structure/closet/crate/trashcart, -/turf/open/indestructible/ground/outside/gravel{ - color = "#AAAAAA" +"xlm" = ( +/obj/machinery/light/floor{ + light_color = "#444499"; + color = "#444499" + }, +/turf/open/floor/wood_worn, +/area/f13/wasteland/city/newboston/bar) +"xnF" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 }, +/turf/open/indestructible/ground/outside/water, /area/f13/wasteland/city/newboston/outdoors) "xoy" = ( /obj/effect/decal/cleanable/glitter/blue{ @@ -3328,6 +3422,16 @@ "xpa" = ( /turf/closed/wall/mineral/brick, /area/f13/wasteland/city/newboston/bar) +"xqD" = ( +/obj/machinery/light/small{ + dir = 1; + light_color = "red"; + pixel_y = 22 + }, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom2right" + }, +/area/f13/wasteland/city/newboston/outdoors) "xwb" = ( /obj/effect/decal/cleanable/glitter/blue{ color = "#444499"; @@ -3337,19 +3441,6 @@ color = "#779999" }, /area/f13/wasteland/city/newboston/bar) -"xxh" = ( -/obj/machinery/chem_dispenser/drinks/fullupgrade{ - dir = 8; - pixel_y = -1; - pixel_x = 14 - }, -/obj/structure/table/abductor, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/turf/open/floor/carpet/royalblack, -/area/f13/wasteland/city/newboston/bar) "xyb" = ( /obj/structure/chair/stool/retro/backed{ dir = 4 @@ -3362,12 +3453,23 @@ color = "#99BBBB" }, /area/f13/wasteland/city/newboston/bar) -"xAy" = ( -/obj/machinery/telecomms/server/presets/supply, -/turf/open/floor/plasteel/f13{ - icon_state = "darkrustysolid" +"xyd" = ( +/obj/structure/curtain{ + color = "#c40e0e"; + open = 0 }, -/area/f13/wasteland/city/newboston/outdoors) +/obj/effect/decal/cleanable/glitter/pink, +/obj/structure/table/abductor, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "smokey fog"; + mouse_opacity = 0; + layer = 2.9; + opacity = 1 + }, +/turf/open/floor/carpet/purple, +/area/f13/wasteland/city/newboston/bar) "xCL" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -3378,10 +3480,19 @@ }, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/wasteland/city/newboston/outdoors) -"xPo" = ( -/obj/structure/sign/poster/contraband/pinup_ride{ - pixel_y = 32 +"xHE" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/turf/open/floor/wood_common{ + color = "#99BBBB" }, +/area/f13/wasteland/city/newboston/bar) +"xNF" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; icon_state = "smoke"; @@ -3389,23 +3500,21 @@ mouse_opacity = 0; layer = 2.9 }, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/wasteland/city/newboston/bar) -"xPQ" = ( +/obj/effect/landmark/start/f13/wastelander/clubworker, /turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "verticalrightborderright1" + icon_state = "horizontaltopbordertop2left" }, /area/f13/wasteland/city/newboston/outdoors) -"xQn" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 +"xOJ" = ( +/obj/effect/landmark/start/f13/wastelander/clubworker, +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontaltopbordertop2right" }, -/obj/effect/turf_decal/weather/dirt{ - dir = 4 +/area/f13/wasteland/city/newboston/outdoors) +"xPQ" = ( +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "verticalrightborderright1" }, -/turf/open/indestructible/ground/outside/water, /area/f13/wasteland/city/newboston/outdoors) "xQu" = ( /obj/effect/decal/marking, @@ -3418,54 +3527,25 @@ color = "#999999" }, /area/f13/wasteland/city/newboston/outdoors) -"xRe" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 8 - }, -/turf/open/indestructible/ground/outside/water, -/area/f13/wasteland/city/newboston/outdoors) "xWe" = ( /turf/closed/indestructible/f13/obsidian, /area/f13/wasteland/city/newboston/outdoors) "xZc" = ( -/obj/effect/decal/cleanable/glitter/white{ - color = "#884444" - }, -/obj/structure/railing{ - color = "#A47449"; - dir = 4; - pixel_y = 8; - pixel_x = 2 - }, -/turf/open/floor/carpet/purple, -/area/f13/wasteland/city/newboston/bar) -"ycR" = ( -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "smokey fog"; - mouse_opacity = 0; - layer = 2.9 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#3B2B1A" - }, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/machinery/light/floor, +/turf/open/floor/circuit/telecomms/mainframe, +/area/f13/wasteland/city/newboston/outdoors) +"ygg" = ( +/obj/machinery/telecomms/processor/preset_four, +/obj/machinery/light/floor, +/turf/open/floor/plasteel/f13{ + icon_state = "darkrustysolid" }, -/area/f13/wasteland/city/newboston/bar) +/area/f13/wasteland/city/newboston/outdoors) "ygG" = ( /obj/effect/spawner/lootdrop/f13/foodspawner, /obj/structure/table/abductor, /turf/open/floor/carpet/royalblack, /area/f13/wasteland/city/newboston/bar) -"yla" = ( -/turf/open/indestructible/ground/outside/water, -/area/f13/wasteland/city/newboston/outdoors) (1,1,1) = {" xWe @@ -3727,15 +3807,15 @@ rYw (2,1,1) = {" xWe xWe -etF -mDL -dcM -gTG -mHS -hhr -uTa -nuI -ohF +pGx +ewn +rGK +dPZ +bbJ +tTr +fDb +fvo +ygg xWe xWe xWe @@ -3984,15 +4064,15 @@ rYw (3,1,1) = {" xWe xWe -aLO -qeV -aBY -aBY -gYu -aBY -aBY -eyf -eQA +dpG +vlJ +lzu +lzu +mSr +lzu +lzu +wPR +qZW xWe xWe xWe @@ -4241,15 +4321,15 @@ rYw (4,1,1) = {" xWe xWe -jcm -iSv -iEX -uRc -aBY -iAY -kFZ -tBo -tnx +llK +kgD +ljD +wnw +lzu +aff +fRv +nsz +dSz xWe xWe xWe @@ -4498,15 +4578,15 @@ rYw (5,1,1) = {" xWe xWe -dIq -aUs -hvX -bRc -fOM -bRc -hvX -xAy -ohm +wgU +hFw +xZc +rbU +roB +rbU +xZc +cWl +uvk xWe xWe xWe @@ -4755,15 +4835,15 @@ rYw (6,1,1) = {" xWe xWe -jcm -cTO -cQX -ach -aBY -fMj -aff -wmD -tnx +llK +ste +iDj +wEo +lzu +edK +qLB +nVa +dSz xWe xWe xWe @@ -4787,7 +4867,7 @@ xWe xWe bBZ uWY -uWY +fUR kMU tLM uWY @@ -5012,15 +5092,15 @@ rYw (7,1,1) = {" xWe xWe -rOK -dcH -aBY -aBY -gYu -aBY -aBY -lRY -bLo +iuL +apF +lzu +lzu +mSr +lzu +lzu +eEU +wdd xWe xWe xWe @@ -5269,15 +5349,15 @@ rYw (8,1,1) = {" xWe xWe -ckd -sAg -aTZ -lQh -sdV -uVD -vzp -gSq -mDM +iJV +bzc +mWI +kFu +qSj +ukT +aFk +gVS +gLq xWe xWe xWe @@ -6073,7 +6153,7 @@ xWe sbi oLs jqA -oiu +ecT klQ tkO wxN @@ -6309,20 +6389,20 @@ xWe xWe xWe xWe -xWe -xWe -xWe -xWe -xWe -xWe -xWe -xWe -xWe -xWe -xWe -xWe -xWe -xWe +xpa +xpa +xpa +xpa +xpa +xpa +xpa +xpa +xpa +xpa +xpa +xpa +xpa +xpa xWe xWe xWe @@ -6330,7 +6410,7 @@ xWe sbi oLs jqA -oiu +ecT klQ tkO wxN @@ -6555,30 +6635,30 @@ rYw xWe xWe xWe -xRe -kzR -kzR -kzR -kzR -lLV -xWe -xWe -xpa -xpa -xpa -xpa -xpa -xpa -xpa -xpa -xpa -xpa -xpa +lRV +bxY +bxY +bxY +bxY +uWD +mbZ +mip xpa xpa xpa xpa +iYl +wjZ +wjZ +wjZ +cQG +inX +hEt +jjA xpa +tot +uQa +ggt xpa xpa xpa @@ -6812,37 +6892,37 @@ rYw xWe xWe xWe -uzz -yla -tKv -bte -yla -mSr -hJJ -hJJ +lHZ +eis +wIz +rbl +eis +mNp +mbZ +mip xpa goB ffh xpa mOz -wjZ -wjZ -wjZ +rnf +rnf +rnf +lSC lSC -edK hQS -cvh +iku xpa -mML -uQa -wKq +ngx +bgG +oKw xpa -try +dOV uQa hun xpa akT -uKE +uFL gzw eAQ srN @@ -7069,14 +7149,14 @@ rYw xWe xWe xWe -rcC -yla -yla -dli -bte -mSr -tCv -hJJ +rZT +eis +eis +hqa +rbl +mNp +eMT +mip xpa adu xoy @@ -7084,31 +7164,31 @@ xpa qxx rnf rnf -rnf -eMT -eMT -xZc -iku +bNh +bpA +cdu +uAb +pMf xpa -ngx -bgG -oKw +aTn +xlf +qAX xpa ngx bgG oKw -xpa +bUG mdh sxE -ueH -fpY -fpY +cgn +eYJ +eYJ wxN uWY uWY -fpY -fpY -fpY +eYJ +eYJ +eYJ mdh gGC sbi @@ -7326,35 +7406,35 @@ rYw xWe xWe xWe -jSP -yla -tKv -nWd -sXl -mSr -hJJ -hJJ +cdA +eis +wIz +qjR +lUO +mNp +mbZ +mip xpa xoy tAv xpa -bzc -rnf -rnf -bNh -bpA -cdu -uAb -pMf xpa -teC -xlf -ubS +gkC xpa -teC -xlf -ubS xpa +lzG +xpa +xpa +xpa +xpa +aJA +aJA +aJA +xpa +aTn +xlf +qAX +bUG eBd hox gzw @@ -7583,36 +7663,36 @@ rYw xWe xWe xWe -uzz -yla -gzx -yla -tKv -vXB -tCv -hJJ -xpa -gkC -xpa -xpa +lHZ +eis +lEK +eis +wIz +orp +eMT +mip xpa gkC xpa xpa -lzG -xpa -xpa +jgV +uie xpa +lXt +xyd +seA xpa -rNu -rNu -rNu +hoG +pwT +wyJ +wyJ +wyJ xpa -rNu -rNu -rNu +aJA +aJA +aJA xpa -lMi +fOk fdf tkO uWY @@ -7840,34 +7920,34 @@ rYw xWe xWe xWe -xQn -vFJ -sYD -piu -vFJ -wvs -hJJ -hJJ +xnF +isr +jBL +rBJ +isr +uyD +mbZ +mip iub -ekb +uie nwa nwa +uFG +rvy +dRv +btj +iVQ +btj +vJz +guP jgV -ekb -xpa -bxY -ewn -eis -xpa -tot -cLm -ekb -bKi -rMD -ouH -bKi -bKi -kWL +uFG +uFG +xwb +iPP +wyJ +wyJ +iNU xpa hov hAy @@ -7880,7 +7960,7 @@ uWY fUR fUR fUR -cgI +urh gGC sbi xWe @@ -8097,26 +8177,26 @@ rYw xWe xWe xWe -xWe -xWe -xWe -hJJ -tCv -hJJ -hJJ -hJJ +kuO +eip +bfR +bfR +efM +rTA +mip +mip xpa xpa xpa xpa -uyE -rvy +aBY +xwb gNj -btj iVQ -btj +ouY +iVQ dXY -guP +rvy rvy uFG rvy @@ -8124,13 +8204,13 @@ rvy rvy uFG rvy -vHU +hbT xpa adh cuN -ueH -fpY -fpY +cgn +eYJ +eYJ uWY uWY uWY @@ -8354,37 +8434,37 @@ rYw xWe xWe xWe -xWe -xWe -xWe -hJJ -hJJ -hJJ -hJJ -sTd +cnb +cnb +dcH +afL +mip +mip +mip +mip xpa ePQ agk xpa -tdz -xwb +qQu +uFG gyr +pxC iVQ -jjA iVQ bAd rvy uFG -ueB -ulN -gUn -gUn -dOq +awD +cRl +sel +sel +bXW uFG -fjp +hwv bUG -rsh -iLI +usf +xOJ gzw eAQ fUR @@ -8611,37 +8691,37 @@ rYw xWe xWe xWe -xWe -hJJ -hJJ -hJJ -hJJ -xWe -xWe -xWe +dcH +cnb +lIe +mip +mip +mip +mip +mip xpa tCf pBI xpa -xPo -uFG +wJX +rvy abA -pxC -iVQ -iVQ +wqx +sXl +wRL gnx -rvy -ueB -hTW +niY +awD +xlm txY hTW hTW gmW -reN -fjp +vKd +hwv bUG ocQ -fio +rNu tkO uWY uWY @@ -8868,34 +8948,34 @@ rYw xWe xWe xWe -xWe -hJJ -hJJ -hJJ -hJJ -xWe -xWe -xWe +jzx +afL +mip +mip +mip +mip +mip +waC xpa fbp fbp xpa uFG -rvy +uFG +uFG +uFG +uFG +uFG +uFG +uFG ahF -uWD -rTA -lzu -lyo -niY -dkE txY hTW -bnr -mGX hTW -vWI -fjp +txY +hTW +vDo +hwv iub eBd cuN @@ -9125,17 +9205,17 @@ rYw xWe xWe xWe -xWe -hJJ -hJJ +nVF +lIe +mip xpa xpa xpa xpa xpa xpa -ekb -bKi +uie +wyJ jfm uFG uFG @@ -9145,14 +9225,14 @@ cht uFG uFG uFG -nXC +gOe txY hTW txY hTW txY -vWI -fjp +vDo +hwv xpa dCS fdf @@ -9165,7 +9245,7 @@ uWY uWY wxN wxN -cgI +urh fxb sbi xWe @@ -9382,9 +9462,9 @@ rYw xWe xWe xWe -xWe -hJJ -hJJ +mip +mip +mip xpa abR sCW @@ -9402,14 +9482,14 @@ uFG uFG uFG uFG -prY -hTW +meo +xlm hTW hTW hTW -vwg -meo -vHU +wqW +cvh +hbT iub wTs hAy @@ -9639,9 +9719,9 @@ rYw xWe xWe xWe -xWe -hJJ -hJJ +mip +mip +mip xpa dZA guP @@ -9652,24 +9732,24 @@ fmT xwb uFG gYw -kwk -eow -kwk -kwk -eow -roB +cAt +vzp +cAt +cAt +vzp +tSj xwb uFG -krL -kub -mqF -kub -aQA +ddh +xga +tCv +xga +aoR uFG -vHU +hbT bUG -lBs -iLI +kjJ +xOJ tkO uWY uWY @@ -9896,16 +9976,16 @@ rYw xWe xWe xWe -xWe -hJJ -hJJ +mip +mip +mip xpa pgU uFG uFG mBj xpa -kUS +jYx rvy uFG dME @@ -9923,10 +10003,10 @@ rvy uFG rvy nwa -vHU +hbT bUG -ltr -gDq +nPu +xNF gzw fUR fUR @@ -10153,36 +10233,36 @@ rYw xWe xWe xWe -xWe -hJJ -hJJ +mip +mip +mip xpa kWD uFG uFG uFG cCu -ycR -ycR -cAt -tDM +fzC +fzC +nyA +skf hRl aLE pQh pQh pQh -eoG -mbZ -eUg -cAt -ycR -iZM -gBv -cAt -cAt -kDI +vHp +uFG +uFG +uFG +uFG +uFG +ifs +nyA +nyA +llj xpa -syd +kke opB eHQ uWY @@ -10193,7 +10273,7 @@ uWY uWY uWY wxN -cgI +urh gGC sbi xWe @@ -10410,9 +10490,9 @@ rYw xWe xWe xWe -xWe -hJJ -hJJ +mip +mip +mip xpa xpa xpa @@ -10428,18 +10508,18 @@ pQh pQh pQh pQh -bad +lcS uFG -xpa -avK -avK -avK -gml +eUg +nyA +fzC +wlx +shG avK avK avK xpa -pWN +jYn fdf gzw fUR @@ -10667,36 +10747,36 @@ rYw xWe xWe xWe -xWe -hJJ -hJJ -xnl -xnl -hJJ -hJJ +mip +mip +mip +ukJ +ukJ +mip +mip xpa soW ays -bAT +mGF xpa -hiY -iyo -kVA -xxh -snc -wmf -mFX -wsM +ohS +fzg +lQh +iVm +hJJ +msa +hdN +vEu xpa -try -xyb -dJP +avK +avK +avK xpa -try +dOV xyb -dJP -xpa -dHN +xHE +bUG +azu oWN eHQ wxN @@ -10704,9 +10784,9 @@ uWY uWY wxN uWY -fpY -vyY -fpY +eYJ +pSY +eYJ mdh bhg sbi @@ -10924,17 +11004,17 @@ rYw xWe xWe xWe -xWe -hJJ -hJJ -hJJ -hJJ -hJJ -hJJ +mip +mip +mip +mip +mip +mip +mip xpa gan oQP -fjp +hwv xpa xpa xpa @@ -10945,14 +11025,14 @@ xpa xpa bcw xpa -ngx -bgG -oKw +dOV +xyb +xHE xpa ngx bgG oKw -xpa +bUG eJV sIE gzw @@ -11191,7 +11271,7 @@ xWe xpa mtY esa -kop +cAY xpa okV qCA @@ -11202,15 +11282,15 @@ qCA qCA qCA xpa -aEB -xlf -jfA +ngx +bgG +oKw xpa -hbT +hHE aht -hiO +maZ xpa -rDF +xqD qFF xPQ neR @@ -11452,22 +11532,22 @@ xpa xpa orZ fDY -qNN +bIX vQt hBy ryu jSX mvt xpa +aEB +xlf +aZA xpa xpa xpa xpa xpa -xpa -xpa -xpa -dJK +qwR lpN lpN lpN @@ -11716,9 +11796,9 @@ xpa xpa xpa xpa -xWe -xWe -xWe +xpa +xpa +xpa xWe xWe xWe diff --git a/_maps/map_files/coyote_bayou/foxybarupper.dmm b/_maps/map_files/coyote_bayou/foxybarupper.dmm index 676159d8998..a31994388b6 100644 --- a/_maps/map_files/coyote_bayou/foxybarupper.dmm +++ b/_maps/map_files/coyote_bayou/foxybarupper.dmm @@ -1,17 +1,11 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ag" = ( -/obj/structure/toilet{ - dir = 8 - }, -/obj/structure/toilet_paper{ - pixel_y = 6; - pixel_x = -9 - }, -/obj/structure/window/reinforced/tinted/frosted{ - dir = 1; - color = "black" +/obj/structure/table/abductor, +/obj/structure/lootable/house/junk_television{ + pixel_y = 13; + pixel_x = 2 }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vault1, +/turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) "ah" = ( /obj/structure/chair/sofa/corner{ @@ -38,6 +32,26 @@ }, /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) +"bm" = ( +/obj/item/kirbyplants/random, +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, +/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/wasteland/city/newboston/bar) +"bC" = ( +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1{ + color = "#bbbbbb" + }, +/area/f13/wasteland/city/newboston/bar) "cs" = ( /turf/closed/indestructible/rock, /area/f13/wasteland) @@ -49,9 +63,8 @@ /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) "dC" = ( -/obj/structure/chair/stool/retro/tan, -/turf/open/floor/carpet/black, -/area/f13/wasteland/city/newboston/bar) +/turf/closed/indestructible/riveted, +/area/f13/wasteland) "dD" = ( /obj/structure/rug/big/rug_yellow{ layer = 2.8 @@ -70,12 +83,6 @@ }, /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) -"eg" = ( -/obj/structure/sign/poster/contraband/pinup_ride{ - pixel_y = 32 - }, -/turf/open/floor/carpet/black, -/area/f13/wasteland/city/newboston/bar) "gc" = ( /obj/effect/decal/cleanable/glitter/blue{ color = "#444499"; @@ -84,9 +91,11 @@ /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) "gj" = ( -/obj/machinery/telecomms/relay/preset/telecomms, -/turf/open/indestructible, -/area/f13/wasteland) +/obj/structure/table/wood/settler, +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1{ + color = "#bbbbbb" + }, +/area/f13/wasteland/city/newboston/bar) "gr" = ( /obj/structure/sink{ pixel_x = -8; @@ -119,26 +128,26 @@ /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) "hj" = ( -/obj/structure/rug/big/rug_yellow{ - layer = 2.8 +/obj/structure/sign/poster/contraband/pinup_topless{ + pixel_y = 32 }, /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) "hR" = ( -/obj/item/kirbyplants/random, +/obj/structure/decoration/vent, +/obj/structure/urinal{ + pixel_y = 25 + }, /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/f13/wasteland/city/newboston/bar) "il" = ( -/obj/machinery/light/small{ - color = "#444499"; - dir = 1; - light_color = "#444499"; - light_power = 2; - light_range = 2; - pixel_y = 13 +/obj/structure/toilet{ + dir = 8 }, -/obj/machinery/computer/slot_machine, -/turf/open/floor/carpet/black, +/obj/structure/toilet_paper{ + pixel_y = 17 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/f13/wasteland/city/newboston/bar) "iA" = ( /obj/structure/chair/sofa{ @@ -195,11 +204,9 @@ /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) "kF" = ( -/obj/structure/toilet{ - dir = 8 - }, -/obj/structure/toilet_paper{ - pixel_y = 17 +/obj/structure/simple_door/room, +/obj/item/lock_bolt{ + dir = 1 }, /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/f13/wasteland/city/newboston/bar) @@ -214,6 +221,12 @@ }, /turf/open/floor/carpet/blue, /area/f13/wasteland/city/newboston/bar) +"mr" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1{ + color = "#bbbbbb" + }, +/area/f13/wasteland/city/newboston/bar) "mF" = ( /obj/effect/decal/cleanable/glitter/white{ color = "#884444" @@ -228,6 +241,18 @@ /obj/structure/rug/big/rug_red, /turf/open/floor/carpet/blue, /area/f13/wasteland/city/newboston/bar) +"nh" = ( +/obj/machinery/light/small{ + color = "#444499"; + dir = 1; + light_color = "#444499"; + light_power = 2; + light_range = 2; + pixel_y = 13 + }, +/obj/machinery/computer/slot_machine, +/turf/open/floor/carpet/black, +/area/f13/wasteland/city/newboston/bar) "ns" = ( /obj/machinery/light/small{ color = "#444499"; @@ -240,7 +265,18 @@ /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) "nT" = ( -/obj/machinery/computer/slot_machine, +/obj/structure/chair/sofa/left{ + dir = 4; + pixel_x = -6 + }, +/obj/machinery/light/small{ + color = "#444499"; + dir = 8; + light_color = "#444499"; + light_power = 2; + light_range = 2; + pixel_y = 13 + }, /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) "oL" = ( @@ -254,19 +290,19 @@ /obj/item/lock_bolt, /turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/bar) -"pi" = ( -/obj/structure/simple_door/room, -/obj/item/lock_bolt{ - dir = 1 - }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vault1, -/area/f13/wasteland/city/newboston/bar) "qp" = ( /turf/open/floor/carpet/blue, /area/f13/wasteland/city/newboston/bar) "qv" = ( -/obj/structure/table/abductor, -/obj/item/toy/cards/deck, +/obj/item/kirbyplants/random, +/obj/machinery/light/small{ + color = "#444499"; + dir = 8; + light_color = "#444499"; + light_power = 2; + light_range = 2; + pixel_y = 13 + }, /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) "qC" = ( @@ -287,6 +323,13 @@ }, /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) +"rx" = ( +/obj/structure/table/wood/settler, +/obj/machinery/computer/libraryconsole/bookmanagement, +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1{ + color = "#bbbbbb" + }, +/area/f13/wasteland/city/newboston/bar) "rM" = ( /obj/structure/dresser{ pixel_y = 19; @@ -311,13 +354,8 @@ /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) "ta" = ( -/obj/machinery/light/small{ - color = "#444499"; - light_color = "#444499"; - light_power = 2; - light_range = 2 - }, -/turf/open/floor/carpet/black, +/obj/structure/sign/poster/contraband/pinup_bed, +/turf/closed/wall/mineral/brick, /area/f13/wasteland/city/newboston/bar) "tg" = ( /turf/closed, @@ -356,20 +394,9 @@ /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) "tQ" = ( -/obj/structure/chair/sofa/left{ - dir = 4; - pixel_x = -6 - }, -/obj/machinery/light/small{ - color = "#444499"; - dir = 8; - light_color = "#444499"; - light_power = 2; - light_range = 2; - pixel_y = 13 - }, -/turf/open/floor/carpet/black, -/area/f13/wasteland/city/newboston/bar) +/obj/machinery/telecomms/relay/preset/telecomms, +/turf/open/indestructible, +/area/f13/wasteland) "um" = ( /obj/effect/decal/cleanable/glitter/white{ color = "#884444" @@ -401,10 +428,8 @@ /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) "yr" = ( -/obj/structure/table/abductor, -/obj/structure/lootable/house/junk_television{ - pixel_y = 13; - pixel_x = 2 +/obj/structure/rug/big/rug_yellow{ + layer = 2.8 }, /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) @@ -457,6 +482,12 @@ }, /turf/open/floor/carpet/blue, /area/f13/wasteland/city/newboston/bar) +"Ab" = ( +/obj/machinery/photocopier, +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1{ + color = "#bbbbbb" + }, +/area/f13/wasteland/city/newboston/bar) "Af" = ( /obj/structure/chair/sofa/left, /obj/structure/dresser{ @@ -465,6 +496,14 @@ }, /turf/open/floor/carpet/blue, /area/f13/wasteland/city/newboston/bar) +"AI" = ( +/obj/structure/chair/f13chair1{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1{ + color = "#bbbbbb" + }, +/area/f13/wasteland/city/newboston/bar) "AR" = ( /obj/structure/chair/sofa{ color = "#475340"; @@ -472,11 +511,33 @@ }, /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) +"AV" = ( +/obj/structure/table/wood/settler, +/obj/item/paper_bin, +/obj/item/pen, +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1{ + color = "#bbbbbb" + }, +/area/f13/wasteland/city/newboston/bar) +"AY" = ( +/obj/machinery/bookbinder, +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1{ + color = "#bbbbbb" + }, +/area/f13/wasteland/city/newboston/bar) "Bt" = ( /obj/item/restraints/handcuffs/fake/kinky, /obj/structure/table/abductor, /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) +"BV" = ( +/obj/structure/chair/f13chair1{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1{ + color = "#bbbbbb" + }, +/area/f13/wasteland/city/newboston/bar) "Cd" = ( /obj/structure/spacevine{ icon = 'icons/effects/effects.dmi'; @@ -494,16 +555,35 @@ }, /turf/open/floor/carpet/blue, /area/f13/wasteland/city/newboston/bar) -"Ec" = ( -/obj/item/kirbyplants/random, +"DC" = ( +/obj/structure/chair/f13chair1{ + dir = 1 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1{ + color = "#bbbbbb" + }, +/area/f13/wasteland/city/newboston/bar) +"DJ" = ( /obj/machinery/light/small{ color = "#444499"; - dir = 8; + dir = 4; light_color = "#444499"; light_power = 2; light_range = 2; pixel_y = 13 }, +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, +/turf/open/floor/carpet/black, +/area/f13/wasteland/city/newboston/bar) +"Ec" = ( +/obj/machinery/light/small{ + color = "#444499"; + light_color = "#444499"; + light_power = 2; + light_range = 2 + }, /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) "Eo" = ( @@ -513,20 +593,30 @@ /turf/open/floor/carpet/blue, /area/f13/wasteland/city/newboston/bar) "EF" = ( -/obj/structure/sign/poster/contraband/pinup_bed, -/turf/closed/wall/mineral/brick, +/obj/structure/chair/stool/retro/tan, +/turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) "EM" = ( /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) "EQ" = ( -/turf/open/floor/plasteel/f13/vault_floor/misc/vault1, +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, +/obj/machinery/light/small{ + color = "#444499"; + dir = 4; + light_color = "#444499"; + light_power = 2; + light_range = 2; + pixel_y = 13 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) "Fg" = ( -/obj/structure/chair/sofa/left{ - dir = 8; - pixel_x = 8 - }, +/obj/structure/table/abductor, +/obj/item/toy/cards/deck, /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) "Fq" = ( @@ -543,11 +633,14 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/f13/wasteland/city/newboston/bar) -"Hy" = ( -/obj/structure/decoration/vent, -/obj/structure/urinal{ - pixel_y = 25 +"Hu" = ( +/obj/structure/chair/f13chair1, +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1{ + color = "#bbbbbb" }, +/area/f13/wasteland/city/newboston/bar) +"Hy" = ( +/obj/item/kirbyplants/random, /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/f13/wasteland/city/newboston/bar) "Jp" = ( @@ -557,9 +650,24 @@ }, /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) +"Kg" = ( +/obj/machinery/light/small{ + color = "#444499"; + dir = 4; + light_color = "#444499"; + light_power = 2; + light_range = 2; + pixel_y = 13 + }, +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/carpet/black, +/area/f13/wasteland/city/newboston/bar) "Mv" = ( -/turf/closed/indestructible/riveted, -/area/f13/wasteland) +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1, +/area/f13/wasteland/city/newboston/bar) "Nz" = ( /obj/structure/chair/sofa/right{ dir = 8; @@ -568,7 +676,7 @@ /turf/open/floor/carpet/blue, /area/f13/wasteland/city/newboston/bar) "Oo" = ( -/obj/structure/chair/sofa/right{ +/obj/structure/chair/sofa/corner{ dir = 1; pixel_x = -6 }, @@ -592,10 +700,11 @@ /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) "Pq" = ( -/obj/structure/sign/poster/contraband/pinup_topless{ - pixel_y = 32 +/obj/structure/simple_door/repaired, +/obj/item/lock_bolt{ + dir = 8 }, -/turf/open/floor/carpet/black, +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/f13/wasteland/city/newboston/bar) "Ps" = ( /obj/structure/railing{ @@ -606,32 +715,18 @@ /turf/open/transparent/openspace, /area/f13/wasteland/city/newboston/bar) "PA" = ( -/obj/machinery/light/small{ - color = "#444499"; - dir = 4; - light_color = "#444499"; - light_power = 2; - light_range = 2; - pixel_y = 13 - }, -/obj/structure/sign/painting/library{ - pixel_x = 32 +/obj/structure/toilet{ + dir = 8 }, -/turf/open/floor/carpet/black, -/area/f13/wasteland/city/newboston/bar) -"PM" = ( -/obj/structure/sign/painting/library{ - pixel_x = 32 +/obj/structure/toilet_paper{ + pixel_y = 6; + pixel_x = -9 }, -/obj/machinery/light/small{ - color = "#444499"; - dir = 4; - light_color = "#444499"; - light_power = 2; - light_range = 2; - pixel_y = 13 +/obj/structure/window/reinforced/tinted/frosted{ + dir = 1; + color = "black" }, -/turf/open/floor/carpet/black, +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/f13/wasteland/city/newboston/bar) "PZ" = ( /obj/structure/simple_door/repaired, @@ -665,6 +760,17 @@ "RJ" = ( /turf/open/transparent/openspace, /area/f13/wasteland/city/newboston/bar) +"Sl" = ( +/obj/structure/bookcase, +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, +/obj/item/cartridge/curator, +/obj/item/cartridge/curator, +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1{ + color = "#bbbbbb" + }, +/area/f13/wasteland/city/newboston/bar) "SP" = ( /obj/structure/chair/sofa{ color = "#475340"; @@ -683,21 +789,30 @@ }, /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) -"Uw" = ( -/obj/item/kirbyplants/random, -/obj/structure/sign/painting/library{ - pixel_x = 32 +"SW" = ( +/obj/machinery/libraryscanner, +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1{ + color = "#bbbbbb" }, -/obj/machinery/light/small{ - color = "#444499"; - dir = 4; - light_color = "#444499"; - light_power = 2; - light_range = 2; - pixel_y = 13 +/area/f13/wasteland/city/newboston/bar) +"Tw" = ( +/obj/structure/closet/crate/bin, +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1{ + color = "#bbbbbb" }, +/area/f13/wasteland/city/newboston/bar) +"Uw" = ( +/obj/machinery/computer/slot_machine, /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) +"UV" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1{ + color = "#bbbbbb" + }, +/area/f13/wasteland/city/newboston/bar) "Vk" = ( /obj/structure/chair/sofa{ color = "#475340"; @@ -708,6 +823,12 @@ "Vo" = ( /turf/closed/wall/mineral/brick, /area/f13/wasteland/city/newboston/bar) +"Vq" = ( +/obj/structure/sign/poster/contraband/pinup_ride{ + pixel_y = 32 + }, +/turf/open/floor/carpet/black, +/area/f13/wasteland/city/newboston/bar) "Wh" = ( /obj/structure/sign/painting/library{ pixel_x = -32 @@ -718,6 +839,12 @@ }, /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) +"Wr" = ( +/obj/structure/bookcase, +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1{ + color = "#bbbbbb" + }, +/area/f13/wasteland/city/newboston/bar) "WW" = ( /obj/structure/chair/stool/retro/backed, /turf/open/floor/carpet/black, @@ -736,27 +863,37 @@ }, /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) -"XW" = ( -/obj/structure/simple_door/repaired, -/obj/item/lock_bolt{ - dir = 8 +"XT" = ( +/obj/structure/table/wood/settler, +/obj/item/storage/box/dice{ + pixel_x = 1; + pixel_y = 5 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vault1{ + color = "#bbbbbb" }, -/turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/f13/wasteland/city/newboston/bar) -"ZE" = ( -/obj/structure/chair/sofa/corner{ +"XW" = ( +/obj/structure/chair/sofa/right{ dir = 1; pixel_x = -6 }, /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/bar) +"YQ" = ( +/obj/structure/chair/sofa/left{ + dir = 8; + pixel_x = 8 + }, +/turf/open/floor/carpet/black, +/area/f13/wasteland/city/newboston/bar) (1,1,1) = {" -Mv -Mv -Mv -Mv -Mv +dC +dC +dC +dC +dC cs cs cs @@ -1009,11 +1146,11 @@ tg tg "} (2,1,1) = {" -Mv +dC Xr Xr Xr -Mv +dC cs cs cs @@ -1266,11 +1403,11 @@ tg tg "} (3,1,1) = {" -Mv +dC Xr -gj +tQ Xr -Mv +dC cs cs cs @@ -1523,11 +1660,11 @@ tg tg "} (4,1,1) = {" -Mv +dC Xr Xr Xr -Mv +dC cs cs cs @@ -1780,11 +1917,11 @@ tg tg "} (5,1,1) = {" -Mv -Mv -Mv -Mv -Mv +dC +dC +dC +dC +dC cs cs cs @@ -2815,12 +2952,12 @@ cs cs cs Vo -Hy -EQ +hR +Mv Vo Vo -EQ -EQ +Mv +Mv jA Vo cs @@ -3072,13 +3209,13 @@ cs cs cs Vo -Hy -EQ +hR +Mv Vo Vo -kF -EQ -EQ +il +Mv +Mv Vo Vo Vo @@ -3329,16 +3466,16 @@ cs cs cs Vo -Hy -EQ +hR +Mv Vo Vo Vo Vo -XW +Pq Vo Ra -EQ +Mv Vo cs cs @@ -3586,16 +3723,16 @@ cs cs cs Vo -Hy +hR jA Vo Ra -pi -EQ -EQ +kF +Mv +Mv ph -EQ -ag +Mv +PA Vo cs cs @@ -3843,12 +3980,12 @@ cs cs cs Vo -Hy -EQ +hR +Mv Vo -kF +il Vo -EQ +Mv jA Vo Vo @@ -4100,13 +4237,13 @@ cs cs cs Vo -Hy +hR jA Vo Vo Vo -hR -EQ +Hy +Mv Vo rM dD @@ -4614,13 +4751,13 @@ cs cs cs Vo -hR -EQ +Hy +Mv jn EM PZ FS -EQ +Mv Vo Vo Vo @@ -4628,7 +4765,7 @@ Vo ns EM Cd -ta +Ec Vo Vo Vo @@ -5399,7 +5536,7 @@ Vo ns Cd EM -ta +Ec Vo Vo Vo @@ -5643,7 +5780,7 @@ cs cs cs Vo -Pq +hj EM Cd sd @@ -5653,7 +5790,7 @@ Vo rM lB Vo -eg +Vq EM EM EM @@ -5664,8 +5801,8 @@ Vo jO Ql EM -tQ -ZE +nT +Oo Vo cs cs @@ -5922,7 +6059,7 @@ Cd Ql EM aR -Oo +XW Vo cs cs @@ -6172,7 +6309,7 @@ EM Cd EM Vo -EF +ta Vo Vo EM @@ -6423,16 +6560,16 @@ Ro EM EM EM -Ec +qv EM Cd EM EM -Ec +qv EM EM qC -ta +Ec Vo Vo Vo @@ -6670,7 +6807,7 @@ cs cs cs cs -EF +ta EM EM EM @@ -7188,18 +7325,18 @@ Vo EM EM EM -Uw +bm EM EM EM -PM +EQ EM EM Cd -PA +Kg EM EM -PA +DJ EM EM EM @@ -7460,7 +7597,7 @@ Vo Ql Ql Ql -Ql +Vo Vo Vo Vo @@ -7699,8 +7836,8 @@ cs cs cs Vo -nT -dC +Uw +EF EM Vo EM @@ -7714,14 +7851,14 @@ Vo EM EM Vo -EM -EM -be -dS -Vo -Vo -Vo -Vo +bC +bC +bC +bC +bC +UV +AI +AI Vo cs cs @@ -7956,8 +8093,8 @@ cs cs cs Vo -nT -dC +Uw +EF EM Vo ns @@ -7969,16 +8106,16 @@ be EM Vo ns -yr -Vo -ns -WW -aR -aR -Vo -Vo -Vo +ag Vo +bC +bC +bC +bC +bC +Hu +gj +gj Vo cs cs @@ -8213,12 +8350,12 @@ cs cs cs Vo -il -dC +nh +EF EM Vo WW -qv +Fg uu Vo WW @@ -8226,16 +8363,16 @@ ru uu Vo EM -hj -Vo -EM -WW -aR -aR -Vo -Vo -Vo +yr Vo +mr +bC +bC +bC +bC +Hu +XT +gj Vo cs cs @@ -8470,8 +8607,8 @@ cs cs cs Vo -nT -dC +Uw +EF EM Vo EM @@ -8483,16 +8620,16 @@ oL dS Vo kf -Fg -Vo -EM -WW -aR -aR -Vo -Vo -Vo +YQ Vo +rx +DC +bC +bC +bC +bC +BV +BV Vo cs cs @@ -8742,12 +8879,12 @@ Vo Vo Vo Vo -Vo -Vo -Vo -Vo -Vo -Vo +AV +bC +bC +bC +bC +bC Vo Vo Vo @@ -8998,14 +9135,14 @@ cs cs cs cs -cs -cs -cs -cs -cs -cs -cs -cs +Vo +AY +SW +Ab +Sl +Wr +Tw +Vo cs cs cs @@ -9255,14 +9392,14 @@ cs cs cs cs -cs -cs -cs -cs -cs -cs -cs -cs +Vo +Vo +Vo +Vo +Vo +Vo +Vo +Vo cs cs cs diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 28bcf6ea9ed..3f499858ab1 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -630,14 +630,14 @@ #define SIMPLEMOB_NO_STAMCRIT -1 /// Max distance you can see tats -#define TATTOO_VISIBILITY_RANGE 3 +#define TATTOO_VISIBILITY_RANGE 50 #define SIMPLEMOB_IGNORE 1 #define PHUD_NONE "GENITAL_HUD_NONE" #define PHUD_BUTT "GENITAL_HUD_BUTT" #define PHUD_BOOB "GENITAL_HUD_BREASTS" -#define PHUD_PENIS "GENITAL_HUD_PEEN" +#define PHUD_TALLYWHACKER "GENITAL_HUD_PEEN" // COH BLOYME GUV COPOYLOT GOT THEY KNICKAS IN A TWIST OVER THE WORD PENIS WOT WOT #define PHUD_BALLS "GENITAL_HUD_BALLS" #define PHUD_VAG "GENITAL_HUD_VAG" #define PHUD_BELLY "GENITAL_HUD_BELLY" @@ -646,12 +646,14 @@ #define PHUD_SHIRT "GENITAL_HUD_SHIRT" #define PHUD_PANTS "GENITAL_HUD_PANTS" #define PHUD_SOCKS "GENITAL_HUD_SOCKS" +#define PHUD_PVP_FLAG "GENITAL_HUD_pvp_flag" #define GENITAL_LAYER_OFFSET 0.1 // keep genitals close to the body #define SOCKS_LAYER_OFFSET 0.2 // undies go over genitals (sometimes) #define PANTS_LAYER_OFFSET 0.21 // undies go over genitals (sometimes) #define SHIRT_LAYER_OFFSET 0.22 // undies go over genitals (sometimes) #define WINGS_LAYER_OFFSET 0.3 // wings go over undies and genitals #define TAIL_LAYER_OFFSET 0.4 // Tail on the outermost of everything +#define pvp_flag_LAYER_OFFSET 1 // Sexhole warmcock's no-pvp-for-me offset over everything everyuthing #define MUTANT_PORNHUD_WINGS "wings","wingsopen","deco_wings","insect_wings","insect_fluff" #define MUTANT_PORNHUD_TAIL "tail", "tailwag", "mam_tail", "mam_tail_animated", "tail_lizard", "tail_human", "spines" ,"waggingtail_human" ,"waggingtail_lizard" ,"waggingspines" ,"mam_waggingtail", "xenotail" @@ -668,3 +670,7 @@ #define HOSTILES_ATTACK_UNTIL_THIS_FAR_INTO_CRIT 25 + +#define PVP_NEUTRAL "pvp_neutral" +#define PVP_YES "pvp_yes" +#define PVP_NO "pvp_no" diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index f1617948403..8e40eeb4a05 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -378,6 +378,8 @@ #define TRAIT_CLAM_LOVER "clam_lover" #define TRAIT_CLAM_FISHER "clam_fisher" +#define TRAIT_NO_PVP_EVER "no_pvp_ever" + // mobility flag traits // IN THE FUTURE, IT WOULD BE NICE TO DO SOMETHING SIMILAR TO https://github.com/tgstation/tgstation/pull/48923/files (ofcourse not nearly the same because I have my.. thoughts on it) // BUT FOR NOW, THESE ARE HOOKED TO DO update_mobility() VIA COMSIG IN living_mobility.dm diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm index a5939c5b558..92e294bb6a2 100644 --- a/code/_onclick/hud/_defines.dm +++ b/code/_onclick/hud/_defines.dm @@ -21,15 +21,21 @@ #define ui_inventory "WEST:6,SOUTH:3" //Pop-up inventory -#define ui_head "WEST:6,NORTH-5:1" -#define ui_glasses "WEST:6,SOUTH+8:1" -#define ui_mask "WEST:6,SOUTH+7:1" -#define ui_ears "WEST:6,SOUTH+6:1" -#define ui_neck "WEST:6,SOUTH+5:1" -#define ui_oclothing "WEST:6,SOUTH+4:1" -#define ui_gloves "WEST:6,SOUTH+3:1" -#define ui_iclothing "WEST:6,SOUTH+2:1" -#define ui_shoes "WEST:6,SOUTH+1:2" + +//top row +#define ui_head "WEST+1:8,SOUTH+3:11" +#define ui_glasses "WEST:6,SOUTH+3:11" +#define ui_ears "WEST+2:10,SOUTH+3:11" + +//middle row +#define ui_neck "WEST:6,SOUTH+2:9" +#define ui_mask "WEST+1:8,SOUTH+2:9" +#define ui_gloves "WEST+2:10,SOUTH+2:9" + +//bottom row +#define ui_oclothing "WEST+1:8,SOUTH+1:7" +#define ui_iclothing "WEST:6,SOUTH+1:7" +#define ui_shoes "WEST+2:10,SOUTH+1:7" //Middle left indicators #define ui_lingchemdisplay "WEST,CENTER-1:15" @@ -41,9 +47,9 @@ #define ui_sstore1 "WEST+1:6,SOUTH:3" #define ui_id "WEST+2:6,SOUTH:3" #define ui_belt "WEST+3:5,SOUTH:3" -#define ui_back "WEST+4:4,SOUTH:3" -#define ui_storage1 "WEST+5:4,SOUTH:3" -#define ui_storage2 "WEST+6,SOUTH:3" +#define ui_back "WEST+6,SOUTH:3" +#define ui_storage2 "WEST+4:4,SOUTH:3" +#define ui_storage1 "WEST+5:2,SOUTH:3" #define ui_resistdelay "WEST+7:16,SOUTH+1:17" #define ui_overridden_resist "WEST+7:16,SOUTH+1:1" #define ui_combat_toggle "WEST+7:16,SOUTH:2" @@ -59,12 +65,14 @@ #define ui_drop_throw "CENTER+2:33,SOUTH+0:4" #define ui_sprintbufferloc "CENTER+3:34,SOUTH:16" #define ui_movi "Center+3:33,SOUTH:4" -#define ui_zonesel "Center+5:2,SOUTH:3" +#define ui_zonesel "Center+5:2,SOUTH:3:1" #define ui_mood "Center-1:5,South+1:11" -#define ui_health "Center+0:0,South+1:0" +#define ui_healthdoll "Center+0:0,South+2:-19" +#define ui_health "Center+0:0,South+1:-2" #define ui_stamina "Center+0:27,South+1:18" // replacing internals button #define ui_questbook "CENTER+2:19,SOUTH+1:-12" #define ui_questscanner "CENTER+3:21,SOUTH+1:-12" +#define ui_pull_stop "CENTER+4:6,SOUTH+1:-11" /proc/ui_hand_position(i) //values based on old hand ui positions (CENTER:-/+16,SOUTH:5) var/x_off = -(!(i % 2)) @@ -111,7 +119,7 @@ //Lower right, persistent menu -#define ui_pull_stop "EAST-1:28,SOUTH+1:24" + @@ -132,11 +140,11 @@ //Middle right (status indicators) -#define ui_healthdoll "EAST-1:28, CENTER-1:13" #define ui_internal "EAST-1:28, SOUTH+3:11"//CIT CHANGE - moves internal icon up a little bit to accommodate for the stamina meter -#define ui_character_actions "EAST-1:28, SOUTH+1:2" -#define ui_bayou "EAST-1:28, SOUTH+0:2" //Character directory +#define ui_character_actions "EAST-1:28, SOUTH+1:2" +#define ui_bayou "EAST-1:28, SOUTH+0:2" //Character directory +#define ui_pvpbuttons "EAST-1:28, SOUTH+1:18" //slut directory //living #define ui_living_pull "EAST-1:28,CENTER-2:15" diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 538bf1a5112..b8965c4a516 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -6,8 +6,15 @@ // The default UI style is the first one in the list GLOBAL_LIST_INIT(available_ui_styles, list( - "Cludgey" = 'icons/mob/screen_clockwork.dmi', - + "Fallout" = 'icons/fallout/UI/screen_fallout2.dmi', // Fallout 2 Pip-boy style UI. Walk the wasteland with style. -Pebbles + "Darkout" = 'icons/fallout/UI/screen_fallout2_dark.dmi', // The original Fallout 2 pipboy UI, dark + "Midnight" = 'icons/mob/screen_midnight.dmi', + "Retro" = 'icons/mob/screen_retro.dmi', + "Plasmafire" = 'icons/mob/screen_plasmafire.dmi', + "Slimecore" = 'icons/mob/screen_slimecore.dmi', + "Operative" = 'icons/mob/screen_operative.dmi', + "Clockwork" = 'icons/mob/screen_clockwork.dmi', + "Minimal" = 'icons/mob/screen_minimal.dmi' )) /proc/ui_style2icon(ui_style) @@ -63,6 +70,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list( var/atom/movable/screen/aooc_hud_button var/atom/movable/screen/newbie_hud_button var/atom/movable/screen/chardir_hud_button + var/atom/movable/screen/pvp_focus_toggle/pvp_focus_toggle // subtypes can override this to force a specific UI style var/ui_style @@ -119,6 +127,10 @@ GLOBAL_LIST_INIT(available_ui_styles, list( down = null sleep_hud_button = null triage = null + aooc_hud_button = null + newbie_hud_button = null + chardir_hud_button = null + pvp_focus_toggle = null QDEL_LIST_ASSOC_VAL(plane_masters) QDEL_LIST(screenoverlays) diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 1e11a821ca9..8d975d9d45f 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -394,6 +394,10 @@ chardir_hud_button.hud = src infodisplay += chardir_hud_button + pvp_focus_toggle = new /atom/movable/screen/pvp_focus_toggle() + pvp_focus_toggle.hud = src + infodisplay += pvp_focus_toggle + pull_icon = new /atom/movable/screen/pull() pull_icon.icon = ui_style pull_icon.hud = src diff --git a/code/_onclick/hud/screen_objects/character_actions.dm b/code/_onclick/hud/screen_objects/character_actions.dm index cd6447e0ab4..075f37ce696 100644 --- a/code/_onclick/hud/screen_objects/character_actions.dm +++ b/code/_onclick/hud/screen_objects/character_actions.dm @@ -122,3 +122,57 @@ /atom/movable/screen/chardir_hud_button/Click(location,control,params) if(usr.client) usr.client.show_character_directory() + +/atom/movable/screen/pvp_focus_toggle + name = "PVP focus On/Off" + icon = 'icons/mob/screen_gen.dmi' + icon_state = "pvp_blank" + screen_loc = ui_pvpbuttons + var/mytobe + +/atom/movable/screen/pvp_focus_toggle/Initialize(mapload) + . = ..() + update_icon() + +/atom/movable/screen/pvp_focus_toggle/Click(location,control,params) + if(!usr.client || !ismob(usr)) + return + + var/changeto = PVP_NEUTRAL + var/_y = text2num(params2list(params)["icon-y"]) + if(_y>=25) // PVP focus on + if(HAS_TRAIT(usr, TRAIT_PVPFOC)) + changeto = PVP_NEUTRAL + else + if(HAS_TRAIT(usr, TRAIT_NO_PVP_EVER)) + to_chat(usr, span_alert("Your role/quirks/setup doesn't allow for PVP!")) + return + changeto = PVP_YES + else if(_y>=17) // PVP opt out on + if(HAS_TRAIT(usr, TRAIT_PVEFOC)) + changeto = PVP_NEUTRAL + else + changeto = PVP_NO + usr.SetPVPflag(changeto, TRUE) + +/atom/movable/screen/pvp_focus_toggle/proc/update_intento(towhat) + mytobe = towhat + update_icon() + +/atom/movable/screen/pvp_focus_toggle/update_overlays() + . = ..() + var/mutable_appearance/top = mutable_appearance('icons/mob/screen_gen.dmi') + var/mutable_appearance/bottom = mutable_appearance('icons/mob/screen_gen.dmi') + switch(mytobe) + if(PVP_NEUTRAL) + top.icon_state = "pvp_top_off" + bottom.icon_state = "pvp_bottom_off" + if(PVP_YES) + top.icon_state = "pvp_top_on" + bottom.icon_state = "pvp_bottom_off" + if(PVP_NO) + top.icon_state = "pvp_top_off" + bottom.icon_state = "pvp_bottom_on" + . += top + . += bottom + diff --git a/code/controllers/subsystem/artifacts.dm b/code/controllers/subsystem/artifacts.dm index 813b1a03a6f..b553818b820 100644 --- a/code/controllers/subsystem/artifacts.dm +++ b/code/controllers/subsystem/artifacts.dm @@ -20,7 +20,7 @@ PROCESSING_SUBSYSTEM_DEF(artifacts) ART_RARITY_UNIQUE = 0, ) - var/spawn_chance = 0.000000000000000000000000000000000000000001 // chance for an artifact to spawn per tick + var/spawn_chance = 0 // chance for an artifact to spawn per tick var/use_valid_ball_spawner_chance = 50 // chance for an artifact to use a valid ball spawner var/list/buffs_by_rarity = list( diff --git a/code/controllers/subsystem/pornhud.dm b/code/controllers/subsystem/pornhud.dm index c137b35858c..13760ee5c18 100644 --- a/code/controllers/subsystem/pornhud.dm +++ b/code/controllers/subsystem/pornhud.dm @@ -122,14 +122,14 @@ SUBSYSTEM_DEF(pornhud) var/datum/genital_images/GI = get_genital_datum(dork) if(!GI) return - GI.update_visibility(part, on_off) + return GI.update_visibility(part, on_off) /datum/controller/subsystem/pornhud/proc/get_layer(mob/living/carbon/human/dork, kind, position) if(!ishuman(dork)) return MOB_LAYER var/layer_out = dork.layer switch(kind) - if(PHUD_BUTT,PHUD_BOOB,PHUD_PENIS,PHUD_BALLS,PHUD_VAG,PHUD_BELLY) + if(PHUD_BUTT,PHUD_BOOB,PHUD_TALLYWHACKER,PHUD_BALLS,PHUD_VAG,PHUD_BELLY) layer_out += (GENITAL_LAYER_OFFSET * (position == "BEHIND" ? -1 : 1)) if(PHUD_SHIRT) layer_out += (SHIRT_LAYER_OFFSET * (position == "BEHIND" ? -1 : 1)) @@ -141,6 +141,8 @@ SUBSYSTEM_DEF(pornhud) layer_out += (WINGS_LAYER_OFFSET * (position == "BEHIND" ? -1 : 1)) if(MUTANT_PORNHUD_WINGS) layer_out += (TAIL_LAYER_OFFSET * (position == "BEHIND" ? -1 : 1)) + if(PHUD_PVP_FLAG) + layer_out += (pvp_flag_LAYER_OFFSET * (position == "BEHIND" ? -1 : 1)) return layer_out /datum/controller/subsystem/pornhud/proc/generate_key(mob/living/carbon/human/newnadhaver) @@ -151,7 +153,7 @@ SUBSYSTEM_DEF(pornhud) var/key = newnadhaver.ckey ? "[newnadhaver.ckey]-" : "stiff-" key += "[LAZYLEN(hoohaws) + 1]-" key += "[newnadhaver.real_name]-" - key += "[world.time]-bepis" + key += "[round(world.time)]-bepis" newnadhaver.pornhud_key = key return key @@ -203,6 +205,9 @@ SUBSYSTEM_DEF(pornhud) var/image/socks var/socks_visible = TRUE + var/image/pvp_flag + var/pvp_flag_visible = TRUE + /// if this is true, the player has changed their appearance since the last time we updated var/has_changed @@ -253,7 +258,7 @@ SUBSYSTEM_DEF(pornhud) images2change = butt if(PHUD_BOOB) images2change = breasts - if(PHUD_PENIS) + if(PHUD_TALLYWHACKER) images2change = peen if(PHUD_BALLS) images2change = balls @@ -271,6 +276,8 @@ SUBSYSTEM_DEF(pornhud) images2change = underpants if(PHUD_SOCKS) images2change = socks + if(PHUD_PVP_FLAG) + images2change = pvp_flag if(!LAZYLEN(images ^ images2change)) return // nothing changed switch(part) @@ -278,7 +285,7 @@ SUBSYSTEM_DEF(pornhud) butt = images if(PHUD_BOOB) breasts = images - if(PHUD_PENIS) + if(PHUD_TALLYWHACKER) peen = images if(PHUD_BALLS) balls = images @@ -296,54 +303,63 @@ SUBSYSTEM_DEF(pornhud) underpants = images if(PHUD_SOCKS) socks = images + if(PHUD_PVP_FLAG) + pvp_flag = images set_changed() /datum/genital_images/proc/update_visibility(part, on_off) + var/toggle = FALSE + if(isnull(on_off)) + toggle = TRUE switch(part) if(PHUD_BUTT) if(butt_visible == on_off) return - butt_visible = on_off + . = (butt_visible = (toggle ? !butt_visible : on_off)) if(PHUD_BOOB) if(breasts_visible == on_off) return - breasts_visible = on_off - if(PHUD_PENIS) + . = (breasts_visible = (toggle ? !breasts_visible : on_off)) + if(PHUD_TALLYWHACKER) if(peen_visible == on_off) return - peen_visible = on_off + . = (peen_visible = (toggle ? !peen_visible : on_off)) if(PHUD_BALLS) if(balls_visible == on_off) return - balls_visible = on_off + . = (balls_visible = (toggle ? !balls_visible : on_off)) if(PHUD_VAG) if(vag_visible == on_off) return - vag_visible = on_off + . = (vag_visible = (toggle ? !vag_visible : on_off)) if(PHUD_BELLY) if(belly_visible == on_off) return - belly_visible = on_off + . = (belly_visible = (toggle ? !belly_visible : on_off)) if(PHUD_TAIL) if(tail_visible == on_off) return - tail_visible = on_off + . = (tail_visible = (toggle ? !tail_visible : on_off)) if(PHUD_WINGS) if(wings_visible == on_off) return - wings_visible = on_off + . = (wings_visible = (toggle ? !wings_visible : on_off)) if(PHUD_SHIRT) if(shirt_visible == on_off) return - shirt_visible = on_off + . = (shirt_visible = (toggle ? !shirt_visible : on_off)) if(PHUD_PANTS) if(underpants_visible == on_off) return - underpants_visible = on_off + . = (underpants_visible = (toggle ? !underpants_visible : on_off)) if(PHUD_SOCKS) if(socks_visible == on_off) return - socks_visible = on_off + . = (socks_visible = (toggle ? !socks_visible : on_off)) + if(PHUD_PVP_FLAG) + if(pvp_flag_visible == on_off) + return + . = (pvp_flag_visible = (toggle ? !pvp_flag_visible : on_off)) set_changed() /datum/genital_images/proc/cache_images(list/imgs = list()) @@ -376,7 +392,7 @@ SUBSYSTEM_DEF(pornhud) seer.client.images += imgs[imglayer] /// The main proc that compiles and dispatches images -/// WE are showing THESE to SOMEONE ELSE +/// WE are showing THESE to SOMEONE ELSE. P is the preferences of the VIEWER /datum/genital_images/proc/get_all_images(datum/preferences/P) if(!P) return @@ -416,6 +432,8 @@ SUBSYSTEM_DEF(pornhud) all_images += underpants if(undershirt && shirt_visible) all_images += undershirt + if(pvp_flag && pvp_flag_visible) + all_images += pvp_flag var/list/imgsformatted = list() for(var/image/I in all_images) var/image/flat = imgsformatted["[I.layer]"] diff --git a/code/game/objects/effects/decals/turfdecal/markings.dm b/code/game/objects/effects/decals/turfdecal/markings.dm index 65ad1e493f9..22a12e970e6 100644 --- a/code/game/objects/effects/decals/turfdecal/markings.dm +++ b/code/game/objects/effects/decals/turfdecal/markings.dm @@ -158,6 +158,7 @@ /obj/effect/turf_decal/huge/heaven icon = 'icons/turf/decalshuge.dmi' icon_state = "heaven" + pixel_x = -18 /obj/effect/turf_decal/huge/massfusion icon = 'icons/turf/decalshuge.dmi' diff --git a/code/game/sound.dm b/code/game/sound.dm index 3cbd48ffdce..20200306c16 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -206,11 +206,11 @@ UNTIL(SSticker.login_music) //wait for SSticker init to set the login music if(prefs && (prefs.toggles & SOUND_LOBBY)) - SEND_SOUND(src, sound(SSticker.login_music, repeat = 0, wait = 0, volume = vol, channel = CHANNEL_LOBBYMUSIC)) // MAD JAMS + SEND_SOUND(src, sound(SSticker.login_music, repeat = 1, wait = 0, volume = vol, channel = CHANNEL_LOBBYMUSIC)) // MAD JAMS /client/proc/playbeginmusic(vol = 75) - SEND_SOUND(src, sound(SSticker.begin_music, repeat = 0, wait = 0, volume = vol, channel = CHANNEL_LOBBYMUSIC)) + SEND_SOUND(src, sound(SSticker.begin_music, repeat = 1, wait = 0, volume = vol, channel = CHANNEL_LOBBYMUSIC)) /proc/get_rand_frequency() return rand(32000, 55000) //Frequency stuff only works with 45kbps oggs. diff --git a/code/modules/arousal/organs/penis.dm b/code/modules/arousal/organs/penis.dm index 67ffb204a29..6d52ca4aa2e 100644 --- a/code/modules/arousal/organs/penis.dm +++ b/code/modules/arousal/organs/penis.dm @@ -21,7 +21,7 @@ var/diameter_ratio = COCK_DIAMETER_RATIO_DEF //0.25; check citadel_defines.dm associated_has = CS_PENIS // for cockstring stuff hide_flag = HIDE_PENIS // for hideflag stuff - pornhud_slot = PHUD_PENIS + pornhud_slot = PHUD_TALLYWHACKER /obj/item/organ/genital/penis/format_for_tgui() var/list/out = list() diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 7e4fb076724..2035e89e046 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -418,7 +418,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/side_waddle_time = 2 /// Button to switch from input bar to hotkey mode. - var/input_mode_hotkey = "Ctrl+Tab" + var/input_mode_hotkey = "Tab" /datum/preferences/New(client/C) parent = C diff --git a/code/modules/fallout/turf/walls.dm b/code/modules/fallout/turf/walls.dm index 14583a53890..75884d1d2b6 100644 --- a/code/modules/fallout/turf/walls.dm +++ b/code/modules/fallout/turf/walls.dm @@ -373,7 +373,6 @@ departing_mob.despawn() - /turf/closed/indestructible/f13/obsidian //Just like that one game studio that worked on the original game, or that block in Minecraft! name = "obsidian" desc = "No matter what you do with this rock, there's not even a scratch left on its surface.
You shall not pass!!!" diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 8129573a7fb..c153af31db7 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -66,7 +66,7 @@ output += "

(Fit Viewport)

" else output += "

View Character Directory

" - output += "

Come on down!

" + output += "

Join in!

" //output += "

[LINKIFY_READY("Observe", PLAYER_READY_TO_OBSERVE)]

" output += "

(Fix Chat Window)

" output += "

(Fit Viewport)

" diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index e0f7d70f0d1..3c3c0a9f483 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -138,6 +138,16 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) grant_all_languages() show_data_huds() data_huds_on = 1 + 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) + abandon_mob() + return + sleep(1 SECONDS) + INVOKE_ASYNC(src, PROC_REF(slam_dunk_to_main_menu)) /mob/dead/observer/get_photo_description(obj/item/camera/camera) if(!invisibility || camera.see_ghosts) @@ -278,7 +288,7 @@ Works together with spawning an observer, noted above. if(!key || key[1] == "@" || (sig_flags & COMPONENT_BLOCK_GHOSTING)) return //mob has no key, is an aghost or some component hijacked. stop_sound_channel(CHANNEL_HEARTBEAT) //Stop heartbeat sounds because You Are A Ghost Now - var/mob/dead/observer/ghost = new(get_turf(src), src) // Transfer safety to observer spawning proc. + var/mob/dead/observer/ghost = new(get_turf(src), src) // Transfer safety to observer spawning proc.7 SStgui.on_transfer(src, ghost) // Transfer NanoUIs. ghost.can_reenter_corpse = can_reenter_corpse || (sig_flags & COMPONENT_FREE_GHOSTING) if (client && client.prefs && client.prefs.auto_ooc) @@ -416,6 +426,11 @@ 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 /mob/dead/observer/verb/reenter_corpse() set category = "Ghost" diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index f2a03bb2146..55a258e73ea 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -3,7 +3,7 @@ /mob/living/carbon/Initialize() . = ..() - create_reagents(1000, NONE, NO_REAGENTS_VALUE) + create_reagents(100000, NONE, NO_REAGENTS_VALUE) // STIMPAK BUG ME NOT update_body_parts() //to update the carbon's new bodyparts appearance GLOB.carbon_list += src blood_volume = (BLOOD_VOLUME_NORMAL * blood_ratio) diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm index d34917540bf..6fd8d8ff728 100644 --- a/code/modules/mob/living/carbon/emote.dm +++ b/code/modules/mob/living/carbon/emote.dm @@ -939,3 +939,23 @@ to_chat(user, span_notice("Place this on your uniform to show your intent!")) else qdel(dtf) + + +/datum/emote/living/carbon/pvp_opt_out + key = "nopvp" + restraint_check = FALSE + +/datum/emote/living/carbon/pvp_opt_out/run_emote(mob/user) + . = ..() + if(HAS_TRAIT(user, TRAIT_PVEFOC)) + REMOVE_TRAIT(user, TRAIT_PVEFOC, ROUNDSTART_TRAIT) + else + ADD_TRAIT(user, TRAIT_PVEFOC, ROUNDSTART_TRAIT) + + SSpornhud.update_visibility(user, PHUD_PVP_FLAG, HAS_TRAIT(user, TRAIT_PVEFOC)) + if(HAS_TRAIT(user, TRAIT_PVEFOC)) + log_consent("[user] ([user.ckey]) has opted OPTED OUT of PVP!") + to_chat(user, span_notice("You have opted out of PVP.")) + else + log_consent("[user] ([user.ckey]) has OPTED BACK INTO PVP!") + to_chat(user, span_notice("You have opted back into PVP.")) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index a1eb95bdc4a..51ebb9fa914 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -620,8 +620,17 @@ GLOBAL_LIST_INIT(personalitytrait2description, list( . += "[print_special()]"//This already includes breaks and newlines, don't add any more + SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .) //This also handles flavor texts now + if(HAS_TRAIT(src, TRAIT_PVEFOC)) + . += span_boldwarning("[t_He] [t_has] opted out of PVP combat! Please respect their wishes and do not engage in PVP with them. If they are trying to PVP with you, please let the staff know!") + else if(!HAS_TRAIT(user, TRAIT_PVEFOC) && HAS_TRAIT(src, TRAIT_PVPFOC)) + . += span_alert("[t_He] [t_has] is looking for PVP encounters! If you're looking for a fight, they're the one to go to!") + + + . += span_green("Ctrl-Shift click me for [span_love("special interactions!~")]") + if(has_status_effect(STATUS_EFFECT_ADMINSLEEP)) . += span_danger("This player has been slept by staff.\n") diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index ee9ea435910..a95a67680d8 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1772,14 +1772,14 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) if(user.limb_destroyer) target.dismembering_strike(user, affecting.body_zone) - if(atk_verb == ATTACK_EFFECT_KICK)//kicks deal 1.5x raw damage + 0.5x stamina damage - target.apply_damage(damage*1.5, attack_type, affecting, armor_block) - target.apply_damage(damage*0.5, STAMINA, affecting, armor_block) - log_combat(user, target, "kicked") - else//other attacks deal full raw damage + 2x in stamina damage - target.apply_damage(damage, attack_type, affecting, armor_block) - target.apply_damage(damage*2, STAMINA, affecting, armor_block) - log_combat(user, target, "punched") + target.apply_damage(damage, STAMINA, affecting, armor_block) + log_combat(user, target, "punched") + // if(atk_verb == ATTACK_EFFECT_KICK)//kicks deal 1.5x raw damage + 0.5x stamina damage + // target.apply_damage(damage*1.5, attack_type, affecting, armor_block) + // target.apply_damage(damage*0.5, STAMINA, affecting, armor_block) + // log_combat(user, target, "kicked") + // else//other attacks deal full raw damage + 2x in stamina damage + // target.apply_damage(damage, attack_type, affecting, armor_block) if((target.stat != DEAD) && damage >= user.dna.species.punchstunthreshold) if((punchedstam > 50) && prob(punchedstam*0.5)) //If our punch victim has been hit above the threshold, and they have more than 50 stamina damage, roll for stun, probability of 1% per 2 stamina damage @@ -1794,11 +1794,11 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) target.forcesay(GLOB.hit_appends) log_combat(user, target, "got a stun punch with their previous punch") - if(HAS_TRAIT(user, TRAIT_KI_VAMPIRE) && !HAS_TRAIT(target, TRAIT_NOBREATH) && (punchedbrute < 100)) //If we're a ki vampire we also sap them of lifeforce, but only if they're not too beat up. Also living organics only. - user.adjustBruteLoss(-5) - user.adjustFireLoss(-5) - user.adjustStaminaLoss(-20) - target.adjustBruteLoss(20) + // if(HAS_TRAIT(user, TRAIT_KI_VAMPIRE) && !HAS_TRAIT(target, TRAIT_NOBREATH) && (punchedbrute < 100)) //If we're a ki vampire we also sap them of lifeforce, but only if they're not too beat up. Also living organics only. + // user.adjustBruteLoss(-5) + // user.adjustFireLoss(-5) + // user.adjustStaminaLoss(-20) + // target.adjustBruteLoss(20) else if(!(target.mobility_flags & MOBILITY_STAND)) target.forcesay(GLOB.hit_appends) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 6f86400fa8b..a45f93b2d55 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -616,3 +616,36 @@ It's fairly easy to fix if dealing with single letters but not so much with comp /mob/living/GetJob() if (mind && mind.assigned_role) return SSjob.GetJob(mind.assigned_role) + +/mob/proc/SetPVPflag(setto, saypls) + switch(setto) + if(PVP_NEUTRAL) + REMOVE_TRAIT(src, TRAIT_PVPFOC, ROUNDSTART_TRAIT) + REMOVE_TRAIT(src, TRAIT_PVEFOC, ROUNDSTART_TRAIT) + log_game("[key_name(src)] has removed their PVP flag.") + SSpornhud.catalogue_part(src, PHUD_PVP_FLAG, list()) + if(saypls) + to_chat(src, span_notice("You are no longer flagged as looking for or avoiding PVP. Standard PVP rules apply.")) + if(PVP_YES) + if(HAS_TRAIT(src, TRAIT_NO_PVP_EVER)) + return + ADD_TRAIT(src, TRAIT_PVPFOC, ROUNDSTART_TRAIT) + REMOVE_TRAIT(src, TRAIT_PVEFOC, ROUNDSTART_TRAIT) + log_game("[key_name(src)] has flagged themselves as looking for PVP.") + var/image/iggy = image('icons/mob/hud.dmi', src, "pvp_yes") + SSpornhud.catalogue_part(src, PHUD_PVP_FLAG, list(iggy)) + if(saypls) + to_chat(src, span_notice("You are now flagged as looking for PVP. Note that you still need to use CI to perform PVP, and \ + you must respect the preferences of those who do not want to PVP.")) + if(PVP_NO) + REMOVE_TRAIT(src, TRAIT_PVPFOC, ROUNDSTART_TRAIT) + ADD_TRAIT(src, TRAIT_PVEFOC, ROUNDSTART_TRAIT) + log_game("[key_name(src)] has opted out of PVP.") + var/image/iggy = image('icons/mob/hud.dmi', src, "pvp_no") + SSpornhud.catalogue_part(src, PHUD_PVP_FLAG, list(iggy)) + if(saypls) + to_chat(src, span_notice("You are now flagged as having opted out of PVP. This means that others are not allowed to engage \ + in PVP with you, nor try to bait you into PVP. This also means that you are not allowed to engage in PVP or do \ + things that could be considered baiting others into PVP.")) + if(hud_used && hud_used.pvp_focus_toggle) + hud_used.pvp_focus_toggle.update_intento(setto) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index c37ab8a1df2..7bd3b3f9332 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -2084,6 +2084,8 @@ /datum/reagent/medicine/music/on_mob_life(mob/living/carbon/M) . = ..() + if(volume > max_effect_at) + volume = max_effect_at if(!M.can_hear() && prob(5)) to_chat(M, span_alert("Boy you wish you could hear that. Probably sounds nice. Too bad you can't!")) return diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 1f0e7b96f7900fe6b99e607807b3108c091d3225..25a7eb970415af47d448964108bfb31665904a8b 100644 GIT binary patch delta 1716 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 diff --git a/icons/mob/screen_gen.dmi b/icons/mob/screen_gen.dmi index 89dd556ccf78ea4faf9b992130e964c7bae57d17..24701b6f4174e8cff1fef6e21b5eedbddd290975 100644 GIT binary patch delta 5830 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 delta 5197 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 O8$&%4-HMyekN*i%{9%~@