mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Fixes sofa paths
This commit is contained in:
Casey
CHOMPStation2
@@ -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"
|
||||
|
||||
@@ -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), \
|
||||
)),
|
||||
)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
"}
|
||||
|
||||
Reference in New Issue
Block a user