cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-01-03 21:54:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

paper code is weird rn

Browse Source
This commit is contained in:
Linzolle
2019-10-20 16:53:47 -05:00
parent c59f15a8bc
commit 6ddd1181a8
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/oracle_ui/hookup_procs.dm
View File

@@ -23,6 +23,8 @@
return TRUE return TRUE
if(user.incapacitated()) if(user.incapacitated())
return FALSE return FALSE
if(isobj(src.loc) && get_dist(src, user) < 2)
return TRUE
if(isturf(src.loc) && Adjacent(user)) if(isturf(src.loc) && Adjacent(user))
return TRUE return TRUE
return FALSE return FALSE

17
code/modules/paperwork/paper.dm
View File

@@ -59,7 +59,7 @@
updateinfolinks() updateinfolinks()
/obj/item/paper/oui_getcontent(mob/target) /obj/item/paper/oui_getcontent(mob/target)
if(!target.is_literate()) if(!target.is_literate() || isAI(target))
return "<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(info)]<HR>[stamps]</BODY></HTML>" return "<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(info)]<HR>[stamps]</BODY></HTML>"
else if(istype(target.get_active_held_item(), /obj/item/pen) | istype(target.get_active_held_item(), /obj/item/toy/crayon)) else if(istype(target.get_active_held_item(), /obj/item/pen) | istype(target.get_active_held_item(), /obj/item/toy/crayon))
return "<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info_links]<HR>[stamps]</BODY><div align='right'style='position:fixed;bottom:0;font-style:bold;'><A href='?src=[REF(src)];help=1'>\[?\]</A></div></HTML>" return "<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info_links]<HR>[stamps]</BODY><div align='right'style='position:fixed;bottom:0;font-style:bold;'><A href='?src=[REF(src)];help=1'>\[?\]</A></div></HTML>"
@@ -70,8 +70,7 @@
if(check_rights_for(target.client, R_FUN)) //Allows admins to view faxes if(check_rights_for(target.client, R_FUN)) //Allows admins to view faxes
return TRUE return TRUE
if(isAI(target)) if(isAI(target))
var/mob/living/silicon/ai/ai = target return TRUE
return get_dist(src, ai.current) < 2
if(iscyborg(target)) if(iscyborg(target))
return get_dist(src, target) < 2 return get_dist(src, target) < 2
return ..() return ..()
@@ -133,18 +132,8 @@
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1) playsound(loc, 'sound/items/bikehorn.ogg', 50, 1)
addtimer(CALLBACK(src, .proc/reset_spamflag), 20) addtimer(CALLBACK(src, .proc/reset_spamflag), 20)
/obj/item/paper/attack_ai(mob/living/silicon/ai/user) /obj/item/paper/attack_ai(mob/living/silicon/ai/user)
var/dist show_content(user)
if(istype(user) && user.current) //is AI
dist = get_dist(src, user.current)
else //cyborg or AI not seeing through a camera
dist = get_dist(src, user)
if(dist < 2)
show_content(user)
else
to_chat(user, "<span class='notice'>You can't quite see it.</span>")
/obj/item/paper/proc/addtofield(id, text, links = 0) /obj/item/paper/proc/addtofield(id, text, links = 0)
var/locid = 0 var/locid = 0