From db565f37ef44a92f9d70386619d0141848e30655 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 19 Aug 2020 03:06:45 +0200 Subject: [PATCH] The holodeck will no longer spawn invisible tables, and WILL spawn floor decals. (#52924) (#378) * Fixes holodeck making invisible tables. * Removes comment. * Remove extra space. * Just gets rid of overlays from forbidden vars list. * Small map fixes for the lounge sim. Co-authored-by: uomo <51800976+uomo91@users.noreply.github.com> --- _maps/map_files/generic/CentCom.dmm | 8 +++----- code/modules/holodeck/area_copy.dm | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index d8a6af9a921..2d984efbf4a 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -161,9 +161,9 @@ /area/holodeck/rec_center/bunker) "az" = ( /obj/structure/table/wood, -/obj/item/storage/box/matches{ - pixel_x = -4; - pixel_y = 8 +/obj/item/lighter{ + pixel_x = 3; + pixel_y = 3 }, /turf/open/floor/holofloor{ dir = 9; @@ -305,13 +305,11 @@ /area/holodeck/rec_center/lounge) "aU" = ( /turf/open/floor/holofloor{ - dir = 9; icon_state = "stairs-l" }, /area/holodeck/rec_center/lounge) "aV" = ( /turf/open/floor/holofloor{ - dir = 9; icon_state = "stairs-r" }, /area/holodeck/rec_center/lounge) diff --git a/code/modules/holodeck/area_copy.dm b/code/modules/holodeck/area_copy.dm index 19a2615b731..7aee471ed29 100644 --- a/code/modules/holodeck/area_copy.dm +++ b/code/modules/holodeck/area_copy.dm @@ -2,7 +2,7 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars,list( "tag", "datum_components", "area", "type", "loc", "locs", "vars", "parent", "parent_type", "verbs", "ckey", "key", "power_supply", "contents", "reagents", "stat", "x", "y", "z", "group", "atmos_adjacent_turfs", "comp_lookup", - "client_mobs_in_contents", "bodyparts", "internal_organs", "hand_bodyparts", "overlays", "overlays_standing", "hud_list", + "client_mobs_in_contents", "bodyparts", "internal_organs", "hand_bodyparts", "overlays_standing", "hud_list", "actions", "AIStatus", "appearance", "managed_overlays", "managed_vis_overlays", "computer_id", "lastKnownIP", "implants", "tgui_shared_states" ))