From f1d4fefa2d66b989160d727c88089d46bed0a488 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 23 Dec 2021 04:45:32 +0100 Subject: [PATCH] [MIRROR] Fixes FOV and potted plants hiding [MDB IGNORE] (#10175) * Fixes FOV and potted plants hiding * E Co-authored-by: Azarak Co-authored-by: Gandalf --- _maps/map_files/KiloStation/KiloStation.dmm | 17 ----------------- code/datums/components/tactical.dm | 1 + 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 9426f7313a4..2f983409e38 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -32704,12 +32704,6 @@ "fxF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/event_spawn, -/mob/living/simple_animal/hostile/russian, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/event_spawn, /mob/living/simple_animal/hostile/russian{ environment_smash = 0; loot = list(/obj/effect/mob_spawn/corpse/human/russian); @@ -37996,12 +37990,6 @@ "hAC" = ( /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/mob/living/simple_animal/hostile/russian, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /mob/living/simple_animal/hostile/russian{ environment_smash = 0; loot = list(/obj/effect/mob_spawn/corpse/human/russian); @@ -48266,11 +48254,6 @@ /area/engineering/break_room) "liB" = ( /obj/structure/chair/stool/bar/directional/west, -/mob/living/simple_animal/hostile/russian, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/chair/stool/bar/directional/west, /mob/living/simple_animal/hostile/russian{ environment_smash = 0; loot = list(/obj/effect/mob_spawn/corpse/human/russian); diff --git a/code/datums/components/tactical.dm b/code/datums/components/tactical.dm index d1941f8a72f..47677755acb 100644 --- a/code/datums/components/tactical.dm +++ b/code/datums/components/tactical.dm @@ -28,6 +28,7 @@ var/obj/item/master = parent var/image/I = image(icon = master.icon, icon_state = master.icon_state, loc = user) + I.plane = GAME_PLANE_FOV_HIDDEN I.copy_overlays(master) I.override = TRUE source.add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/everyone, "sneaking_mission", I)