diff --git a/code/modules/materials/materials_vr.dm b/code/modules/materials/materials_vr.dm index 16e5fa3ae66..e89aca0521f 100644 --- a/code/modules/materials/materials_vr.dm +++ b/code/modules/materials/materials_vr.dm @@ -24,3 +24,9 @@ display_name = "darkglass" icon_base = "darkglass" icon_colour = "#FFFFFF" + +/material/fancyblack + name = "fancyblack" + display_name = "fancyblack" + icon_base = "fancyblack" + icon_colour = "#FFFFFF" diff --git a/code/modules/tables/presets_vr.dm b/code/modules/tables/presets_vr.dm index 085c4c6d8f5..ccb852a256a 100644 --- a/code/modules/tables/presets_vr.dm +++ b/code/modules/tables/presets_vr.dm @@ -19,3 +19,24 @@ return /obj/structure/table/alien/blue icon = 'icons/turf/shuttle_alien_blue.dmi' + + +/obj/structure/table/fancyblack + name = "fancy table" + desc = "Cloth!" + icon = 'icons/obj/tablesfancy_vr.dmi' + icon_state = "fancyblack" + flipped = -1 + can_reinforce = FALSE + can_plate = FALSE + +/obj/structure/table/fancyblack/New() + material = get_material_by_name("fancyblack") + verbs -= /obj/structure/table/verb/do_flip + verbs -= /obj/structure/table/proc/do_put + + ..() + +/obj/structure/table/fancyblack/dismantle(obj/item/weapon/wrench/W, mob/user) + to_chat(user, "You cannot dismantle \the [src].") + return \ No newline at end of file diff --git a/icons/obj/tablesfancy_vr.dmi b/icons/obj/tablesfancy_vr.dmi new file mode 100644 index 00000000000..0f6c3c88c0a Binary files /dev/null and b/icons/obj/tablesfancy_vr.dmi differ diff --git a/maps/tether/submaps/om_ships/aro2.dmm b/maps/tether/submaps/om_ships/aro2.dmm index a50769d10c4..9f9b704eb01 100644 --- a/maps/tether/submaps/om_ships/aro2.dmm +++ b/maps/tether/submaps/om_ships/aro2.dmm @@ -2279,11 +2279,11 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/structure/table/woodentable, /obj/machinery/atmospherics/unary/vent_scrubber/on{ icon_state = "map_scrubber_on"; dir = 4 }, +/obj/structure/table/fancyblack, /turf/simulated/floor/wood, /area/aro2/cafe) "eC" = ( @@ -2526,7 +2526,6 @@ /turf/simulated/floor/wood, /area/aro2/cafe) "eY" = ( -/obj/structure/table/woodentable, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -2535,6 +2534,7 @@ pixel_x = 0; pixel_y = -25 }, +/obj/structure/table/fancyblack, /turf/simulated/floor/wood, /area/aro2/cafe) "eZ" = ( @@ -2592,10 +2592,10 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/aro2/holodeckroom) "fg" = ( -/obj/structure/table/woodentable, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/table/fancyblack, /turf/simulated/floor/wood, /area/aro2/cafe) "fh" = ( @@ -4488,10 +4488,10 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/structure/table/woodentable, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/structure/table/fancyblack, /turf/simulated/floor/wood, /area/aro2/cafe) "tR" = ( diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index c654a6866cc..e1c2ea92a4a 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -27480,17 +27480,17 @@ /turf/simulated/floor/carpet/sblucarpet, /area/bridge/meeting_room) "aXf" = ( -/obj/structure/table/woodentable, /obj/item/weapon/book/manual/security_space_law, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/structure/table/fancyblack, /turf/simulated/floor/carpet/sblucarpet, /area/bridge/meeting_room) "aXg" = ( -/obj/structure/table/woodentable, /obj/item/weapon/folder/red, /obj/structure/disposalpipe/segment, +/obj/structure/table/fancyblack, /turf/simulated/floor/carpet/sblucarpet, /area/bridge/meeting_room) "aXh" = ( @@ -27539,7 +27539,6 @@ /turf/simulated/floor/carpet/sblucarpet, /area/bridge/meeting_room) "aXn" = ( -/obj/structure/table/woodentable, /obj/item/weapon/paper_bin{ pixel_x = -3; pixel_y = 7 @@ -27548,6 +27547,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/table/fancyblack, /turf/simulated/floor/carpet/sblucarpet, /area/bridge/meeting_room) "aXo" = ( @@ -27626,9 +27626,9 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "aXx" = ( -/obj/structure/table/woodentable, /obj/item/weapon/folder/blue, /obj/structure/disposalpipe/segment, +/obj/structure/table/fancyblack, /turf/simulated/floor/carpet/sblucarpet, /area/bridge/meeting_room) "aXy" = (