From f011e9a1445ef91a6d86e60669d9a04d5eeafd64 Mon Sep 17 00:00:00 2001 From: Geeves Date: Sun, 4 Oct 2020 19:51:32 +0200 Subject: [PATCH] Wall Mounted Objects Fix (#10172) --- code/game/machinery/computer/guestpass.dm | 1 + code/game/machinery/cryopod.dm | 1 + code/game/machinery/newscaster.dm | 3 ++- code/game/machinery/recharger.dm | 3 ++- code/game/machinery/requests_console.dm | 3 ++- code/game/machinery/ringer.dm | 1 + code/game/objects/items/devices/radio/intercom.dm | 3 ++- html/changelogs/geeves-newscaster_fix.yml | 6 ++++++ 8 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/geeves-newscaster_fix.yml diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm index f53fc3b3377..f8aae350e65 100644 --- a/code/game/machinery/computer/guestpass.dm +++ b/code/game/machinery/computer/guestpass.dm @@ -59,6 +59,7 @@ icon_screen = "guest" icon_scanline = "altcomputerw-scanline" density = FALSE + appearance_flags = TILE_BOUND // prevents people from viewing the overlay through a wall var/obj/item/card/id/giver var/list/accesses = list() diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index e635d4063ac..39248311f32 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -18,6 +18,7 @@ var/global/list/frozen_crew = list() circuit = /obj/item/circuitboard/cryopodcontrol density = FALSE interact_offline = TRUE + appearance_flags = TILE_BOUND // prevents people from viewing the overlay through a wall icon_screen = "cryo" icon_scanline = "altcomputerw-scanline" diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 27e33ef836c..958518b4021 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -9,6 +9,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co desc = "A standard newsfeed handler for use on commercial space stations. All the news you absolutely have no use for, in one place!" icon = 'icons/obj/terminals.dmi' icon_state = "newscaster" + anchored = TRUE + appearance_flags = TILE_BOUND // prevents people from viewing the overlay through a wall var/isbroken = 0 //1 if someone banged it with something heavy var/ispowered = 1 //starts powered, changes with power_change() //var/list/datum/feed_channel/channel_list = list() //This list will contain the names of the feed channels. Each name will refer to a data region where the messages of the feed channels are stored. @@ -51,7 +53,6 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co var/datum/feed_channel/viewing_channel = null var/datum/feed_message/viewing_message = null var/global/list/screen_overlays - anchored = 1 /obj/machinery/newscaster/proc/generate_overlays(var/force = 0) if(LAZYLEN(screen_overlays) && !force) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 2eb4fa8b2ea..4aa07df9061 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -176,4 +176,5 @@ icon_state_charged = "wrecharger100" icon_state_charging = "wrecharger" icon_state_idle = "wrecharger_off" - portable = 0 + appearance_flags = TILE_BOUND // prevents people from viewing us through a wall + portable = FALSE \ No newline at end of file diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 1880f1f4919..100b67f9b86 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -26,7 +26,6 @@ var/list/obj/machinery/requests_console/allConsoles = list() /obj/machinery/requests_console name = "Requests Console" desc = "A console intended to send requests to different departments on the station." - anchored = 1 icon = 'icons/obj/terminals.dmi' icon_state = "req_comp" component_types = list( @@ -34,6 +33,8 @@ var/list/obj/machinery/requests_console/allConsoles = list() /obj/item/stock_parts/capacitor, /obj/item/stock_parts/console_screen, ) + anchored = TRUE + appearance_flags = TILE_BOUND // prevents people from viewing the overlay through a wall var/department = "Unknown" //The list of all departments on the station (Determined from this variable on each unit) Set this to the same thing if you want several consoles in one department var/list/message_log = list() //List of all messages var/departmentType = 0 //Bitflag. Zero is reply-only. Map currently uses raw numbers instead of defines. diff --git a/code/game/machinery/ringer.dm b/code/game/machinery/ringer.dm index 5437122b70e..da356e3e6cd 100644 --- a/code/game/machinery/ringer.dm +++ b/code/game/machinery/ringer.dm @@ -4,6 +4,7 @@ icon = 'icons/obj/terminals.dmi' icon_state = "bell" anchored = TRUE + appearance_flags = TILE_BOUND // prevents people from viewing the overlay through a wall req_access = list() //what access it needs to link your pda diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index b7eba37d9b2..a299454e514 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -2,7 +2,8 @@ name = "station intercom (General)" desc = "Talk through this." icon_state = "intercom" - anchored = 1 + anchored = TRUE + appearance_flags = TILE_BOUND // prevents people from viewing the overlay through a wall w_class = ITEMSIZE_LARGE canhear_range = 2 flags = CONDUCT | NOBLOODY diff --git a/html/changelogs/geeves-newscaster_fix.yml b/html/changelogs/geeves-newscaster_fix.yml new file mode 100644 index 00000000000..c4d9eb96794 --- /dev/null +++ b/html/changelogs/geeves-newscaster_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Fixes various wall-mounted objects being seen through walls when they shouldn't be." \ No newline at end of file