diff --git a/_maps/map_files/coyote_bayou/foxybar.dmm b/_maps/map_files/coyote_bayou/foxybar.dmm index e0d19c51aa..16360cf113 100644 --- a/_maps/map_files/coyote_bayou/foxybar.dmm +++ b/_maps/map_files/coyote_bayou/foxybar.dmm @@ -60,7 +60,7 @@ dir = 4; color = "#3B2B1A" }, -/obj/structure/chair/stool/retro/backed, +/obj/machinery/jukebox_online, /obj/effect/overlay/fog/fog2{ plane = -2; alpha = 175 @@ -3598,6 +3598,23 @@ }, /turf/open/floor/plasteel/freezer, /area/f13/fb/bar) +"uwy" = ( +/obj/effect/decal/cleanable/glitter/blue{ + color = "#993311"; + layer = 3 + }, +/obj/effect/overlay/fog/fog2{ + plane = -2; + alpha = 175 + }, +/obj/effect/overlay/fog/fog2{ + plane = -2; + alpha = 175 + }, +/turf/open/floor/wood_fancy{ + color = "#779999" + }, +/area/f13/fb/bar) "uOS" = ( /obj/effect/turf_decal/siding/wood{ dir = 4; @@ -6445,7 +6462,7 @@ bPG bPG bPG thm -iku +uwy nuu goB goB diff --git a/_maps/templates/splurt_templates/hilbertshotel_templates/apartment_sauna.dmm b/_maps/templates/splurt_templates/hilbertshotel_templates/apartment_sauna.dmm index 7004c8996a..66c8e2b820 100644 --- a/_maps/templates/splurt_templates/hilbertshotel_templates/apartment_sauna.dmm +++ b/_maps/templates/splurt_templates/hilbertshotel_templates/apartment_sauna.dmm @@ -80,7 +80,7 @@ /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "fW" = ( -/obj/structure/bed, +/obj/item/reagent_containers/rag/towel, /turf/open/floor/plasteel/white, /area/hilbertshotel) "gP" = ( @@ -121,6 +121,14 @@ dir = 10 }, /obj/structure/rack, +/obj/item/reagent_containers/rag/towel, +/obj/item/reagent_containers/rag/towel, +/obj/item/reagent_containers/rag/towel, +/obj/item/reagent_containers/rag/towel, +/obj/item/reagent_containers/rag/towel, +/obj/item/reagent_containers/rag/towel, +/obj/item/reagent_containers/rag/towel, +/obj/item/reagent_containers/rag/towel, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "jr" = ( diff --git a/_maps/templates/splurt_templates/hilbertshotel_templates/chess.dmm b/_maps/templates/splurt_templates/hilbertshotel_templates/chess.dmm new file mode 100644 index 0000000000..3afdb9167a --- /dev/null +++ b/_maps/templates/splurt_templates/hilbertshotel_templates/chess.dmm @@ -0,0 +1,1051 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aD" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 2; + light_color = "#f4e3b0"; + mouse_opacity = 0; + alpha = 0 + }, +/turf/open/floor/plasteel/f13/whitemarble{ + color = "#666666" + }, +/area/hilbertshotel) +"cs" = ( +/obj/structure/chair/pew/left, +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 1; + pixel_y = 12 + }, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"cJ" = ( +/turf/closed/indestructible/f13/matrix, +/area/hilbertshotel) +"de" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1; + color = "#3B2B1A" + }, +/obj/structure/destructible/tribal_torch/lit, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"dl" = ( +/obj/structure/chair/pew/right, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"dN" = ( +/obj/structure/table/wood, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"dZ" = ( +/obj/structure/chess/whiteknight, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/whitemarble, +/area/hilbertshotel) +"eh" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"eP" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"fo" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 2; + color = "#3B2B1A" + }, +/obj/structure/destructible/tribal_torch/lit, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"fN" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/wall/mineral/brick, +/area/hilbertshotel) +"fX" = ( +/obj/item/melee/onehanded/slavewhip, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"gd" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 4; + light_color = "#f4e3b0" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chess/blackqueen, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"hO" = ( +/turf/closed/indestructible/hoteldoor{ + icon_state = "door_closed"; + icon = 'icons/obj/doors/puzzledoor/default.dmi' + }, +/area/hilbertshotel) +"hR" = ( +/obj/structure/chess/blackpawn, +/turf/open/floor/plasteel/f13/whitemarble, +/area/hilbertshotel) +"is" = ( +/turf/closed/wall/mineral/brick, +/area/hilbertshotel) +"iv" = ( +/obj/structure/chess/blackrook, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/whitemarble{ + color = "#666666" + }, +/area/hilbertshotel) +"iM" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"jk" = ( +/obj/structure/chair/pew/right{ + dir = 4 + }, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"jB" = ( +/obj/structure/table/wood, +/obj/item/toy/clockwork_watch, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"jD" = ( +/obj/item/candle/infinite, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"kO" = ( +/obj/structure/chess/whitequeen, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"lf" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chess/whitequeen, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"lD" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"lL" = ( +/obj/structure/chess/whitepawn, +/turf/open/floor/plasteel/f13/whitemarble{ + color = "#666666" + }, +/area/hilbertshotel) +"lX" = ( +/obj/structure/chess/blackknight, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/whitemarble, +/area/hilbertshotel) +"my" = ( +/obj/structure/chair/pew/left{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"ni" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 2; + light_color = "#f4e3b0" + }, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"om" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"ou" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 2; + light_color = "#f4e3b0"; + mouse_opacity = 0; + alpha = 0 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"oF" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"oG" = ( +/obj/structure/chair/pew/left, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"ql" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/obj/item/candle/infinite, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"qV" = ( +/obj/structure/destructible/tribal_torch/lit, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"rJ" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 1; + pixel_y = 12 + }, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"rM" = ( +/obj/structure/chair/pew, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"sx" = ( +/obj/structure/chess/blackpawn, +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 2; + light_color = "#f4e3b0"; + mouse_opacity = 0; + alpha = 0 + }, +/turf/open/floor/plasteel/f13/whitemarble, +/area/hilbertshotel) +"sM" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8; + color = "#3B2B1A" + }, +/obj/structure/destructible/tribal_torch/lit, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"sW" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#3B2B1A" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"th" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 8; + light_color = "#f4e3b0" + }, +/turf/open/floor/plasteel/f13/whitemarble, +/area/hilbertshotel) +"tn" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/obj/item/candle/infinite, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"to" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"tU" = ( +/obj/structure/chair/pew/right, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 1; + pixel_y = 12 + }, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"uk" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/candle/infinite, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"uM" = ( +/obj/structure/chess/whitepawn, +/turf/open/floor/plasteel/f13/whitemarble, +/area/hilbertshotel) +"uY" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"uZ" = ( +/obj/structure/chair/pew{ + dir = 8 + }, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"vS" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/whitemarble, +/area/hilbertshotel) +"wi" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 8; + light_color = "#f4e3b0" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/whitemarble, +/area/hilbertshotel) +"wl" = ( +/obj/structure/chess/blackqueen, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"yb" = ( +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"zl" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/whitemarble, +/area/hilbertshotel) +"zw" = ( +/obj/structure/chess/blackpawn, +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 2; + light_color = "#f4e3b0"; + mouse_opacity = 0; + alpha = 0 + }, +/turf/open/floor/plasteel/f13/whitemarble{ + color = "#666666" + }, +/area/hilbertshotel) +"zL" = ( +/obj/structure/falsewall/wood, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"An" = ( +/obj/structure/chair/pew/left, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"AD" = ( +/obj/structure/chess/blackbishop, +/turf/open/floor/plasteel/f13/whitemarble, +/area/hilbertshotel) +"Cp" = ( +/obj/structure/chess/whitepawn, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/whitemarble{ + color = "#666666" + }, +/area/hilbertshotel) +"CC" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#3B2B1A" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"CL" = ( +/obj/structure/chess/blackpawn, +/turf/open/floor/plasteel/f13/whitemarble{ + color = "#666666" + }, +/area/hilbertshotel) +"DS" = ( +/obj/structure/chair/pew/left, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 1; + pixel_y = 12 + }, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"EP" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/whitemarble, +/area/hilbertshotel) +"FZ" = ( +/obj/structure/chair/pew{ + dir = 4 + }, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"Gv" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 4; + light_color = "#f4e3b0" + }, +/turf/open/floor/plasteel/f13/whitemarble{ + color = "#666666" + }, +/area/hilbertshotel) +"Gx" = ( +/obj/structure/chess/whitebishop, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/whitemarble{ + color = "#666666" + }, +/area/hilbertshotel) +"GE" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 4; + light_color = "#f4e3b0" + }, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"Hc" = ( +/obj/structure/chess/whitequeen, +/turf/open/floor/plasteel/f13/whitemarble{ + color = "#666666" + }, +/area/hilbertshotel) +"Hj" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 2; + light_color = "#f4e3b0" + }, +/turf/open/floor/plasteel/f13/whitemarble, +/area/hilbertshotel) +"JK" = ( +/obj/structure/chess/blackking, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/whitemarble, +/area/hilbertshotel) +"JP" = ( +/obj/structure/chess/whiterook, +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 2; + light_color = "#f4e3b0"; + mouse_opacity = 0; + alpha = 0 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/whitemarble{ + color = "#666666" + }, +/area/hilbertshotel) +"JS" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 2; + light_color = "#f4e3b0" + }, +/obj/item/candle/infinite, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"KF" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/candle/infinite, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"Md" = ( +/obj/structure/chess/blackbishop, +/turf/open/floor/plasteel/f13/whitemarble{ + color = "#666666" + }, +/area/hilbertshotel) +"MJ" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 8; + light_color = "#f4e3b0" + }, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"OI" = ( +/obj/structure/chess/blackqueen, +/turf/open/floor/plasteel/f13/whitemarble{ + color = "#666666" + }, +/area/hilbertshotel) +"Pg" = ( +/obj/structure/chess/whitebishop, +/turf/open/floor/plasteel/f13/whitemarble, +/area/hilbertshotel) +"Rx" = ( +/obj/item/candle/infinite, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"RD" = ( +/obj/structure/chess/blackknight, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/whitemarble{ + color = "#666666" + }, +/area/hilbertshotel) +"RU" = ( +/obj/structure/chess/whiteking, +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 2; + light_color = "#f4e3b0"; + mouse_opacity = 0; + alpha = 0 + }, +/turf/open/floor/plasteel/f13/whitemarble, +/area/hilbertshotel) +"RV" = ( +/obj/structure/destructible/tribal_torch/lit, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"Sd" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/falsewall/wood, +/turf/open/indestructible/ground/outside/desert, +/area/hilbertshotel) +"So" = ( +/obj/structure/chess/whitepawn, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/whitemarble, +/area/hilbertshotel) +"Uc" = ( +/obj/structure/chess/whiteknight, +/turf/open/floor/plasteel/f13/whitemarble{ + color = "#666666" + }, +/area/hilbertshotel) +"Uk" = ( +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 2; + light_color = "#f4e3b0"; + mouse_opacity = 0; + alpha = 0 + }, +/turf/open/floor/plasteel/f13/whitemarble, +/area/hilbertshotel) +"Ur" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#3B2B1A" + }, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"Wu" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/vending/kink, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"Wx" = ( +/turf/open/floor/plasteel/f13/whitemarble{ + color = "#666666" + }, +/area/hilbertshotel) +"Wz" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"WN" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/whitemarble{ + color = "#666666" + }, +/area/hilbertshotel) +"WS" = ( +/obj/structure/chair/pew/left{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"Xf" = ( +/turf/open/floor/plasteel/f13/whitemarble, +/area/hilbertshotel) +"Xw" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#3B2B1A" + }, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"XE" = ( +/obj/structure/chess/blackrook, +/turf/open/floor/plasteel/f13/whitemarble, +/area/hilbertshotel) +"Ya" = ( +/obj/structure/chair/pew/right, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"YJ" = ( +/obj/structure/chair/pew/right, +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 1; + pixel_y = 12 + }, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"YY" = ( +/obj/structure/chair/pew/right{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"Zc" = ( +/obj/structure/chair/pew, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) +"Ze" = ( +/obj/structure/chess/whiterook, +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 2; + light_color = "#f4e3b0"; + mouse_opacity = 0; + alpha = 0 + }, +/turf/open/floor/plasteel/f13/whitemarble, +/area/hilbertshotel) +"Zr" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4; + color = "#3B2B1A" + }, +/obj/structure/destructible/tribal_torch/lit, +/turf/open/indestructible/cobble/dark, +/area/hilbertshotel) + +(1,1,1) = {" +is +is +is +is +is +is +is +is +is +is +is +is +is +is +is +is +is +is +is +is +"} +(2,1,1) = {" +is +Wu +zL +oF +MJ +yb +oF +MJ +yb +yb +yb +MJ +yb +yb +th +Xf +Xf +Xf +wi +is +"} +(3,1,1) = {" +is +fN +is +rJ +oF +Wz +RV +oF +jk +FZ +FZ +FZ +my +oF +Xf +Xf +Xf +Xf +Xf +is +"} +(4,1,1) = {" +is +cs +oF +oG +yb +oG +yb +oF +oF +oF +oF +yb +oF +jD +Xf +EP +Xf +vS +Hj +is +"} +(5,1,1) = {" +is +Zc +oF +Zc +oF +Zc +yb +yb +fo +om +om +iM +iM +om +om +iM +sW +Zr +lf +is +"} +(6,1,1) = {" +is +rM +oF +Zc +oF +Zc +yb +yb +ql +XE +zw +vS +WN +Xf +Wx +So +JP +uY +kO +is +"} +(7,1,1) = {" +is +YJ +oF +dl +yb +dl +yb +oF +eP +RD +hR +WN +Xf +aD +Xf +Cp +dZ +uY +yb +is +"} +(8,1,1) = {" +is +dN +yb +RV +yb +RV +yb +to +eP +AD +CL +vS +WN +Xf +Wx +uM +Gx +CC +JS +is +"} +(9,1,1) = {" +hO +yb +yb +oF +yb +oF +yb +KF +Ur +OI +sx +WN +vS +Wx +vS +lL +RU +CC +yb +cJ +"} +(10,1,1) = {" +hO +yb +oF +oF +yb +oF +yb +oF +ou +JK +CL +vS +Wx +Uk +WN +uM +Hc +lD +yb +cJ +"} +(11,1,1) = {" +is +jB +yb +RV +yb +RV +yb +yb +eP +Md +hR +Wx +vS +Wx +vS +lL +Pg +lD +ni +is +"} +(12,1,1) = {" +is +DS +oF +oG +oF +An +yb +yb +eP +lX +zw +zl +Wx +Uk +WN +uM +Uc +uk +yb +is +"} +(13,1,1) = {" +is +rM +oF +Zc +oF +rM +yb +Rx +eP +iv +hR +Wx +Xf +Wx +vS +lL +Ze +lD +yb +is +"} +(14,1,1) = {" +is +rM +oF +rM +oF +Zc +yb +oF +sM +eh +Xw +eh +tn +eh +Xw +Xw +Xw +de +yb +is +"} +(15,1,1) = {" +is +tU +oF +Ya +oF +dl +yb +oF +WN +WN +WN +Wx +WN +oF +yb +yb +jD +oF +ni +is +"} +(16,1,1) = {" +is +is +is +rJ +oF +Wz +qV +oF +Wx +Wx +Wx +Wx +Wx +oF +WS +uZ +uZ +uZ +YY +is +"} +(17,1,1) = {" +is +fX +Sd +oF +GE +yb +wl +gd +WN +Wx +Wx +Gv +Wx +yb +GE +yb +yb +yb +GE +is +"} +(18,1,1) = {" +is +is +is +is +is +is +is +is +is +is +is +is +is +is +is +is +is +is +is +is +"} diff --git a/code/datums/mutable_appearance.dm b/code/datums/mutable_appearance.dm index 6f5e031982..e1bd2852e1 100644 --- a/code/datums/mutable_appearance.dm +++ b/code/datums/mutable_appearance.dm @@ -4,10 +4,10 @@ // Mutable appearances are children of images, just so you know. -/mutable_appearance/New() - ..() - plane = FLOAT_PLANE // No clue why this is 0 by default yet images are on FLOAT_PLANE - // And yes this does have to be in the constructor, BYOND ignores it if you set it as a normal var +// /mutable_appearance/New() +// ..() +// plane = FLOAT_PLANE // No clue why this is 0 by default yet images are on FLOAT_PLANE +// // And yes this does have to be in the constructor, BYOND ignores it if you set it as a normal var // Helper similar to image() /proc/mutable_appearance(icon, icon_state = "", layer = FLOAT_LAYER, plane = FLOAT_PLANE, color = "#FFFFFF") diff --git a/code/game/machinery/dance_machine_online.dm b/code/game/machinery/dance_machine_online.dm index eebbbd9301..660d8d1688 100644 --- a/code/game/machinery/dance_machine_online.dm +++ b/code/game/machinery/dance_machine_online.dm @@ -8,14 +8,17 @@ var/pendingsongurl = "" /obj/machinery/jukebox_online/on_attack_hand(mob/living/user, act_intent, unarmed_attack_flags) - var/songinput = input(user, "Enter URL (supported sites only, leave blank to stop playing)", "Online Jukebox") as text|null + var/songinput = input(user, "Enter URL (supported sites only, leave blank to stop playing.) We suggest soundcloud and bandcamp, Youtube blocked our data center.", "Online Jukebox") as text|null if(isnull(songinput) || !length(songinput)) stop_online_song() return pendingsongurl = songinput var/adminmessage = "[user.name] wants to play [pendingsongurl]
You can Allow or Deny." - for(var/admin in GLOB.admins.Copy()) + for(var/client/admin in GLOB.admins.Copy()) to_chat(admin, adminmessage, confidential = TRUE) + if(admin.prefs.toggles & SOUND_ADMINHELP) + SEND_SOUND(admin, sound('sound/effects/direct_message_recieved.ogg')) + window_flash(admin, ignorepref = TRUE) /obj/machinery/jukebox_online/Topic(href, href_list[]) if(pendingsongurl == href_list["url"]) diff --git a/code/modules/arousal/genitals.dm b/code/modules/arousal/genitals.dm index fc86ef429d..407bf0997d 100644 --- a/code/modules/arousal/genitals.dm +++ b/code/modules/arousal/genitals.dm @@ -597,7 +597,7 @@ GLOBAL_LIST_INIT(genital_layers, list( continue /// this SHOULD(tm) make arms show up over butts from the front -- currently broken, love Lagg var/icon/grundle_out = nad.mask_part(accessory_icon, genital_state, layer_to_put_it, position) - var/mutable_appearance/genital_overlay = mutable_appearance(grundle_out ? grundle_out : accessory_icon, genital_state, layer = -layer_to_put_it) + var/image/genital_overlay = mutable_appearance(grundle_out ? grundle_out : accessory_icon, genital_state, layer = -layer_to_put_it) var/image/gross_image = image(grundle_out ? grundle_out : accessory_icon, src, genital_state, layer = -layer_to_put_it) // mutable appearances just... dont work for client images. rip performance if(do_center) diff --git a/modular_splurt/code/modules/hilbertshotel/hilbertshotel.dm b/modular_splurt/code/modules/hilbertshotel/hilbertshotel.dm index 77300cf90e..b1f0c84b02 100644 --- a/modular_splurt/code/modules/hilbertshotel/hilbertshotel.dm +++ b/modular_splurt/code/modules/hilbertshotel/hilbertshotel.dm @@ -25,6 +25,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) "Oasis-One", "Snowcabin-One", "Hospital", + "Chess", ) var/datum/map_template/hilbertshotel/apartment/one/hilberts_hotel_rooms_apartment_one var/datum/map_template/hilbertshotel/apartment/two/hilberts_hotel_rooms_apartment_two @@ -40,6 +41,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) var/datum/map_template/hilbertshotel/apartment/oasis_one/oasis_one var/datum/map_template/hilbertshotel/apartment/snowcabin_one/snowcabin_one var/datum/map_template/hilbertshotel/apartment/hospital_one/hospital_one + var/datum/map_template/hilbertshotel/apartment/chessboard/thechess //FB Maps End var/datum/map_template/hilbertshotel/hotelRoomTemp var/datum/map_template/hilbertshotel/empty/hotelRoomTempEmpty @@ -76,6 +78,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) oasis_one = new() snowcabin_one = new() hospital_one = new() + thechess = new() /obj/hilbertshotel/Destroy() ejectRooms() @@ -260,6 +263,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) if("Oasis-One") return oasis_one if("Snowcabin-One") return snowcabin_one if("Hospital") return hospital_one + if("Chess") return thechess if("Mystery Room") return hotelRoomTempLore return hotelRoomTemp // Default to Hotel Room if no match is found @@ -288,6 +292,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) if("Oasis-One") mapTemplate = oasis_one if("Snowcabin-One") mapTemplate = snowcabin_one if("Hospital") mapTemplate = hospital_one + if("Chess") mapTemplate = thechess if(!mapTemplate) mapTemplate = hotelRoomTemp //Default Hotel Room @@ -711,6 +716,9 @@ There's always more room around every bend Not all that's countable has an end..._ "} +/datum/map_template/hilbertshotel/apartment/chessboard + name = "Chess" + mappath = '_maps/templates/splurt_templates/hilbertshotel_templates/chess.dmm' // Better SPLURT version of hilbert's /datum/map_template/hilbertshotel @@ -770,7 +778,6 @@ Not all that's countable has an end..._ name = "Hospital" mappath = '_maps/templates/splurt_templates/hilbertshotel_templates/hospital.dmm' - // Fluff - Misc /obj/item/paper/fluff/hilbertshotel/welcomeletter name = "Welcome Letter"