cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 22:42:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Written Language Fix (#11729)

Browse Source
This commit is contained in:
Geeves
2021-04-23 12:54:02 +02:00
committed by GitHub
parent 58968a867b
commit 8e41751bb3
5 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/clipboard.dm
+2 -9
View File
@@ -168,15 +168,8 @@
else if(href_list["read"])
var/obj/item/paper/P = locate(href_list["read"])
if(P && (P.loc == src) && istype(P, /obj/item/paper) )
if(!(istype(usr, /mob/living/carbon/human) || istype(usr, /mob/abstract/observer) || istype(usr, /mob/living/silicon)))
usr << browse("<HTML><HEAD><TITLE>[P.name]</TITLE></HEAD><BODY>[stars(P.info)][P.stamps]</BODY></HTML>", "window=[P.name]")
onclose(usr, "[P.name]")
else
usr << browse("<HTML><HEAD><TITLE>[P.name]</TITLE></HEAD><BODY>[P.info][P.stamps]</BODY></HTML>", "window=[P.name]")
onclose(usr, "[P.name]")
if(istype(P) && (P.loc == src))
P.show_content(usr)
else if(href_list["look"])
var/obj/item/photo/P = locate(href_list["look"])
code/modules/paperwork/folders.dm
+1 -6
View File
@@ -80,12 +80,7 @@
else if(href_list["read"])
var/obj/item/paper/P = locate(href_list["read"])
if(P && (P.loc == src) && istype(P))
if(!(istype(usr, /mob/living/carbon/human) || istype(usr, /mob/abstract/observer) || istype(usr, /mob/living/silicon)))
usr << browse("<HTML><HEAD><TITLE>[P.name]</TITLE></HEAD><BODY>[stars(P.info)][P.stamps]</BODY></HTML>", "window=[P.name]")
onclose(usr, "[P.name]")
else
usr << browse("<HTML><HEAD><TITLE>[P.name]</TITLE></HEAD><BODY>[P.info][P.stamps]</BODY></HTML>", "window=[P.name]")
onclose(usr, "[P.name]")
P.show_content(usr)
else if(href_list["look"])
var/obj/item/photo/P = locate(href_list["look"])
if(P && (P.loc == src) && istype(P))
code/modules/paperwork/paper.dm
+9 -4
View File
@@ -102,15 +102,20 @@
/obj/item/paper/proc/show_content(mob/user, forceshow)
var/datum/browser/paper_win = new(user, name, null, 450, 500, null, TRUE)
paper_win.set_content(get_content(user, can_read(user, forceshow)))
paper_win.add_stylesheet("paper_languages", 'html/browser/paper_languages.css')
paper_win.open()
/obj/item/paper/proc/can_read(var/mob/user, var/forceshow = FALSE)
var/can_read = (istype(user, /mob/living/carbon/human) || isobserver(user) || istype(user, /mob/living/silicon)) || forceshow
if(!forceshow && istype(user,/mob/living/silicon/ai))
var/mob/living/silicon/ai/AI
can_read = get_dist(src, AI.camera) < 2
return can_read
var/datum/browser/paper_win = new(user, name, null, 450, 500, null, TRUE)
paper_win.set_content("<head><title>[capitalize_first_letters(name)]</title><style>body {background-color: [color];}</style></head><body>[can_read ? parse_languages(user, info) : stars(info)][stamps]</body>")
paper_win.add_stylesheet("paper_languages", 'html/browser/paper_languages.css')
paper_win.open()
/obj/item/paper/proc/get_content(var/mob/user, var/can_read = TRUE)
return "<head><title>[capitalize_first_letters(name)]</title><style>body {background-color: [color];}</style></head><body>[can_read ? parse_languages(user, info) : stars(info)][stamps]</body>"
/obj/item/paper/verb/rename()
set name = "Rename paper"
code/modules/paperwork/paper_bundle.dm
+7 -5
View File
@@ -120,11 +120,13 @@
if(istype(pages[page], /obj/item/paper))
var/obj/item/paper/P = W
if(!(istype(usr, /mob/living/carbon/human) || istype(usr, /mob/abstract/observer) || istype(usr, /mob/living/silicon)))
dat+= "<HTML><HEAD><TITLE>[P.name]</TITLE></HEAD><BODY>[stars(P.info)][P.stamps]</BODY></HTML>"
else
dat+= "<HTML><HEAD><TITLE>[P.name]</TITLE></HEAD><BODY>[P.info][P.stamps]</BODY></HTML>"
user << browse(dat, "window=[name]")
dat += P.get_content(user, P.can_read(user))
var/datum/browser/paper_win = new(user, name, null, 450, 500, null, TRUE)
paper_win.set_content(dat)
paper_win.add_stylesheet("paper_languages", 'html/browser/paper_languages.css')
paper_win.open()
else if(istype(pages[page], /obj/item/photo))
var/obj/item/photo/P = W
send_rsc(user, P.img, "tmp_photo.png")