From 8bfa8b09abf8461d143a2331cb1b4aa107280a90 Mon Sep 17 00:00:00 2001 From: Casey Date: Fri, 18 Feb 2022 14:04:56 -0500 Subject: [PATCH 1/7] Fixes sofa paths --- .../structures/stool_bed_chair_nest/chairs.dm | 122 ++--- .../materials/materials/metals/steel_vr.dm | 60 +-- .../beach/submaps/speakeasy_vr.dmm | 461 ++++++++++++++++++ .../surface_submaps/wilderness/emptycabin.dmm | 330 +++++++++++++ 4 files changed, 882 insertions(+), 91 deletions(-) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 690164e265..5466582125 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -334,7 +334,7 @@ corner_piece = TRUE //color variations - +//Middle sofas first /obj/structure/bed/chair/sofa sofa_material = "carpet" @@ -379,92 +379,92 @@ /obj/structure/bed/chair/sofa/corner icon_state = "sofacorner" -/obj/structure/bed/chair/sofa/brown/left - icon_state = "sofaend_left" +/obj/structure/bed/chair/sofa/left/brown + sofa_material = "leather" -/obj/structure/bed/chair/sofa/brown/right - icon_state = "sofaend_right" +/obj/structure/bed/chair/sofa/right/brown + sofa_material = "leather" -/obj/structure/bed/chair/sofa/brown/corner - icon_state = "sofacorner" +/obj/structure/bed/chair/sofa/corner/brown + sofa_material = "leather" -/obj/structure/bed/chair/sofa/teal/left - icon_state = "sofaend_left" +/obj/structure/bed/chair/sofa/left/teal + sofa_material = "teal" -/obj/structure/bed/chair/sofa/teal/right - icon_state = "sofaend_right" +/obj/structure/bed/chair/sofa/right/teal + sofa_material = "teal" -/obj/structure/bed/chair/sofa/teal/corner - icon_state = "sofacorner" +/obj/structure/bed/chair/sofa/corner/teal + sofa_material = "teal" -/obj/structure/bed/chair/sofa/black/left - icon_state = "sofaend_left" +/obj/structure/bed/chair/sofa/left/black + sofa_material = "black" -/obj/structure/bed/chair/sofa/black/right - icon_state = "sofaend_right" +/obj/structure/bed/chair/sofa/right/black + sofa_material = "black" -/obj/structure/bed/chair/sofa/black/corner - icon_state = "sofacorner" +/obj/structure/bed/chair/sofa/corner/black + sofa_material = "black" -/obj/structure/bed/chair/sofa/green/left - icon_state = "sofaend_left" +/obj/structure/bed/chair/sofa/left/green + sofa_material = "green" -/obj/structure/bed/chair/sofa/green/right - icon_state = "sofaend_right" +/obj/structure/bed/chair/sofa/right/green + sofa_material = "green" -/obj/structure/bed/chair/sofa/green/corner - icon_state = "sofacorner" +/obj/structure/bed/chair/sofa/corner/green + sofa_material = "green" -/obj/structure/bed/chair/sofa/purp/left - icon_state = "sofaend_left" +/obj/structure/bed/chair/sofa/left/purp + sofa_material = "purple" -/obj/structure/bed/chair/sofa/purp/right - icon_state = "sofaend_right" +/obj/structure/bed/chair/sofa/right/purp + sofa_material = "purple" -/obj/structure/bed/chair/sofa/purp/corner - icon_state = "sofacorner" +/obj/structure/bed/chair/sofa/corner/purp + sofa_material = "purple" -/obj/structure/bed/chair/sofa/blue/left - icon_state = "sofaend_left" +/obj/structure/bed/chair/sofa/left/blue + sofa_material = "blue" -/obj/structure/bed/chair/sofa/blue/right - icon_state = "sofaend_right" +/obj/structure/bed/chair/sofa/right/blue + sofa_material = "blue" -/obj/structure/bed/chair/sofa/blue/corner - icon_state = "sofacorner" +/obj/structure/bed/chair/sofa/corner/blue + sofa_material = "blue" -/obj/structure/bed/chair/sofa/beige/left - icon_state = "sofaend_left" +/obj/structure/bed/chair/sofa/left/beige + sofa_material = "beige" -/obj/structure/bed/chair/sofa/beige/right - icon_state = "sofaend_right" +/obj/structure/bed/chair/sofa/right/beige + sofa_material = "beige" -/obj/structure/bed/chair/sofa/beige/corner - icon_state = "sofacorner" +/obj/structure/bed/chair/sofa/corner/beige + sofa_material = "beige" -/obj/structure/bed/chair/sofa/lime/left - icon_state = "sofaend_left" +/obj/structure/bed/chair/sofa/left/lime + sofa_material = "lime" -/obj/structure/bed/chair/sofa/lime/right - icon_state = "sofaend_right" +/obj/structure/bed/chair/sofa/right/lime + sofa_material = "lime" -/obj/structure/bed/chair/sofa/lime/corner - icon_state = "sofacorner" +/obj/structure/bed/chair/sofa/corner/lime + sofa_material = "lime" -/obj/structure/bed/chair/sofa/yellow/left - icon_state = "sofaend_left" +/obj/structure/bed/chair/sofa/left/yellow + sofa_material = "yellow" -/obj/structure/bed/chair/sofa/yellow/right - icon_state = "sofaend_right" +/obj/structure/bed/chair/sofa/right/yellow + sofa_material = "yellow" -/obj/structure/bed/chair/sofa/yellow/corner - icon_state = "sofacorner" +/obj/structure/bed/chair/sofa/corner/yellow + sofa_material = "yellow" -/obj/structure/bed/chair/sofa/orange/left - icon_state = "sofaend_left" +/obj/structure/bed/chair/sofa/left/orange + sofa_material = "orange" -/obj/structure/bed/chair/sofa/orange/right - icon_state = "sofaend_right" +/obj/structure/bed/chair/sofa/right/orange + sofa_material = "orange" -/obj/structure/bed/chair/sofa/orange/corner - icon_state = "sofacorner" +/obj/structure/bed/chair/sofa/corner/orange + sofa_material = "orange" diff --git a/code/modules/materials/materials/metals/steel_vr.dm b/code/modules/materials/materials/metals/steel_vr.dm index b112f36217..818b41beaa 100644 --- a/code/modules/materials/materials/metals/steel_vr.dm +++ b/code/modules/materials/materials/metals/steel_vr.dm @@ -39,44 +39,44 @@ new /datum/stack_recipe("red sofa right", /obj/structure/bed/chair/sofa/right, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("red sofa corner", /obj/structure/bed/chair/sofa/corner, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("brown sofa middle", /obj/structure/bed/chair/sofa/brown, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("brown sofa left", /obj/structure/bed/chair/sofa/brown/left, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("brown sofa right", /obj/structure/bed/chair/sofa/brown/right, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("brown sofa corner", /obj/structure/bed/chair/sofa/brown/corner, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("brown sofa left", /obj/structure/bed/chair/sofa/left/brown, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("brown sofa right", /obj/structure/bed/chair/sofa/right/brown, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("brown sofa corner", /obj/structure/bed/chair/sofa/corner/brown, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("teal sofa middle", /obj/structure/bed/chair/sofa/teal, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("teal sofa left", /obj/structure/bed/chair/sofa/teal/left, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("teal sofa right", /obj/structure/bed/chair/sofa/teal/right, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("teal sofa corner", /obj/structure/bed/chair/sofa/teal/corner, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("teal sofa left", /obj/structure/bed/chair/sofa/left/teal, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("teal sofa right", /obj/structure/bed/chair/sofa/right/teal, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("teal sofa corner", /obj/structure/bed/chair/sofa/corner/teal, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("black sofa middle", /obj/structure/bed/chair/sofa/black, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("black sofa left", /obj/structure/bed/chair/sofa/black/left, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("black sofa right", /obj/structure/bed/chair/sofa/black/right, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("black sofa corner", /obj/structure/bed/chair/sofa/black/corner, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("black sofa left", /obj/structure/bed/chair/sofa/left/black, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("black sofa right", /obj/structure/bed/chair/sofa/right/black, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("black sofa corner", /obj/structure/bed/chair/sofa/corner/black, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("green sofa middle", /obj/structure/bed/chair/sofa/green, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("green sofa left", /obj/structure/bed/chair/sofa/green/left, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("green sofa right", /obj/structure/bed/chair/sofa/green/right, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("green sofa corner", /obj/structure/bed/chair/sofa/green/corner, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("green sofa left", /obj/structure/bed/chair/sofa/left/green, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("green sofa right", /obj/structure/bed/chair/sofa/right/green, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("green sofa corner", /obj/structure/bed/chair/sofa/corner/green, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("purple sofa middle", /obj/structure/bed/chair/sofa/purp, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("purple sofa left", /obj/structure/bed/chair/sofa/purp/left, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("purple sofa right", /obj/structure/bed/chair/sofa/purp/right, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("purple sofa corner", /obj/structure/bed/chair/sofa/purp/corner, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("purple sofa left", /obj/structure/bed/chair/sofa/left/purp, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("purple sofa right", /obj/structure/bed/chair/sofa/right/purp, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("purple sofa corner", /obj/structure/bed/chair/sofa/corner/purp, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("blue sofa middle", /obj/structure/bed/chair/sofa/blue, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("blue sofa left", /obj/structure/bed/chair/sofa/blue/left, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("blue sofa right", /obj/structure/bed/chair/sofa/blue/right, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("blue sofa corner", /obj/structure/bed/chair/sofa/blue/corner, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("blue sofa left", /obj/structure/bed/chair/sofa/left/blue, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("blue sofa right", /obj/structure/bed/chair/sofa/right/blue, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("blue sofa corner", /obj/structure/bed/chair/sofa/corner/blue, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("beige sofa middle", /obj/structure/bed/chair/sofa/beige, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("beige sofa left", /obj/structure/bed/chair/sofa/beige/left, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("beige sofa right", /obj/structure/bed/chair/sofa/beige/right, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("beige sofa corner", /obj/structure/bed/chair/sofa/beige/corner, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("beige sofa left", /obj/structure/bed/chair/sofa/left/beige, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("beige sofa right", /obj/structure/bed/chair/sofa/right/beige, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("beige sofa corner", /obj/structure/bed/chair/sofa/corner/beige, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("lime sofa middle", /obj/structure/bed/chair/sofa/lime, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("lime sofa left", /obj/structure/bed/chair/sofa/lime/left, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("lime sofa right", /obj/structure/bed/chair/sofa/lime/right, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("lime sofa corner", /obj/structure/bed/chair/sofa/lime/corner, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("lime sofa left", /obj/structure/bed/chair/sofa/left/lime, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("lime sofa right", /obj/structure/bed/chair/sofa/right/lime, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("lime sofa corner", /obj/structure/bed/chair/sofa/corner/lime, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("yellow sofa middle", /obj/structure/bed/chair/sofa/yellow, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("yellow sofa left", /obj/structure/bed/chair/sofa/yellow/left, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("yellow sofa right", /obj/structure/bed/chair/sofa/yellow/right, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("yellow sofa corner", /obj/structure/bed/chair/sofa/yellow/corner, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("yellow sofa left", /obj/structure/bed/chair/sofa/left/yellow, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("yellow sofa right", /obj/structure/bed/chair/sofa/right/yellow, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("yellow sofa corner", /obj/structure/bed/chair/sofa/corner/yellow, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("orange sofa middle", /obj/structure/bed/chair/sofa/orange, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("orange sofa left", /obj/structure/bed/chair/sofa/orange/left, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("orange sofa right", /obj/structure/bed/chair/sofa/orange/right, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("orange sofa corner", /obj/structure/bed/chair/sofa/orange/corner, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("orange sofa left", /obj/structure/bed/chair/sofa/left/orange, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("orange sofa right", /obj/structure/bed/chair/sofa/right/orange, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("orange sofa corner", /obj/structure/bed/chair/sofa/corner/orange, 1, one_per_turf = 1, on_floor = 1), \ )), ) diff --git a/maps/expedition_vr/beach/submaps/speakeasy_vr.dmm b/maps/expedition_vr/beach/submaps/speakeasy_vr.dmm index d4e01a8df1..55b222bbfb 100644 --- a/maps/expedition_vr/beach/submaps/speakeasy_vr.dmm +++ b/maps/expedition_vr/beach/submaps/speakeasy_vr.dmm @@ -1,3 +1,4 @@ +<<<<<<< HEAD "a" = (/turf/template_noop,/area/submap/Speakeasy) "c" = (/turf/simulated/floor/carpet/turcarpet,/area/submap/Speakeasy) "f" = (/obj/structure/table/gamblingtable,/turf/simulated/floor/wood,/area/submap/Speakeasy) @@ -52,3 +53,463 @@ aawwwwBBBBsfLwwa aaaaawwowwwwwwaa aaaaaaCCCaaaaaaa "} +======= +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/submap/Speakeasy) +"c" = ( +/turf/simulated/floor/carpet/turcarpet, +/area/submap/Speakeasy) +"f" = ( +/obj/structure/table/gamblingtable, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"g" = ( +/obj/structure/bed/chair/wood{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"h" = ( +/obj/random/handgun, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"i" = ( +/obj/item/clothing/head/fedora, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"j" = ( +/obj/structure/bookcase, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"k" = ( +/obj/item/weapon/stool/padded, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"l" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/Speakeasy) +"m" = ( +/obj/structure/table/woodentable, +/obj/machinery/light/poi{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"n" = ( +/obj/structure/reagent_dispensers/beerkeg, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"o" = ( +/obj/structure/simple_door/wood, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"p" = ( +/obj/machinery/media/jukebox, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"s" = ( +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"u" = ( +/obj/structure/table/gamblingtable, +/obj/machinery/light/poi{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"v" = ( +/obj/structure/table/fancyblack, +/obj/item/clothing/mask/smokable/cigarette/cigar, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/Speakeasy) +"w" = ( +/turf/simulated/wall/wood, +/area/submap/Speakeasy) +"x" = ( +/obj/structure/bed/chair/sofa/left/blue{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"B" = ( +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"C" = ( +/turf/simulated/mineral/floor/cave, +/area/submap/Speakeasy) +"D" = ( +/obj/structure/bed/chair/sofa/corner/black{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"E" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 1 + }, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/Speakeasy) +"H" = ( +/obj/machinery/vending/boozeomat, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"I" = ( +/obj/structure/table/woodentable, +/obj/random/drinkbottle, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"K" = ( +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/neutral, +/area/submap/Speakeasy) +"L" = ( +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"M" = ( +/obj/machinery/light/poi{ + dir = 1 + }, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/Speakeasy) +"N" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"O" = ( +/obj/machinery/light/poi{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"R" = ( +/obj/structure/bed/chair/sofa/black{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"U" = ( +/obj/structure/bed/chair/sofa/right/blue{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"V" = ( +/obj/structure/table/woodentable, +/obj/machinery/chemical_dispenser/bar_soft/full{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"W" = ( +/obj/structure/bed/chair/wood, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"X" = ( +/obj/structure/table/woodentable, +/obj/machinery/chemical_dispenser/bar_alc/full, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"Y" = ( +/obj/structure/table/fancyblack, +/obj/random/cash/big, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/Speakeasy) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +w +w +w +w +w +w +w +w +w +w +w +a +a +a +a +"} +(3,1,1) = {" +a +w +n +i +h +w +X +B +V +B +p +w +w +w +a +a +"} +(4,1,1) = {" +a +w +n +B +B +w +H +B +N +k +B +x +D +w +a +a +"} +(5,1,1) = {" +a +w +w +j +j +w +w +B +I +k +B +f +R +w +a +a +"} +(6,1,1) = {" +a +w +B +B +B +B +w +O +N +k +B +f +U +w +w +a +"} +(7,1,1) = {" +a +w +M +Y +c +B +w +B +I +k +B +B +B +B +w +C +"} +(8,1,1) = {" +a +w +l +v +E +B +o +B +N +k +B +B +B +B +o +C +"} +(9,1,1) = {" +a +w +M +Y +c +B +w +B +N +k +B +B +B +B +w +C +"} +(10,1,1) = {" +a +w +B +B +B +B +w +B +I +k +B +B +B +B +w +a +"} +(11,1,1) = {" +a +w +w +w +w +w +w +B +B +B +K +K +K +s +w +a +"} +(12,1,1) = {" +a +a +w +f +g +B +B +B +B +B +K +K +K +f +w +a +"} +(13,1,1) = {" +a +a +w +L +B +W +N +N +g +B +K +K +K +L +w +a +"} +(14,1,1) = {" +a +a +w +w +B +W +m +N +g +B +W +u +g +w +w +a +"} +(15,1,1) = {" +a +a +a +w +w +w +w +w +w +w +w +w +w +w +a +a +"} +(16,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +>>>>>>> de8906e3154... Merge pull request #12247 from ktccd0/ktccd-dev-Corner-Sofa-Fix diff --git a/maps/submaps/surface_submaps/wilderness/emptycabin.dmm b/maps/submaps/surface_submaps/wilderness/emptycabin.dmm index 69161ff9f3..26de46d3b2 100644 --- a/maps/submaps/surface_submaps/wilderness/emptycabin.dmm +++ b/maps/submaps/surface_submaps/wilderness/emptycabin.dmm @@ -1,3 +1,4 @@ +<<<<<<< HEAD "a" = (/turf/template_noop,/area/template_noop) "b" = (/obj/effect/decal/cleanable/filth,/obj/item/weapon/bone/arm,/obj/item/weapon/bone/skull/unathi,/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) "c" = (/obj/structure/curtain/black,/obj/structure/simple_door/sifwood,/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) @@ -44,4 +45,333 @@ ODeDLIDQee CDeeiGJeea etteeeeeaa aaaaaaaaaa +======= +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/obj/effect/decal/cleanable/filth, +/obj/item/weapon/bone/arm, +/obj/item/weapon/bone/skull/unathi, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"c" = ( +/obj/structure/curtain/black, +/obj/structure/simple_door/sifwood, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"d" = ( +/obj/structure/closet/wardrobe, +/obj/item/weapon/material/fishing_rod/modern, +/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/weapon/storage/toolbox/lunchbox/nymph/filled, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"e" = ( +/turf/simulated/wall/sifwood, +/area/submap/EmptyCabin) +"f" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"g" = ( +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/purpledouble, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"i" = ( +/obj/structure/bed/chair/sofa/left/blue{ + dir = 1 + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"k" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/bed/chair/sofa/left{ + dir = 8 + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"l" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/bed/chair/sofa{ + dir = 8 + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"n" = ( +/obj/structure/table/sifwoodentable, +/obj/item/weapon/storage/fancy/candle_box, +/obj/item/weapon/paper/crumpled/bloody{ + info = "I found an otie while picking flowers today. He's so cute! I took him back home, and he seemed quite happy to share food with me. He really likes fish. Though, he never really seems to not be hungry..." + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"q" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/template_noop, +/area/submap/EmptyCabin) +"r" = ( +/obj/effect/landmark/loot_spawn/low, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"t" = ( +/obj/structure/railing/grey, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"y" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/curtain/black, +/obj/structure/grille/rustic, +/turf/simulated/floor/plating, +/area/submap/EmptyCabin) +"z" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "4" + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"A" = ( +/obj/structure/bonfire/permanent/sifwood, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/steel/techfloor, +/area/submap/EmptyCabin) +"B" = ( +/turf/template_noop, +/area/submap/EmptyCabin) +"C" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"D" = ( +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"F" = ( +/mob/living/simple_mob/otie/friendly/chubby{ + desc = "The classic bioengineered longdog. This one still probably won't tolerate you. What an absolute unit"; + faction = "spiders"; + max_co2 = 0; + max_tox = 0 + }, +/obj/effect/decal/cleanable/blood, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"G" = ( +/obj/structure/bed/chair/sofa/blue{ + dir = 1 + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"I" = ( +/obj/structure/table/sifwoodentable, +/obj/item/pizzabox/meat, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"J" = ( +/obj/structure/bed/chair/sofa/right/blue{ + dir = 1 + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"L" = ( +/obj/structure/table/sifwoodentable, +/obj/item/weapon/flame/candle/candelabra, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"M" = ( +/obj/item/weapon/bone/leg, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"O" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/bed/chair/sofa/right{ + dir = 8 + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"Q" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "5" + }, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "3" + }, +/obj/effect/decal/cleanable/blood, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"R" = ( +/obj/structure/loot_pile/surface, +/turf/template_noop, +/area/template_noop) +"T" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/template_noop, +/area/submap/EmptyCabin) +"V" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "5" + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"W" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"X" = ( +/obj/item/weapon/bone, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"Z" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "3" + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) + +(1,1,1) = {" +a +q +e +k +l +l +O +C +e +a +"} +(2,1,1) = {" +a +B +D +D +D +D +D +D +t +a +"} +(3,1,1) = {" +a +T +f +e +e +c +e +e +t +a +"} +(4,1,1) = {" +a +a +e +e +b +M +D +e +e +a +"} +(5,1,1) = {" +a +a +e +g +F +X +L +i +e +a +"} +(6,1,1) = {" +a +a +y +n +W +D +I +G +e +a +"} +(7,1,1) = {" +a +a +e +d +Z +r +D +J +e +a +"} +(8,1,1) = {" +a +a +e +e +z +V +Q +e +e +a +"} +(9,1,1) = {" +a +a +R +e +e +A +e +e +a +a +"} +(10,1,1) = {" +a +a +a +R +e +e +e +a +a +a +>>>>>>> de8906e3154... Merge pull request #12247 from ktccd0/ktccd-dev-Corner-Sofa-Fix "} From 32f573d13228a9f33bb73a3cf733af4ac78beaa3 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sat, 19 Feb 2022 18:27:39 -0500 Subject: [PATCH 2/7] powder that makes you say yes --- .../surface_submaps/wilderness/emptycabin.dmm | 335 +----------------- 1 file changed, 3 insertions(+), 332 deletions(-) diff --git a/maps/submaps/surface_submaps/wilderness/emptycabin.dmm b/maps/submaps/surface_submaps/wilderness/emptycabin.dmm index 26de46d3b2..f6f31f818e 100644 --- a/maps/submaps/surface_submaps/wilderness/emptycabin.dmm +++ b/maps/submaps/surface_submaps/wilderness/emptycabin.dmm @@ -1,4 +1,4 @@ -<<<<<<< HEAD +<<<<<<< HEAD "a" = (/turf/template_noop,/area/template_noop) "b" = (/obj/effect/decal/cleanable/filth,/obj/item/weapon/bone/arm,/obj/item/weapon/bone/skull/unathi,/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) "c" = (/obj/structure/curtain/black,/obj/structure/simple_door/sifwood,/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) @@ -6,7 +6,7 @@ "e" = (/turf/simulated/wall/sifwood,/area/submap/EmptyCabin) "f" = (/obj/structure/railing/grey{dir = 1},/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) "g" = (/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/purpledouble,/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) -"i" = (/obj/structure/bed/chair/sofa/blue/right{dir = 1},/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) +"i" = (/obj/structure/bed/chair/sofa/right/blue{dir = 1},/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) "k" = (/obj/structure/railing/grey{dir = 8},/obj/structure/bed/chair/oldsofa/right{dir = 8},/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) "l" = (/obj/structure/railing/grey{dir = 8},/obj/structure/bed/chair/oldsofa{dir = 8},/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) "n" = (/obj/structure/table/sifwoodentable,/obj/item/weapon/storage/fancy/candle_box,/obj/item/weapon/paper/crumpled/bloody{info = "I found an otie while picking flowers today. He's so cute! I took him back home, and he seemed quite happy to share food with me. He really likes fish. Though, he never really seems to not be hungry..."},/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) @@ -22,7 +22,7 @@ "F" = (/mob/living/simple_mob/otie/friendly/chubby{desc = "The classic bioengineered longdog. This one still probably won't tolerate you. What an absolute unit"; faction = "spiders"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) "G" = (/obj/structure/bed/chair/sofa/blue{dir = 1},/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) "I" = (/obj/structure/table/sifwoodentable,/obj/item/pizzabox/meat,/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) -"J" = (/obj/structure/bed/chair/sofa/blue/left{dir = 1},/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) +"J" = (/obj/structure/bed/chair/sofa/left/blue{dir = 1},/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) "L" = (/obj/structure/table/sifwoodentable,/obj/item/weapon/flame/candle/candelabra,/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) "M" = (/obj/item/weapon/bone/leg,/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) "O" = (/obj/structure/railing/grey{dir = 8},/obj/structure/bed/chair/oldsofa/left{dir = 8},/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) @@ -45,333 +45,4 @@ ODeDLIDQee CDeeiGJeea etteeeeeaa aaaaaaaaaa -======= -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/effect/decal/cleanable/filth, -/obj/item/weapon/bone/arm, -/obj/item/weapon/bone/skull/unathi, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"c" = ( -/obj/structure/curtain/black, -/obj/structure/simple_door/sifwood, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"d" = ( -/obj/structure/closet/wardrobe, -/obj/item/weapon/material/fishing_rod/modern, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/lunchbox/nymph/filled, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"e" = ( -/turf/simulated/wall/sifwood, -/area/submap/EmptyCabin) -"f" = ( -/obj/structure/railing/grey{ - dir = 1 - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"g" = ( -/obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/purpledouble, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"i" = ( -/obj/structure/bed/chair/sofa/left/blue{ - dir = 1 - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"k" = ( -/obj/structure/railing/grey{ - dir = 8 - }, -/obj/structure/bed/chair/sofa/left{ - dir = 8 - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"l" = ( -/obj/structure/railing/grey{ - dir = 8 - }, -/obj/structure/bed/chair/sofa{ - dir = 8 - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"n" = ( -/obj/structure/table/sifwoodentable, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/paper/crumpled/bloody{ - info = "I found an otie while picking flowers today. He's so cute! I took him back home, and he seemed quite happy to share food with me. He really likes fish. Though, he never really seems to not be hungry..." - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"q" = ( -/obj/structure/railing/grey{ - dir = 4 - }, -/turf/template_noop, -/area/submap/EmptyCabin) -"r" = ( -/obj/effect/landmark/loot_spawn/low, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"t" = ( -/obj/structure/railing/grey, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"y" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/curtain/black, -/obj/structure/grille/rustic, -/turf/simulated/floor/plating, -/area/submap/EmptyCabin) -"z" = ( -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "4" - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"A" = ( -/obj/structure/bonfire/permanent/sifwood, -/obj/structure/railing/grey{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/steel/techfloor, -/area/submap/EmptyCabin) -"B" = ( -/turf/template_noop, -/area/submap/EmptyCabin) -"C" = ( -/obj/structure/railing/grey{ - dir = 8 - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"D" = ( -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"F" = ( -/mob/living/simple_mob/otie/friendly/chubby{ - desc = "The classic bioengineered longdog. This one still probably won't tolerate you. What an absolute unit"; - faction = "spiders"; - max_co2 = 0; - max_tox = 0 - }, -/obj/effect/decal/cleanable/blood, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"G" = ( -/obj/structure/bed/chair/sofa/blue{ - dir = 1 - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"I" = ( -/obj/structure/table/sifwoodentable, -/obj/item/pizzabox/meat, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"J" = ( -/obj/structure/bed/chair/sofa/right/blue{ - dir = 1 - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"L" = ( -/obj/structure/table/sifwoodentable, -/obj/item/weapon/flame/candle/candelabra, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"M" = ( -/obj/item/weapon/bone/leg, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"O" = ( -/obj/structure/railing/grey{ - dir = 8 - }, -/obj/structure/bed/chair/sofa/right{ - dir = 8 - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"Q" = ( -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "5" - }, -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "2" - }, -/obj/effect/decal/cleanable/blood/drip, -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "3" - }, -/obj/effect/decal/cleanable/blood, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"R" = ( -/obj/structure/loot_pile/surface, -/turf/template_noop, -/area/template_noop) -"T" = ( -/obj/structure/railing/grey{ - dir = 8 - }, -/turf/template_noop, -/area/submap/EmptyCabin) -"V" = ( -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "5" - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"W" = ( -/obj/effect/decal/cleanable/blood/drip, -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "2" - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"X" = ( -/obj/item/weapon/bone, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"Z" = ( -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "3" - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) - -(1,1,1) = {" -a -q -e -k -l -l -O -C -e -a -"} -(2,1,1) = {" -a -B -D -D -D -D -D -D -t -a -"} -(3,1,1) = {" -a -T -f -e -e -c -e -e -t -a -"} -(4,1,1) = {" -a -a -e -e -b -M -D -e -e -a -"} -(5,1,1) = {" -a -a -e -g -F -X -L -i -e -a -"} -(6,1,1) = {" -a -a -y -n -W -D -I -G -e -a -"} -(7,1,1) = {" -a -a -e -d -Z -r -D -J -e -a -"} -(8,1,1) = {" -a -a -e -e -z -V -Q -e -e -a -"} -(9,1,1) = {" -a -a -R -e -e -A -e -e -a -a -"} -(10,1,1) = {" -a -a -a -R -e -e -e -a -a -a ->>>>>>> de8906e3154... Merge pull request #12247 from ktccd0/ktccd-dev-Corner-Sofa-Fix "} From 9aee9be9f095dc6f02f4754e7f151db99910fda9 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sat, 19 Feb 2022 18:37:47 -0500 Subject: [PATCH 3/7] powder that makes you say yes --- maps/southern_cross/southern_cross-2.dmm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/maps/southern_cross/southern_cross-2.dmm b/maps/southern_cross/southern_cross-2.dmm index 902c2c79e2..d31cb072d7 100644 --- a/maps/southern_cross/southern_cross-2.dmm +++ b/maps/southern_cross/southern_cross-2.dmm @@ -5721,7 +5721,7 @@ "guC" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/shield_diffuser,/obj/machinery/door/airlock/external{frequency = null; icon_state = "door_locked"; id_tag = null; locked = 1; name = "Dock Three External Airlock"; req_access = list(13)},/obj/effect/map_helper/airlock/door/ext_door,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D3) "gvF" = (/obj/machinery/door/firedoor/glass,/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/medical/patient_wing) "gwp" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/wood,/area/crew_quarters/cafeteria) -"gyw" = (/obj/structure/bed/chair/sofa/blue/left{dir = 1},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/paleblue/border,/obj/machinery/vending/wallmed1{pixel_y = -30},/turf/simulated/floor/tiled,/area/medical/medbay2) +"gyw" = (/obj/structure/bed/chair/sofa/left/blue{dir = 1},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/paleblue/border,/obj/machinery/vending/wallmed1{pixel_y = -30},/turf/simulated/floor/tiled,/area/medical/medbay2) "gyA" = (/obj/machinery/cryopod{dir = 1},/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/light{dir = 8},/turf/simulated/shuttle/floor,/area/shuttle/cryo/station) "gyT" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/obj/machinery/computer/timeclock/premade/south,/turf/simulated/floor/tiled,/area/hallway/primary/seconddeck/dockhallway) "gzN" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/extinguisher_cabinet{pixel_x = 28},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3) @@ -5860,7 +5860,7 @@ "hTs" = (/obj/effect/floor_decal/spline/plain{dir = 4},/turf/simulated/wall,/area/library) "hTx" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; id_tag = null},/obj/effect/floor_decal/industrial/warning{dir = 5},/obj/effect/map_helper/airlock/atmos/chamber_pump,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2) "hUh" = (/obj/machinery/atmospherics/pipe/simple/hidden,/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2) -"hUM" = (/obj/structure/bed/chair/sofa/brown/right{dir = 8},/turf/simulated/floor/carpet/oracarpet,/area/library) +"hUM" = (/obj/structure/bed/chair/sofa/right/brown{dir = 8},/turf/simulated/floor/carpet/oracarpet,/area/library) "hUO" = (/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/seconddeck/gym) "hVh" = (/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/maintenance/bar) "hVH" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/medbay) @@ -6025,7 +6025,7 @@ "jRr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/multi_tile/glass{name = "Central Access"},/obj/machinery/door/firedoor/multi_tile/glass,/turf/simulated/floor/tiled/steel_grid,/area/hallway/secondary/docking_hallway2) "jRW" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/hallway/secondary/entry/D1) "jSi" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1) -"jSR" = (/obj/structure/bed/chair/sofa/blue/corner{dir = 1},/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/paleblue/border{dir = 10},/obj/item/device/radio/intercom/department/medbay{dir = 8; pixel_x = -21},/turf/simulated/floor/tiled,/area/medical/medbay2) +"jSR" = (/obj/structure/bed/chair/sofa/corner/blue{dir = 1},/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/paleblue/border{dir = 10},/obj/item/device/radio/intercom/department/medbay{dir = 8; pixel_x = -21},/turf/simulated/floor/tiled,/area/medical/medbay2) "jUw" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/cargo) "jUx" = (/obj/machinery/smartfridge/drinks,/obj/machinery/light{dir = 1},/turf/simulated/floor/lino,/area/crew_quarters/bar) "jVL" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/ai_status_display{pixel_y = 32},/turf/simulated/floor/tiled/dark,/area/medical/medbay_emt_bay) @@ -6051,7 +6051,7 @@ "khA" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/paleblue/border{dir = 4},/obj/effect/floor_decal/borderfloorwhite/corner2{dir = 5},/obj/effect/floor_decal/corner/paleblue/bordercorner2{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/ward) "khW" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/maintenance/cargo) "kjb" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/paleblue/border{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/medbay2) -"kjR" = (/obj/structure/bed/chair/sofa/blue/left{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/paleblue/border{dir = 8},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "screen"; pixel_x = -32},/turf/simulated/floor/tiled,/area/medical/medbay2) +"kjR" = (/obj/structure/bed/chair/sofa/left/blue{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/paleblue/border{dir = 8},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "screen"; pixel_x = -32},/turf/simulated/floor/tiled,/area/medical/medbay2) "klh" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/turf/simulated/floor/grass,/area/hallway/primary/seconddeck/ascenter) "klK" = (/obj/item/toy/eight_ball,/obj/structure/table/bench/glass,/turf/simulated/floor/carpet/sblucarpet,/area/medical/medbay2) "kmj" = (/obj/structure/table/glass,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/docking_hallway2) @@ -6235,7 +6235,7 @@ "mgk" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/medical,/obj/structure/curtain/open/privacy,/obj/effect/floor_decal/borderfloorwhite{dir = 5},/obj/effect/floor_decal/corner/paleblue/border{dir = 5},/obj/machinery/ai_status_display{pixel_y = 32},/turf/simulated/floor/tiled/white,/area/medical/ward) "mgO" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/wood,/area/library) "mif" = (/obj/structure/closet/emcloset,/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1) -"mij" = (/obj/structure/bed/chair/sofa/brown/left{dir = 8},/turf/simulated/floor/carpet/oracarpet,/area/library) +"mij" = (/obj/structure/bed/chair/sofa/left/brown{dir = 8},/turf/simulated/floor/carpet/oracarpet,/area/library) "miQ" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 8; frequency = 1379; id_tag = "crg_aft_pump"},/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/simulated/floor,/area/maintenance/cargo) "miS" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume,/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/machinery/airlock_sensor{dir = 1; frequency = 1380; id_tag = "escape_dock_north_sensor"; pixel_y = -27},/obj/effect/map_helper/airlock/atmos/chamber_pump,/obj/effect/map_helper/airlock/sensor/chamber_sensor,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D1) "mlF" = (/obj/structure/bed/chair/comfy/brown{dir = 1},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/brown/border{dir = 8},/turf/simulated/floor/tiled,/area/quartermaster/office) From e40eab31cb0284e2394b7a98f047842784d1bf84 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sat, 19 Feb 2022 18:48:47 -0500 Subject: [PATCH 4/7] powder that makes you say yes --- maps/submaps/surface_submaps/wilderness/emptycabin.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/maps/submaps/surface_submaps/wilderness/emptycabin.dmm b/maps/submaps/surface_submaps/wilderness/emptycabin.dmm index f6f31f818e..5c6c91f093 100644 --- a/maps/submaps/surface_submaps/wilderness/emptycabin.dmm +++ b/maps/submaps/surface_submaps/wilderness/emptycabin.dmm @@ -1,4 +1,3 @@ -<<<<<<< HEAD "a" = (/turf/template_noop,/area/template_noop) "b" = (/obj/effect/decal/cleanable/filth,/obj/item/weapon/bone/arm,/obj/item/weapon/bone/skull/unathi,/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) "c" = (/obj/structure/curtain/black,/obj/structure/simple_door/sifwood,/turf/simulated/floor/wood/sif,/area/submap/EmptyCabin) From 2b45c4428a585e1a12b6167d9da0c42137de715f Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sat, 19 Feb 2022 19:00:31 -0500 Subject: [PATCH 5/7] powder that makes you say yes --- .../beach/submaps/speakeasy_vr.dmm | 57 ------------------- 1 file changed, 57 deletions(-) diff --git a/maps/expedition_vr/beach/submaps/speakeasy_vr.dmm b/maps/expedition_vr/beach/submaps/speakeasy_vr.dmm index 55b222bbfb..a817bd965c 100644 --- a/maps/expedition_vr/beach/submaps/speakeasy_vr.dmm +++ b/maps/expedition_vr/beach/submaps/speakeasy_vr.dmm @@ -1,59 +1,3 @@ -<<<<<<< HEAD -"a" = (/turf/template_noop,/area/submap/Speakeasy) -"c" = (/turf/simulated/floor/carpet/turcarpet,/area/submap/Speakeasy) -"f" = (/obj/structure/table/gamblingtable,/turf/simulated/floor/wood,/area/submap/Speakeasy) -"g" = (/obj/structure/bed/chair/wood{dir = 1},/turf/simulated/floor/wood,/area/submap/Speakeasy) -"h" = (/obj/random/handgun,/turf/simulated/floor/wood,/area/submap/Speakeasy) -"i" = (/obj/item/clothing/head/fedora,/turf/simulated/floor/wood,/area/submap/Speakeasy) -"j" = (/obj/structure/bookcase,/turf/simulated/floor/wood,/area/submap/Speakeasy) -"k" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/wood,/area/submap/Speakeasy) -"l" = (/obj/structure/bed/chair/comfy/black,/turf/simulated/floor/carpet/turcarpet,/area/submap/Speakeasy) -"m" = (/obj/structure/table/woodentable,/obj/machinery/light/poi{dir = 4},/turf/simulated/floor/wood,/area/submap/Speakeasy) -"n" = (/obj/structure/reagent_dispensers/beerkeg,/turf/simulated/floor/wood,/area/submap/Speakeasy) -"o" = (/obj/structure/simple_door/wood,/turf/simulated/floor/wood,/area/submap/Speakeasy) -"p" = (/obj/machinery/media/jukebox,/turf/simulated/floor/wood,/area/submap/Speakeasy) -"s" = (/obj/structure/bed/chair/wood{dir = 4},/turf/simulated/floor/wood,/area/submap/Speakeasy) -"u" = (/obj/structure/table/gamblingtable,/obj/machinery/light/poi{dir = 4},/turf/simulated/floor/wood,/area/submap/Speakeasy) -"v" = (/obj/structure/table/fancyblack,/obj/item/clothing/mask/smokable/cigarette/cigar,/turf/simulated/floor/carpet/turcarpet,/area/submap/Speakeasy) -"w" = (/turf/simulated/wall/wood,/area/submap/Speakeasy) -"x" = (/obj/structure/bed/chair/sofa/blue/left{dir = 4},/turf/simulated/floor/wood,/area/submap/Speakeasy) -"B" = (/turf/simulated/floor/wood,/area/submap/Speakeasy) -"C" = (/turf/simulated/mineral/floor/cave,/area/submap/Speakeasy) -"D" = (/obj/structure/bed/chair/sofa/black/corner{dir = 4},/turf/simulated/floor/wood,/area/submap/Speakeasy) -"E" = (/obj/structure/bed/chair/comfy/black{dir = 1},/turf/simulated/floor/carpet/turcarpet,/area/submap/Speakeasy) -"H" = (/obj/machinery/vending/boozeomat,/turf/simulated/floor/wood,/area/submap/Speakeasy) -"I" = (/obj/structure/table/woodentable,/obj/random/drinkbottle,/turf/simulated/floor/wood,/area/submap/Speakeasy) -"K" = (/obj/effect/floor_decal/corner/black/diagonal,/turf/simulated/floor/tiled/neutral,/area/submap/Speakeasy) -"L" = (/obj/structure/bed/chair/wood{dir = 8},/turf/simulated/floor/wood,/area/submap/Speakeasy) -"M" = (/obj/machinery/light/poi{dir = 1},/turf/simulated/floor/carpet/turcarpet,/area/submap/Speakeasy) -"N" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/submap/Speakeasy) -"O" = (/obj/machinery/light/poi{dir = 1},/turf/simulated/floor/wood,/area/submap/Speakeasy) -"R" = (/obj/structure/bed/chair/sofa/black{dir = 1},/turf/simulated/floor/wood,/area/submap/Speakeasy) -"U" = (/obj/structure/bed/chair/sofa/blue/right{dir = 1},/turf/simulated/floor/wood,/area/submap/Speakeasy) -"V" = (/obj/structure/table/woodentable,/obj/machinery/chemical_dispenser/bar_soft/full{dir = 1},/turf/simulated/floor/wood,/area/submap/Speakeasy) -"W" = (/obj/structure/bed/chair/wood,/turf/simulated/floor/wood,/area/submap/Speakeasy) -"X" = (/obj/structure/table/woodentable,/obj/machinery/chemical_dispenser/bar_alc/full,/turf/simulated/floor/wood,/area/submap/Speakeasy) -"Y" = (/obj/structure/table/fancyblack,/obj/random/cash/big,/turf/simulated/floor/carpet/turcarpet,/area/submap/Speakeasy) - -(1,1,1) = {" -aaaaaaaaaaaaaaaa -awwwwwwwwwwaaaaa -awnnwBMlMBwwwwaa -awiBjBYvYBwfLwwa -awhBjBcEcBwgBBwa -awwwwBBBBBwBWWwa -awXHwwwowwwBNmwa -awBBBOBBBBBBNNwa -awVNININNIBBggwa -awBkkkkkkkBBBBwa -awpBBBBBBBKKKWwa -awwxffBBBBKKKuwa -aawDRUBBBBKKKgwa -aawwwwBBBBsfLwwa -aaaaawwowwwwwwaa -aaaaaaCCCaaaaaaa -"} -======= //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/template_noop, @@ -512,4 +456,3 @@ a a a "} ->>>>>>> de8906e3154... Merge pull request #12247 from ktccd0/ktccd-dev-Corner-Sofa-Fix From 029dc40a1e4ba0c482ea7b6d42e12a80f5ffd036 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sat, 19 Feb 2022 19:35:54 -0500 Subject: [PATCH 7/7] WHY ARE THERE TWO COPIES OF THIS FILE --- maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm b/maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm index 6d6cc6cdbb..785dc57cc6 100644 --- a/maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm +++ b/maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm @@ -15,10 +15,10 @@ "u" = (/obj/structure/table/gamblingtable,/obj/machinery/light/poi{dir = 4},/turf/simulated/floor/wood,/area/submap/Speakeasy) "v" = (/obj/structure/table/fancyblack,/obj/item/clothing/mask/smokable/cigarette/cigar,/turf/simulated/floor/carpet/turcarpet,/area/submap/Speakeasy) "w" = (/turf/simulated/wall/wood,/area/submap/Speakeasy) -"x" = (/obj/structure/bed/chair/sofa/blue/left{dir = 4},/turf/simulated/floor/wood,/area/submap/Speakeasy) +"x" = (/obj/structure/bed/chair/sofa/left/blue{dir = 4},/turf/simulated/floor/wood,/area/submap/Speakeasy) "B" = (/turf/simulated/floor/wood,/area/submap/Speakeasy) "C" = (/turf/simulated/mineral/floor/cave,/area/submap/Speakeasy) -"D" = (/obj/structure/bed/chair/sofa/black/corner{dir = 4},/turf/simulated/floor/wood,/area/submap/Speakeasy) +"D" = (/obj/structure/bed/chair/sofa/corner/black{dir = 4},/turf/simulated/floor/wood,/area/submap/Speakeasy) "E" = (/obj/structure/bed/chair/comfy/black{dir = 1},/turf/simulated/floor/carpet/turcarpet,/area/submap/Speakeasy) "H" = (/obj/machinery/vending/boozeomat,/turf/simulated/floor/wood,/area/submap/Speakeasy) "I" = (/obj/structure/table/woodentable,/obj/random/drinkbottle,/turf/simulated/floor/wood,/area/submap/Speakeasy) @@ -28,7 +28,7 @@ "N" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/submap/Speakeasy) "O" = (/obj/machinery/light/poi{dir = 1},/turf/simulated/floor/wood,/area/submap/Speakeasy) "R" = (/obj/structure/bed/chair/sofa/black{dir = 1},/turf/simulated/floor/wood,/area/submap/Speakeasy) -"U" = (/obj/structure/bed/chair/sofa/blue/right{dir = 1},/turf/simulated/floor/wood,/area/submap/Speakeasy) +"U" = (/obj/structure/bed/chair/sofa/right/blue{dir = 1},/turf/simulated/floor/wood,/area/submap/Speakeasy) "V" = (/obj/structure/table/woodentable,/obj/machinery/chemical_dispenser/bar_soft/full{dir = 1},/turf/simulated/floor/wood,/area/submap/Speakeasy) "W" = (/obj/structure/bed/chair/wood,/turf/simulated/floor/wood,/area/submap/Speakeasy) "X" = (/obj/structure/table/woodentable,/obj/machinery/chemical_dispenser/bar_alc/full,/turf/simulated/floor/wood,/area/submap/Speakeasy)