mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-22 16:12:19 +00:00
Pen and PDA related fixes (#7483)
This commit is contained in:
@@ -6,6 +6,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
||||
/obj/item/device/pda
|
||||
name = "\improper PDA"
|
||||
desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge."
|
||||
description_info = "Alt-click to remove IDs. Ctrl-click to remove things in the pen slot."
|
||||
icon = 'icons/obj/pda.dmi'
|
||||
icon_state = "pda"
|
||||
item_state = "electronic"
|
||||
@@ -127,7 +128,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
||||
* Engineering
|
||||
*/
|
||||
|
||||
/obj/item/device/pda/atmos
|
||||
/obj/item/device/pda/atmos
|
||||
icon_state = "pda-atmo"
|
||||
default_cartridge = /obj/item/cartridge/atmos
|
||||
inserted_item = /obj/item/pen/silver
|
||||
@@ -145,7 +146,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
||||
* Cargo
|
||||
*/
|
||||
|
||||
/obj/item/device/pda/cargo
|
||||
/obj/item/device/pda/cargo
|
||||
icon_state = "pda-cargo"
|
||||
default_cartridge = /obj/item/cartridge/quartermaster
|
||||
inserted_item = /obj/item/pen/silver
|
||||
@@ -1100,7 +1101,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
||||
|
||||
if (USE_SUCCESS)
|
||||
if (!inserted_item)
|
||||
to_chat(user, "<span class='notice'>[src] does not have pen in it.</span>")
|
||||
to_chat(user, "<span class='notice'>[src] does not have a pen in it.</span>")
|
||||
return
|
||||
|
||||
if (loc == user && !user.get_active_hand())
|
||||
|
||||
@@ -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)) ) )
|
||||
|
||||
@@ -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
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user