From fecfd8638998b204f849bd0e07dc64bdae55d612 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sat, 18 Apr 2020 21:45:09 -0400 Subject: [PATCH] Adds fancy tables --- code/modules/materials/materials_vr.dm | 6 ++++++ code/modules/tables/presets_vr.dm | 21 +++++++++++++++++++++ icons/obj/tablesfancy_vr.dmi | Bin 0 -> 3647 bytes maps/tether/submaps/om_ships/aro2.dmm | 8 ++++---- maps/tether/tether-02-surface2.dmm | 8 ++++---- 5 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 icons/obj/tablesfancy_vr.dmi 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 0000000000000000000000000000000000000000..0f6c3c88c0a17902d843cf39960b8655f5b9884b GIT binary patch literal 3647 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 literal 0 HcmV?d00001 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" = (