Pen and PDA related fixes (#7483)

This commit is contained in:
Wowzewow (Wezzy)
2019-11-25 15:51:28 +08:00
committed by Werner
parent e56b92d308
commit d4a30eb847
4 changed files with 56 additions and 5 deletions

View File

@@ -388,7 +388,11 @@
iscrayon = TRUE
if(istype(i, /obj/item/pen/fountain))
isfountain = TRUE
var/obj/item/pen/fountain/f = i
if(f.cursive)
isfountain = TRUE
else
isfountain = FALSE
// if paper is not in usr, then it must be near them, or in a clipboard or folder, which must be in or near usr
if(src.loc != usr && !src.Adjacent(usr) && !((istype(src.loc, /obj/item/clipboard) || istype(src.loc, /obj/item/folder)) && (src.loc.loc == usr || src.loc.Adjacent(usr)) ) )

View File

@@ -107,9 +107,13 @@
icon_state = "pen_fountain"
throwforce = 1 //pointy
colour = "#1c1713" //dark ashy brownish
var/cursive = TRUE
/obj/item/pen/fountain/attack_self(var/mob/user)
return
playsound(loc, 'sound/items/penclick.ogg', 50, 1)
to_chat(user, span("notice", "You snap the nib into position to write [cursive ? "normally" : "in cursive"]."))
cursive = !cursive
/*
* PDA Fountain Pens
*/