From 0f764d8779b9e5855e3596e478f4a3c5499b82d1 Mon Sep 17 00:00:00 2001 From: ccomp5950 Date: Wed, 8 Jul 2015 10:45:30 -0400 Subject: [PATCH 1/2] Admins will no longer see stars when viewing faxes. If an admin wasn't human / ghosting / or a silicon mob they would see garbled text. This uses the "force view" setting to 1 bypassing the check. Fixes #10050 --- code/modules/admin/topic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 3f6e3242ad..564188ac18 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1478,7 +1478,7 @@ var/obj/item/fax = locate(href_list["AdminFaxView"]) if (istype(fax, /obj/item/weapon/paper)) var/obj/item/weapon/paper/P = fax - P.show_content(usr) + P.show_content(usr,1) else if (istype(fax, /obj/item/weapon/photo)) var/obj/item/weapon/photo/H = fax H.show(usr) From 9d02b41ae7ef5dffbc58b206ff0baee51e7625ca Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 9 Jul 2015 11:01:42 +0930 Subject: [PATCH 2/2] Emergency workaround for the observer bug. --- code/modules/mob/new_player/new_player.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 4222fc9651..445caab39c 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -119,8 +119,11 @@ observer.started_as_observer = 1 close_spawn_windows() var/obj/O = locate("landmark*Observer-Start") - src << "\blue Now teleporting." - observer.loc = O.loc + if(istype(O)) + src << "Now teleporting." + observer.loc = O.loc + else + src << "Could not locate an observer spawn point. Use the Teleport verb to jump to the station map." observer.timeofdeath = world.time // Set the time of death so that the respawn timer works correctly. announce_ghost_joinleave(src)