cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10059 from Baystation12/master

Browse Source 
Dev-freeze
This commit is contained in:
PsiOmegaDelta
2015-07-09 08:34:43 +02:00
parent 191832bf06 5812622524
commit 14acf43646
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/topic.dm
View File

@@ -1344,7 +1344,7 @@
var/obj/item/fax = locate(href_list["AdminFaxView"]) var/obj/item/fax = locate(href_list["AdminFaxView"])
if (istype(fax, /obj/item/weapon/paper)) if (istype(fax, /obj/item/weapon/paper))
var/obj/item/weapon/paper/P = fax var/obj/item/weapon/paper/P = fax
P.show_content(usr) P.show_content(usr,1)
else if (istype(fax, /obj/item/weapon/photo)) else if (istype(fax, /obj/item/weapon/photo))
var/obj/item/weapon/photo/H = fax var/obj/item/weapon/photo/H = fax
H.show(usr) H.show(usr)

5
code/modules/mob/new_player/new_player.dm
View File

@@ -120,8 +120,11 @@
observer.started_as_observer = 1 observer.started_as_observer = 1
close_spawn_windows() close_spawn_windows()
var/obj/O = locate("landmark*Observer-Start") var/obj/O = locate("landmark*Observer-Start")
src << "\blue Now teleporting." if(istype(O))
src << "<span class='notice'>Now teleporting.</span>"
observer.loc = O.loc observer.loc = O.loc
else
src << "<span class='danger'>Could not locate an observer spawn point. Use the Teleport verb to jump to the station map.</span>"
observer.timeofdeath = world.time // Set the time of death so that the respawn timer works correctly. observer.timeofdeath = world.time // Set the time of death so that the respawn timer works correctly.
announce_ghost_joinleave(src) announce_ghost_joinleave(src)