diff --git a/_maps/map_files/coyote_bayou/foxybar.dmm b/_maps/map_files/coyote_bayou/foxybar.dmm index 1b735701c7..e0d19c51aa 100644 --- a/_maps/map_files/coyote_bayou/foxybar.dmm +++ b/_maps/map_files/coyote_bayou/foxybar.dmm @@ -270,9 +270,14 @@ }, /area/f13/fb/bar) "blw" = ( -/obj/effect/decal/marking, +/obj/item/toy/tennis/blue{ + density = 1; + mouse_opacity = 0; + alpha = 0; + anchored = 1 + }, /obj/vehicle/sealed/car/truck{ - pixel_x = -9; + pixel_x = -42; dir = 2; pixel_y = -7; plane = -2 @@ -6811,7 +6816,7 @@ eBd cuN gzw qwR -blw +fUR uWY uWY uWY @@ -6928,7 +6933,7 @@ dfJ fdf eYJ eYJ -eYJ +blw uWY uWY uWY diff --git a/_maps/templates/splurt_templates/hilbertshotel_templates/dungeon_1.dmm b/_maps/templates/splurt_templates/hilbertshotel_templates/dungeon_1.dmm new file mode 100644 index 0000000000..c2e67f0f36 --- /dev/null +++ b/_maps/templates/splurt_templates/hilbertshotel_templates/dungeon_1.dmm @@ -0,0 +1,396 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"d" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress5" + }, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"e" = ( +/obj/effect/decal/cleanable/blood/old{ + icon_state = "gib5-old" + }, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"f" = ( +/obj/effect/decal/cleanable/blood/old{ + icon_state = "gibmid1" + }, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"g" = ( +/obj/effect/decal/cleanable/blood/old{ + icon_state = "gibbearcore" + }, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"j" = ( +/turf/closed/indestructible/hoteldoor{ + icon_state = "door_closed"; + icon = 'icons/obj/doors/puzzledoor/default.dmi' + }, +/area/hilbertshotel) +"l" = ( +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"m" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"q" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress3" + }, +/obj/effect/decal/cleanable/blood/old{ + icon_state = "floor6-old" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"s" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"t" = ( +/obj/structure/simple_door/metal/barred, +/obj/item/lock_bolt{ + dir = 1 + }, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"u" = ( +/obj/structure/bed/mattress{ + icon_state = "mattress2" + }, +/obj/effect/decal/cleanable/blood/old, +/obj/item/reagent_containers/glass/bucket{ + desc = "It smells awful."; + name = "waste bucket" + }, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"v" = ( +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"w" = ( +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/structure/table/wood/settler, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"x" = ( +/obj/structure/table/wood/settler, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"z" = ( +/obj/structure/chair/wood/ham{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"A" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/remains{ + icon_state = "remains" + }, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"B" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 9 + }, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"C" = ( +/obj/structure/simple_door/metal/barred, +/obj/effect/decal/cleanable/blood/tracks, +/obj/item/lock_bolt, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"D" = ( +/obj/item/reagent_containers/glass/bucket{ + desc = "It smells awful."; + name = "waste bucket" + }, +/obj/item/soap, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"E" = ( +/obj/structure/decoration/vent{ + layer = 2.8 + }, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"F" = ( +/obj/machinery/vending/kink{ + pixel_y = 11; + density = 0 + }, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"J" = ( +/turf/closed/wall/mineral/wood, +/area/hilbertshotel) +"K" = ( +/obj/structure/decoration/vent{ + layer = 2.8 + }, +/obj/structure/destructible/tribal_torch/wall/lit/wallcandle{ + pixel_y = 31 + }, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"L" = ( +/obj/structure/decoration/vent{ + layer = 2.8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"O" = ( +/obj/structure/table/wood/settler, +/obj/structure/destructible/tribal_torch/wall/lit/wallcandle{ + pixel_y = 31 + }, +/obj/item/flashlight/flare/torch, +/obj/item/flashlight/flare/torch, +/obj/item/flashlight/flare/torch, +/obj/item/melee/chainofcommand/fake, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"Q" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/bed/mattress{ + icon_state = "mattress6" + }, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"R" = ( +/obj/item/reagent_containers/glass/bucket{ + desc = "It smells awful."; + name = "waste bucket" + }, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"S" = ( +/turf/closed/mineral/random/low_chance, +/area/hilbertshotel) +"U" = ( +/obj/structure/barricade/bars, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"V" = ( +/obj/structure/simple_door/metal/barred, +/obj/item/lock_bolt, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"W" = ( +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"Y" = ( +/obj/structure/decoration/vent{ + layer = 2.8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) +"Z" = ( +/obj/effect/decal/remains{ + icon_state = "remains" + }, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/hilbertshotel) + +(1,1,1) = {" +J +J +J +J +J +j +J +J +J +J +J +J +J +"} +(2,1,1) = {" +J +J +J +F +z +a +a +D +J +S +S +S +J +"} +(3,1,1) = {" +J +J +J +J +O +v +v +s +J +S +S +S +J +"} +(4,1,1) = {" +J +J +J +J +J +v +v +J +J +J +J +J +J +"} +(5,1,1) = {" +J +A +v +v +U +a +v +U +e +v +R +J +J +"} +(6,1,1) = {" +J +B +L +m +C +l +g +t +v +Y +v +J +J +"} +(7,1,1) = {" +J +u +v +a +U +v +v +U +a +a +d +J +J +"} +(8,1,1) = {" +J +J +J +J +J +K +a +J +J +J +J +J +J +"} +(9,1,1) = {" +J +R +f +a +U +v +v +U +R +v +v +J +J +"} +(10,1,1) = {" +J +v +E +v +V +a +v +t +a +Y +a +J +J +"} +(11,1,1) = {" +J +Q +a +W +U +w +x +U +Z +v +q +J +J +"} +(12,1,1) = {" +J +J +J +J +J +J +J +J +J +J +J +J +J +"} diff --git a/_maps/templates/splurt_templates/hilbertshotel_templates/oasis_1.dmm b/_maps/templates/splurt_templates/hilbertshotel_templates/oasis_1.dmm new file mode 100644 index 0000000000..0fe692692f --- /dev/null +++ b/_maps/templates/splurt_templates/hilbertshotel_templates/oasis_1.dmm @@ -0,0 +1,793 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) +"b" = ( +/obj/effect/overlay/water/top, +/obj/effect/overlay/water{ + plane = -2 + }, +/obj/effect/turf_decal/weather/dirt{ + color = "#FFFF33"; + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt{ + color = "#FFFF33"; + dir = 8 + }, +/turf/open/floor/plating/beach/water, +/area/hilbertshotel) +"d" = ( +/obj/item/fishingrod, +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) +"e" = ( +/obj/structure/barricade/tentclothcorner{ + dir = 1; + color = "#AA4444" + }, +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) +"f" = ( +/obj/effect/sound_emitter/birds, +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) +"g" = ( +/obj/effect/overlay/palmtree_r, +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) +"h" = ( +/obj/effect/overlay/water{ + plane = -2 + }, +/obj/effect/overlay/water/top, +/obj/effect/turf_decal/weather/dirt{ + color = "#FFFF33" + }, +/obj/effect/turf_decal/weather/dirt{ + color = "#FFFF33"; + dir = 8 + }, +/turf/open/floor/plating/beach/water, +/area/hilbertshotel) +"i" = ( +/obj/structure/dresser, +/turf/open/floor/carpet, +/area/hilbertshotel) +"j" = ( +/turf/closed/indestructible/f13/matrix, +/area/hilbertshotel) +"k" = ( +/obj/effect/overlay/water/top, +/obj/effect/overlay/water{ + plane = -2 + }, +/obj/effect/turf_decal/weather/dirtcorner{ + color = "#FFFF33"; + dir = 1 + }, +/turf/open/floor/plating/beach/water, +/area/hilbertshotel) +"m" = ( +/obj/effect/overlay/palmtree_l, +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) +"n" = ( +/turf/open/floor/carpet, +/area/hilbertshotel) +"o" = ( +/obj/effect/overlay/water{ + plane = -2 + }, +/obj/effect/overlay/water/top, +/obj/effect/turf_decal/weather/dirt{ + color = "#FFFF33" + }, +/obj/effect/turf_decal/weather/dirt{ + color = "#FFFF33"; + dir = 4 + }, +/turf/open/floor/plating/beach/water, +/area/hilbertshotel) +"p" = ( +/obj/structure/barricade/tentclothedge{ + color = "#AA4444"; + dir = 1; + pixel_y = 3 + }, +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) +"q" = ( +/obj/structure/rug/carpet, +/turf/open/floor/carpet, +/area/hilbertshotel) +"r" = ( +/obj/effect/overlay/water/top, +/obj/effect/overlay/water{ + plane = -2 + }, +/obj/effect/turf_decal/weather/dirt{ + color = "#FFFF33"; + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt{ + color = "#FFFF33"; + dir = 4 + }, +/turf/open/floor/plating/beach/water, +/area/hilbertshotel) +"s" = ( +/turf/open/indestructible/ground/outside/dirt/desertsand{ + color = "#BBBBBB" + }, +/area/hilbertshotel) +"t" = ( +/obj/structure/flora/tree/chomp/spalmtree4, +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) +"u" = ( +/obj/effect/overlay/water/top, +/obj/effect/overlay/water{ + plane = -2 + }, +/obj/effect/turf_decal/weather/dirt{ + color = "#FFFF33"; + dir = 4 + }, +/obj/effect/turf_decal/weather/dirt{ + color = "#FFFF33" + }, +/turf/open/floor/plating/beach/water, +/area/hilbertshotel) +"v" = ( +/obj/structure/barricade/tentclothcorner{ + dir = 4; + color = "#AA4444"; + pixel_y = 3 + }, +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) +"w" = ( +/obj/machinery/vending/kink, +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) +"y" = ( +/obj/effect/overlay/water/top, +/obj/effect/overlay/water{ + plane = -2 + }, +/obj/effect/turf_decal/weather/dirt{ + color = "#FFFF33"; + dir = 1 + }, +/turf/open/floor/plating/beach/water, +/area/hilbertshotel) +"A" = ( +/obj/effect/overlay/water/top, +/obj/effect/overlay/water{ + plane = -2 + }, +/obj/effect/turf_decal/weather/dirt{ + color = "#FFFF33"; + dir = 4 + }, +/turf/open/floor/plating/beach/water, +/area/hilbertshotel) +"B" = ( +/obj/effect/overlay/water/top, +/obj/effect/overlay/water{ + plane = -2 + }, +/obj/effect/turf_decal/weather/dirt{ + color = "#FFFF33" + }, +/turf/open/floor/plating/beach/water, +/area/hilbertshotel) +"C" = ( +/obj/structure/rug/big/rug_red, +/turf/open/floor/carpet, +/area/hilbertshotel) +"D" = ( +/obj/structure/barricade/tentclothcorner{ + dir = 2; + color = "#AA4444"; + pixel_y = 3 + }, +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) +"E" = ( +/obj/effect/overlay/water/top, +/obj/effect/overlay/water{ + plane = -2 + }, +/obj/effect/sound_emitter/creek, +/turf/open/floor/plating/beach/water, +/area/hilbertshotel) +"F" = ( +/obj/effect/sound_emitter/foxybar/windycurtains, +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) +"G" = ( +/obj/effect/overlay/water/top, +/obj/effect/overlay/water{ + plane = -2 + }, +/obj/effect/turf_decal/weather/dirt{ + color = "#FFFF33"; + dir = 8 + }, +/turf/open/floor/plating/beach/water, +/area/hilbertshotel) +"H" = ( +/obj/structure/flora/tree/chomp/spalmtree, +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) +"I" = ( +/obj/effect/overlay/water/top, +/obj/effect/overlay/water{ + plane = -2 + }, +/obj/effect/turf_decal/weather/dirtcorner{ + color = "#FFFF33"; + dir = 8 + }, +/turf/open/floor/plating/beach/water, +/area/hilbertshotel) +"J" = ( +/obj/structure/barricade/tentclothedge{ + color = "#AA4444"; + dir = 8; + pixel_x = 1 + }, +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) +"K" = ( +/obj/structure/destructible/tribal_torch/lit{ + pixel_y = 31 + }, +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) +"L" = ( +/obj/structure/simple_door/tentflap_cloth{ + color = "#AA4444"; + pixel_y = 3 + }, +/turf/open/indestructible/ground/outside/dirt/desertsand{ + color = "#BBBBBB" + }, +/area/hilbertshotel) +"M" = ( +/obj/effect/overlay/water/top, +/obj/effect/overlay/water{ + plane = -2 + }, +/turf/open/floor/plating/beach/water, +/area/hilbertshotel) +"N" = ( +/obj/structure/flora/chomp/boulder{ + opacity = 1; + pixel_y = -23; + pixel_x = -28 + }, +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) +"O" = ( +/obj/structure/rug/carpet{ + pixel_y = -11 + }, +/turf/open/floor/carpet, +/area/hilbertshotel) +"P" = ( +/obj/structure/chair/comfy/throne, +/turf/open/floor/carpet, +/area/hilbertshotel) +"Q" = ( +/obj/effect/overlay/water/top, +/obj/effect/overlay/water{ + plane = -2 + }, +/obj/effect/turf_decal/weather/dirt{ + color = "#FFFF33"; + dir = 8 + }, +/obj/effect/turf_decal/weather/dirt{ + color = "#FFFF33"; + dir = 1 + }, +/turf/open/floor/plating/beach/water, +/area/hilbertshotel) +"R" = ( +/obj/structure/barricade/tentclothedge{ + color = "#AA4444"; + dir = 1; + pixel_y = -4 + }, +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) +"S" = ( +/obj/structure/flora/grass/wasteland{ + icon_state = "tall_grass_6" + }, +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) +"U" = ( +/obj/structure/chair/stool/bronze, +/turf/open/floor/carpet, +/area/hilbertshotel) +"V" = ( +/obj/effect/overlay/water{ + plane = -2 + }, +/obj/effect/overlay/water/top, +/obj/effect/turf_decal/weather/dirt{ + color = "#FFFF33" + }, +/turf/open/floor/plating/beach/water, +/area/hilbertshotel) +"W" = ( +/turf/closed/indestructible/hoteldoor{ + icon_state = "door_closed"; + icon = 'icons/obj/doors/puzzledoor/default.dmi' + }, +/area/hilbertshotel) +"X" = ( +/obj/structure/barricade/tentclothedge{ + color = "#AA4444"; + dir = 4; + pixel_x = -1 + }, +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) +"Y" = ( +/obj/structure/flora/tree/chomp/spalmtree, +/obj/effect/overlay/coconut, +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) +"Z" = ( +/obj/structure/barricade/tentclothcorner{ + dir = 8; + color = "#AA4444" + }, +/turf/open/indestructible/ground/outside/dirt/desertsand, +/area/hilbertshotel) + +(1,1,1) = {" +j +j +j +j +j +j +j +j +j +j +j +j +j +j +j +j +j +j +j +j +"} +(2,1,1) = {" +j +e +J +J +J +J +v +a +g +F +S +a +a +a +a +a +a +a +a +j +"} +(3,1,1) = {" +j +R +i +U +U +U +p +a +a +a +a +a +a +F +a +a +N +a +a +j +"} +(4,1,1) = {" +j +R +n +C +q +n +p +K +a +a +a +a +a +m +a +a +a +a +a +j +"} +(5,1,1) = {" +j +R +P +O +n +n +L +s +s +s +s +s +s +s +f +a +a +a +a +j +"} +(6,1,1) = {" +j +R +n +n +n +n +p +K +a +f +a +a +a +s +a +Q +G +h +a +j +"} +(7,1,1) = {" +j +R +n +U +U +U +p +S +a +a +b +G +G +G +G +k +M +V +a +j +"} +(8,1,1) = {" +j +Z +X +X +X +X +D +t +a +b +k +M +M +M +M +M +M +V +a +j +"} +(9,1,1) = {" +j +a +a +a +a +a +a +a +a +y +M +M +M +M +M +M +I +o +a +j +"} +(10,1,1) = {" +j +a +a +F +a +S +a +a +d +y +M +M +M +E +M +M +B +S +a +j +"} +(11,1,1) = {" +j +a +a +a +a +a +a +H +a +y +M +M +M +M +M +M +B +F +a +W +"} +(12,1,1) = {" +j +a +N +a +a +a +a +a +a +y +M +M +M +M +M +M +B +a +a +j +"} +(13,1,1) = {" +j +a +a +a +a +a +a +S +a +y +M +M +M +M +M +M +B +a +S +j +"} +(14,1,1) = {" +j +a +a +a +a +a +m +a +a +r +A +A +A +A +A +A +u +a +a +j +"} +(15,1,1) = {" +j +a +a +S +f +a +a +a +a +a +a +a +a +a +a +S +a +a +a +j +"} +(16,1,1) = {" +j +a +a +a +a +a +a +a +N +a +a +a +F +a +a +a +a +g +a +j +"} +(17,1,1) = {" +j +a +a +a +N +a +F +a +a +a +a +a +Y +a +m +a +a +t +a +j +"} +(18,1,1) = {" +j +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +S +a +a +j +"} +(19,1,1) = {" +j +w +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +j +"} +(20,1,1) = {" +j +j +j +j +j +j +j +j +j +j +j +j +j +j +j +j +j +j +j +j +"} diff --git a/_maps/templates/splurt_templates/hilbertshotel_templates/snowcabin_1.dmm b/_maps/templates/splurt_templates/hilbertshotel_templates/snowcabin_1.dmm new file mode 100644 index 0000000000..0518db0045 --- /dev/null +++ b/_maps/templates/splurt_templates/hilbertshotel_templates/snowcabin_1.dmm @@ -0,0 +1,1222 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/open/floor/grass/snow, +/area/hilbertshotel) +"b" = ( +/obj/structure/barricade/tentclothedge{ + pixel_y = 4 + }, +/turf/open/floor/plating/ice, +/area/hilbertshotel) +"c" = ( +/obj/structure/flora/chomp/bones/lrock4, +/turf/open/floor/grass/snow, +/area/hilbertshotel) +"d" = ( +/obj/structure/simple_door/tentflap_cloth{ + pixel_y = 4 + }, +/turf/open/floor/plating/ice, +/area/hilbertshotel) +"e" = ( +/obj/structure/fireplace, +/turf/open/floor/wood_worn/wood_worn_dark, +/area/hilbertshotel) +"f" = ( +/obj/structure/barricade/tentclothcorner{ + pixel_y = 5 + }, +/turf/open/floor/grass/snow, +/area/hilbertshotel) +"g" = ( +/obj/structure/window/fulltile/civ/nordic_window, +/obj/structure/curtain/directional/north, +/turf/open/floor/wood_worn/wood_worn_dark, +/area/hilbertshotel) +"h" = ( +/obj/effect/sound_emitter/crows, +/turf/open/floor/grass/snow, +/area/hilbertshotel) +"i" = ( +/obj/structure/barricade/tentclothcorner{ + dir = 1 + }, +/turf/open/floor/plating/ice, +/area/hilbertshotel) +"j" = ( +/obj/structure/simple_door/tentflap_cloth{ + pixel_y = -4 + }, +/turf/open/indestructible/ground/outside/savannah, +/area/hilbertshotel) +"k" = ( +/turf/closed/indestructible/f13/matrix, +/area/hilbertshotel) +"l" = ( +/obj/structure/barricade/tentclothedge{ + dir = 1; + pixel_y = -6 + }, +/turf/open/floor/grass/snow, +/area/hilbertshotel) +"m" = ( +/obj/structure/chair/stool/retro/tan, +/turf/open/floor/plating/ice, +/area/hilbertshotel) +"n" = ( +/obj/structure/table/wood/settler, +/turf/open/floor/grass/snow, +/area/hilbertshotel) +"o" = ( +/turf/open/floor/plating/beach/water, +/area/hilbertshotel) +"p" = ( +/obj/structure/barricade/tentclothedge{ + dir = 4; + pixel_y = 4; + pixel_x = -2 + }, +/turf/open/floor/grass/snow, +/area/hilbertshotel) +"q" = ( +/obj/structure/barricade/tentclothedge{ + pixel_y = 4 + }, +/turf/open/floor/grass/snow, +/area/hilbertshotel) +"r" = ( +/obj/structure/barricade/tentclothcorner{ + pixel_y = 5 + }, +/turf/open/floor/plating/ice, +/area/hilbertshotel) +"s" = ( +/turf/closed/wall/f13/wood, +/area/hilbertshotel) +"t" = ( +/obj/structure/barricade/tentclothedge{ + pixel_y = 2 + }, +/turf/open/floor/grass/snow, +/area/hilbertshotel) +"u" = ( +/obj/structure/barricade/tentclothedge{ + dir = 1; + pixel_y = -4 + }, +/turf/open/floor/grass/snow, +/area/hilbertshotel) +"v" = ( +/obj/structure/barricade/tentclothcorner{ + dir = 4; + pixel_y = 4 + }, +/turf/open/floor/plating/ice, +/area/hilbertshotel) +"x" = ( +/obj/structure/bed/double, +/obj/item/bedsheet/doublesheetbrown, +/turf/open/floor/wood_worn/wood_worn_dark, +/area/hilbertshotel) +"y" = ( +/turf/open/floor/plating/ice, +/area/hilbertshotel) +"z" = ( +/turf/closed/indestructible/hoteldoor{ + icon_state = "door_closed"; + icon = 'icons/obj/doors/puzzledoor/default.dmi' + }, +/area/hilbertshotel) +"A" = ( +/obj/structure/table/wood/settler, +/obj/item/binoculars, +/turf/open/floor/grass/snow, +/area/hilbertshotel) +"B" = ( +/obj/structure/barricade/tentclothedge{ + dir = 1; + pixel_y = -4 + }, +/turf/open/floor/plating/ice, +/area/hilbertshotel) +"C" = ( +/obj/structure/barricade/tentclothedge{ + dir = 4; + pixel_y = 4; + pixel_x = 4 + }, +/turf/open/floor/plating/ice, +/area/hilbertshotel) +"D" = ( +/obj/structure/table/wood/settler, +/obj/item/gun/ballistic/rifle/hunting, +/obj/item/ammo_box/a3006, +/turf/open/floor/wood_worn/wood_worn_dark, +/area/hilbertshotel) +"E" = ( +/turf/open/floor/wood_worn/wood_worn_dark, +/area/hilbertshotel) +"F" = ( +/turf/open/indestructible/ground/outside/savannah, +/area/hilbertshotel) +"G" = ( +/obj/machinery/microwave/stove, +/turf/open/floor/wood_worn/wood_worn_dark, +/area/hilbertshotel) +"H" = ( +/obj/structure/table/wood/settler, +/obj/item/storage/box/matches, +/turf/open/floor/wood_worn/wood_worn_dark, +/area/hilbertshotel) +"I" = ( +/obj/effect/sound_emitter/foxybar/windycurtains, +/turf/open/floor/grass/snow, +/area/hilbertshotel) +"J" = ( +/obj/structure/barricade/tentclothedge{ + dir = 4; + pixel_x = -2 + }, +/turf/open/floor/plating/ice, +/area/hilbertshotel) +"K" = ( +/obj/structure/barricade/tentclothedge{ + dir = 4; + pixel_x = -2 + }, +/turf/open/floor/grass/snow, +/area/hilbertshotel) +"L" = ( +/mob/living/simple_animal/radstag, +/turf/open/floor/grass/snow, +/area/hilbertshotel) +"M" = ( +/obj/structure/dresser, +/turf/open/floor/wood_worn/wood_worn_dark, +/area/hilbertshotel) +"N" = ( +/obj/structure/barricade/tentclothcorner{ + dir = 8 + }, +/turf/open/floor/grass/snow, +/area/hilbertshotel) +"O" = ( +/obj/structure/simple_door/wood, +/turf/open/floor/wood_worn/wood_worn_dark, +/area/hilbertshotel) +"P" = ( +/obj/structure/flora/tallgrass6, +/turf/open/floor/grass/snow, +/area/hilbertshotel) +"Q" = ( +/obj/structure/chair/stool/retro/tan, +/obj/item/fishingrod, +/turf/open/floor/plating/ice, +/area/hilbertshotel) +"R" = ( +/obj/structure/flora/brushwoodalt, +/turf/open/floor/grass/snow, +/area/hilbertshotel) +"S" = ( +/obj/structure/barricade/tentclothcorner{ + dir = 8 + }, +/turf/open/floor/plating/ice, +/area/hilbertshotel) +"T" = ( +/obj/structure/barricade/tentclothedge{ + pixel_y = 5 + }, +/turf/open/floor/grass/snow, +/area/hilbertshotel) +"U" = ( +/obj/structure/flora/branch_broken, +/turf/open/floor/grass/snow, +/area/hilbertshotel) +"V" = ( +/obj/structure/rug/big/rug_red{ + pixel_x = -16; + pixel_y = -7 + }, +/turf/open/floor/wood_worn/wood_worn_dark, +/area/hilbertshotel) +"W" = ( +/obj/structure/flora/tree/pine, +/turf/open/floor/grass/snow, +/area/hilbertshotel) +"X" = ( +/obj/structure/chair/stool/retro/tan, +/turf/open/indestructible/ground/outside/savannah, +/area/hilbertshotel) +"Y" = ( +/obj/item/stack/sheet/mineral/wood/fifty, +/obj/item/stack/sheet/mineral/wood/fifty, +/obj/item/stack/sheet/mineral/wood/fifty, +/turf/open/floor/wood_worn/wood_worn_dark, +/area/hilbertshotel) +"Z" = ( +/obj/structure/table/wood/settler, +/obj/item/melee/onehanded/knife/hunting, +/turf/open/floor/wood_worn/wood_worn_dark, +/area/hilbertshotel) + +(1,1,1) = {" +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +"} +(2,1,1) = {" +k +a +a +a +a +a +a +a +a +a +a +a +P +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +k +"} +(3,1,1) = {" +k +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +L +a +a +a +a +a +c +a +a +k +"} +(4,1,1) = {" +k +a +a +a +a +W +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +k +"} +(5,1,1) = {" +k +a +a +a +a +a +U +a +h +a +a +a +a +a +a +U +a +a +a +a +W +a +a +a +a +a +a +a +a +k +"} +(6,1,1) = {" +k +a +P +a +a +c +a +a +a +a +a +W +a +a +a +a +c +a +a +a +a +a +h +a +a +R +a +a +a +k +"} +(7,1,1) = {" +k +a +a +a +a +a +a +a +a +P +a +a +a +a +a +a +a +a +a +a +a +a +a +P +a +a +a +a +a +k +"} +(8,1,1) = {" +k +a +a +a +a +a +a +a +a +a +a +I +R +a +a +a +a +a +P +a +a +a +a +a +a +a +a +a +a +k +"} +(9,1,1) = {" +k +a +W +a +a +a +a +a +a +a +a +a +a +a +a +W +a +a +a +a +a +a +a +a +a +a +W +a +a +k +"} +(10,1,1) = {" +k +a +a +a +P +a +a +a +a +a +a +a +a +a +a +a +a +a +a +I +a +U +a +a +a +a +a +a +a +k +"} +(11,1,1) = {" +k +a +a +a +a +a +a +a +c +a +a +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +k +"} +(12,1,1) = {" +k +a +R +a +a +h +a +a +a +a +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +a +a +a +a +k +"} +(13,1,1) = {" +k +a +a +a +a +a +a +a +a +a +y +i +C +C +v +y +y +y +a +a +a +a +a +a +a +a +a +a +a +k +"} +(14,1,1) = {" +k +a +a +a +a +W +a +a +a +a +y +B +m +y +d +y +y +y +a +a +a +a +a +W +a +c +a +a +a +k +"} +(15,1,1) = {" +k +P +a +a +a +a +U +a +I +a +y +B +Q +o +b +y +y +y +a +a +a +a +a +a +a +a +a +a +a +k +"} +(16,1,1) = {" +k +a +a +a +a +a +a +a +a +a +y +S +J +J +r +y +y +y +y +a +a +a +a +a +a +a +a +a +a +k +"} +(17,1,1) = {" +k +a +a +a +a +a +a +a +W +a +y +y +y +y +y +y +y +y +y +a +a +P +a +a +a +a +a +a +a +k +"} +(18,1,1) = {" +k +a +a +a +W +a +a +a +a +a +y +y +y +y +y +y +y +y +a +a +a +a +a +a +a +a +h +a +a +k +"} +(19,1,1) = {" +k +s +s +s +s +s +s +a +a +a +y +y +y +y +y +y +y +a +a +I +a +a +a +a +a +a +a +a +a +k +"} +(20,1,1) = {" +k +s +D +H +G +E +g +a +a +a +W +a +y +y +y +a +a +a +a +a +a +a +a +a +a +a +W +a +a +k +"} +(21,1,1) = {" +k +s +Z +E +E +E +g +a +a +a +a +a +a +F +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +k +"} +(22,1,1) = {" +k +s +M +Y +E +E +g +a +a +a +a +a +W +F +I +a +P +a +a +l +A +n +T +a +a +a +a +a +a +k +"} +(23,1,1) = {" +k +s +s +e +V +E +O +F +F +F +a +a +a +F +a +a +a +a +a +u +X +X +t +a +a +U +a +a +a +k +"} +(24,1,1) = {" +k +s +x +E +E +E +s +a +a +F +F +F +F +F +F +F +F +F +F +j +F +F +q +a +a +a +a +a +a +k +"} +(25,1,1) = {" +k +s +s +s +s +s +s +a +a +a +a +W +a +a +W +a +a +a +a +N +K +p +f +a +a +a +a +a +a +k +"} +(26,1,1) = {" +k +a +a +a +P +a +a +I +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +P +a +k +"} +(27,1,1) = {" +k +a +a +a +a +a +a +a +a +R +a +a +a +a +a +c +a +a +a +a +a +W +a +a +a +a +a +a +a +k +"} +(28,1,1) = {" +k +a +W +a +a +a +a +a +a +a +a +P +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +k +"} +(29,1,1) = {" +k +a +a +a +a +a +a +a +a +a +W +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +k +"} +(30,1,1) = {" +k +k +k +k +k +k +k +z +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +k +"} diff --git a/code/datums/elements/flavor_text.dm b/code/datums/elements/flavor_text.dm index 9c449e0604..471b600547 100644 --- a/code/datums/elements/flavor_text.dm +++ b/code/datums/elements/flavor_text.dm @@ -15,8 +15,9 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code /// Do not attempt to render a preview on examine. If this is on, it will display as \[flavor_name\] var/examine_no_preview = FALSE var/why_does_it_do_this = 0 + var/spandex = "notice" -/datum/element/flavor_text/Attach(datum/target, text = "", _name = "Flavor Text", _addendum, _max_len = MAX_FLAVOR_LEN, _always_show = FALSE, _edit = TRUE, _save_key, _examine_no_preview = FALSE, _attach_internet_link = FALSE) +/datum/element/flavor_text/Attach(datum/target, text = "", _name = "Flavor Text", _addendum, _max_len = MAX_FLAVOR_LEN, _always_show = FALSE, _edit = TRUE, _save_key, _examine_no_preview = FALSE, _attach_internet_link = FALSE, _span) . = ..() if(. == ELEMENT_INCOMPATIBLE || !isatom(target)) //no reason why this shouldn't work on atoms too. @@ -35,6 +36,8 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code can_edit = _edit save_key = _save_key examine_no_preview = _examine_no_preview + if(!isnull(_span)) + spandex = _span RegisterSignal(target, COMSIG_PARENT_EXAMINE,PROC_REF(show_flavor)) RegisterSignal(target, COMSIG_FLIST,PROC_REF(show_flist)) @@ -59,16 +62,16 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code remove_verb(M, /mob/proc/manage_flavor_tests) /datum/element/flavor_text/proc/show_flavor(atom/target, mob/user, list/examine_list) - if(!always_show && isliving(target) && !isobserver(user)) - var/mob/living/L = target - var/unknown = L.get_visible_name() == "Unknown" - if(!unknown && iscarbon(target)) - var/mob/living/carbon/C = L - unknown = !HAS_TRAIT(C, TRAIT_NOHIDEFACE) && ((C.wear_mask && (C.wear_mask.flags_inv & HIDEFACE)) || (C.head && (C.head.flags_inv & HIDEFACE))) - if(unknown) - if(!("...?" in examine_list)) //can't think of anything better in case of multiple flavor texts. - examine_list += "...?" - return + // if(!always_show && isliving(target) && !isobserver(user)) + // var/mob/living/L = target + // var/unknown = L.get_visible_name() == "Unknown" + // if(!unknown && iscarbon(target)) + // var/mob/living/carbon/C = L + // unknown = !HAS_TRAIT(C, TRAIT_NOHIDEFACE) && ((C.wear_mask && (C.wear_mask.flags_inv & HIDEFACE)) || (C.head && (C.head.flags_inv & HIDEFACE))) + // if(unknown) + // if(!("...?" in examine_list)) //can't think of anything better in case of multiple flavor texts. + // examine_list += "...?" + // return var/text = texts_by_atom[target] if(!text) return @@ -76,9 +79,9 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code var/mob/living/carbon/human/H = target if(H.dna.features["background_info_notes"] == BACKGROUND_INFO_NOTE_TEMPLATE) return - if(examine_no_preview) - examine_list += span_notice("\[[flavor_name]\]") - return + // if(examine_no_preview) + // examine_list += span_notice("\[[flavor_name]\]") + // return var/msg = replacetext(text, "\n", " ") if(length_char(msg) <= 200) examine_list += span_notice("[msg]") @@ -150,10 +153,10 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code var/datum/element/flavor_text/F = i choices[F.flavor_name] = F - var/chosen = input(src, "Which flavor text would you like to modify?") as null|anything in choices - if(!chosen) - return - var/datum/element/flavor_text/F = choices[chosen] + // var/chosen = input(src, "Which flavor text would you like to modify?") as null|anything in choices + // if(!chosen) + // return + var/datum/element/flavor_text/F = choices["Set Pose/Leave OOC Message"] F.set_flavor(src) /datum/element/flavor_text/proc/set_flavor(mob/user) diff --git a/code/datums/looping_sounds/ambient_sounds.dm b/code/datums/looping_sounds/ambient_sounds.dm index 79d900d1f7..a1ac484941 100644 --- a/code/datums/looping_sounds/ambient_sounds.dm +++ b/code/datums/looping_sounds/ambient_sounds.dm @@ -551,6 +551,8 @@ SOUND_LOOP_ENTRY('sound/f13ambience/creek_08.ogg', 2 SECONDS, 10), ) + + /datum/looping_sound/ambient/kf/forestmusic chance = 80 vary = FALSE @@ -643,4 +645,3 @@ SOUND_LOOP_ENTRY('sound/f13ambience/bar/cool_bar_ambience_raw_17.ogg', 10 SECONDS, 1), SOUND_LOOP_ENTRY('sound/f13ambience/bar/cool_bar_ambience_raw_18.ogg', 10 SECONDS, 1), ) - diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 76f95e39eb..a60fada6cf 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -58,8 +58,8 @@ GLOBAL_VAR_INIT(crotch_call_cooldown, 0) AddComponent(/datum/component/combat_mode) AddElement(/datum/element/flavor_text/carbon, _name = "Flavor Text", _save_key = "flavor_text") AddElement(/datum/element/flavor_text, "", "Set Pose/Leave OOC Message", "This should be used only for things pertaining to the current round!") - AddElement(/datum/element/flavor_text, _name = "OOC Notes", _addendum = "Put information on ERP/lewd-related preferences here. THIS SHOULD NOT CONTAIN REGULAR FLAVORTEXT!!", _always_show = TRUE, _save_key = "ooc_notes", _examine_no_preview = TRUE) - AddElement(/datum/element/flavor_text, _name = "Background Info Notes", _addendum = "Put information about your character's background!", _always_show = TRUE, _save_key = "background_info_notes", _examine_no_preview = TRUE) + AddElement(/datum/element/flavor_text, _name = "OOC Notes", _addendum = "Put information on ERP/lewd-related preferences here. THIS SHOULD NOT CONTAIN REGULAR FLAVORTEXT!!", _always_show = TRUE, _save_key = "ooc_notes") + AddElement(/datum/element/flavor_text, _name = "Background Info Notes", _addendum = "Put information about your character's background!", _always_show = TRUE, _save_key = "background_info_notes", _span = "yellow") AddElement(/datum/element/flavor_text, _name = "F-list link", _always_show = FALSE, _save_key = "flist", _examine_no_preview = TRUE, _attach_internet_link = TRUE) AddElement(/datum/element/mob_holder, "corgi") RegisterSignal(src, COMSIG_HUMAN_UPDATE_GENITALS,PROC_REF(signal_update_genitals)) diff --git a/modular_splurt/code/modules/hilbertshotel/hilbertshotel.dm b/modular_splurt/code/modules/hilbertshotel/hilbertshotel.dm index b342a8323c..afa4c06428 100644 --- a/modular_splurt/code/modules/hilbertshotel/hilbertshotel.dm +++ b/modular_splurt/code/modules/hilbertshotel/hilbertshotel.dm @@ -20,7 +20,10 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) "Apartment-Bar", "Apartment-Garden", "Apartment-Sauna", - "Movie-Theater" + "Movie-Theater", + "Dungeon-One", + "Oasis-One", + "Snowcabin-One", ) var/datum/map_template/hilbertshotel/apartment/one/hilberts_hotel_rooms_apartment_one var/datum/map_template/hilbertshotel/apartment/two/hilberts_hotel_rooms_apartment_two @@ -32,6 +35,9 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) //SPLURT EDIT END //FB Maps var/datum/map_template/hilbertshotel/apartment/movietheater/hilberts_hotel_rooms_movie_theater + var/datum/map_template/hilbertshotel/apartment/dungeon_one/dungeon_one + var/datum/map_template/hilbertshotel/apartment/oasis_one/oasis_one + var/datum/map_template/hilbertshotel/apartment/snowcabin_one/snowcabin_one //FB Maps End var/datum/map_template/hilbertshotel/hotelRoomTemp var/datum/map_template/hilbertshotel/empty/hotelRoomTempEmpty @@ -64,6 +70,9 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) hilberts_hotel_rooms_apartment_sauna = new() //FB EDIT START hilberts_hotel_rooms_movie_theater = new() + dungeon_one = new() + oasis_one = new() + snowcabin_one = new() /obj/hilbertshotel/Destroy() ejectRooms() @@ -244,6 +253,9 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) if("Apartment-Garden") return hilberts_hotel_rooms_apartment_garden if("Apartment-Sauna") return hilberts_hotel_rooms_apartment_sauna if("Movie-Theater") return hilberts_hotel_rooms_movie_theater + if("Dungeon-One") return dungeon_one + if("Oasis-One") return oasis_one + if("Snowcabin-One") return snowcabin_one if("Mystery Room") return hotelRoomTempLore return hotelRoomTemp // Default to Hotel Room if no match is found @@ -268,6 +280,9 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) if("Apartment-Garden") mapTemplate = hilberts_hotel_rooms_apartment_garden if("Apartment-Sauna") mapTemplate = hilberts_hotel_rooms_apartment_sauna if("Movie-Theater") mapTemplate = hilberts_hotel_rooms_movie_theater + if("Dungeon-One") mapTemplate = dungeon_one + if("Oasis-One") mapTemplate = oasis_one + if("Snowcabin-One") mapTemplate = snowcabin_one if(!mapTemplate) mapTemplate = hotelRoomTemp //Default Hotel Room @@ -549,6 +564,9 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) requires_power = FALSE has_gravity = TRUE +/area/hilbertshotel/arabian + name = "Hilbert's Hotel Room - arabian ambience" + /obj/item/abstracthotelstorage anchored = TRUE invisibility = INVISIBILITY_ABSTRACT @@ -731,6 +749,18 @@ Not all that's countable has an end..._ name = "Movie_Theater" mappath = '_maps/templates/splurt_templates/hilbertshotel_templates/movie_theater.dmm' +/datum/map_template/hilbertshotel/apartment/dungeon_one + name = "Dungeon-One" + mappath = '_maps/templates/splurt_templates/hilbertshotel_templates/dungeon_1.dmm' + +/datum/map_template/hilbertshotel/apartment/oasis_one + name = "oasis-One" + mappath = '_maps/templates/splurt_templates/hilbertshotel_templates/oasis_1.dmm' + +/datum/map_template/hilbertshotel/apartment/snowcabin_one + name = "snowcabin-One" + mappath = '_maps/templates/splurt_templates/hilbertshotel_templates/snowcabin_1.dmm' + // Fluff - Misc /obj/item/paper/fluff/hilbertshotel/welcomeletter