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
|
/obj/item/device/pda
|
||||||
name = "\improper PDA"
|
name = "\improper PDA"
|
||||||
desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge."
|
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 = 'icons/obj/pda.dmi'
|
||||||
icon_state = "pda"
|
icon_state = "pda"
|
||||||
item_state = "electronic"
|
item_state = "electronic"
|
||||||
@@ -127,7 +128,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
|||||||
* Engineering
|
* Engineering
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/obj/item/device/pda/atmos
|
/obj/item/device/pda/atmos
|
||||||
icon_state = "pda-atmo"
|
icon_state = "pda-atmo"
|
||||||
default_cartridge = /obj/item/cartridge/atmos
|
default_cartridge = /obj/item/cartridge/atmos
|
||||||
inserted_item = /obj/item/pen/silver
|
inserted_item = /obj/item/pen/silver
|
||||||
@@ -145,7 +146,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
|||||||
* Cargo
|
* Cargo
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/obj/item/device/pda/cargo
|
/obj/item/device/pda/cargo
|
||||||
icon_state = "pda-cargo"
|
icon_state = "pda-cargo"
|
||||||
default_cartridge = /obj/item/cartridge/quartermaster
|
default_cartridge = /obj/item/cartridge/quartermaster
|
||||||
inserted_item = /obj/item/pen/silver
|
inserted_item = /obj/item/pen/silver
|
||||||
@@ -1100,7 +1101,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
|||||||
|
|
||||||
if (USE_SUCCESS)
|
if (USE_SUCCESS)
|
||||||
if (!inserted_item)
|
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
|
return
|
||||||
|
|
||||||
if (loc == user && !user.get_active_hand())
|
if (loc == user && !user.get_active_hand())
|
||||||
|
|||||||
@@ -388,7 +388,11 @@
|
|||||||
iscrayon = TRUE
|
iscrayon = TRUE
|
||||||
|
|
||||||
if(istype(i, /obj/item/pen/fountain))
|
if(istype(i, /obj/item/pen/fountain))
|
||||||
|
var/obj/item/pen/fountain/f = i
|
||||||
|
if(f.cursive)
|
||||||
isfountain = TRUE
|
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 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)) ) )
|
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"
|
icon_state = "pen_fountain"
|
||||||
throwforce = 1 //pointy
|
throwforce = 1 //pointy
|
||||||
colour = "#1c1713" //dark ashy brownish
|
colour = "#1c1713" //dark ashy brownish
|
||||||
|
var/cursive = TRUE
|
||||||
|
|
||||||
/obj/item/pen/fountain/attack_self(var/mob/user)
|
/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
|
* PDA Fountain Pens
|
||||||
*/
|
*/
|
||||||
|
|||||||
42
html/changelogs/wezzy_ppap_fix.yml
Normal file
42
html/changelogs/wezzy_ppap_fix.yml
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
################################
|
||||||
|
# Example Changelog File
|
||||||
|
#
|
||||||
|
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||||
|
#
|
||||||
|
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||||
|
# When it is, any changes listed below will disappear.
|
||||||
|
#
|
||||||
|
# Valid Prefixes:
|
||||||
|
# bugfix
|
||||||
|
# wip (For works in progress)
|
||||||
|
# tweak
|
||||||
|
# soundadd
|
||||||
|
# sounddel
|
||||||
|
# rscadd (general adding of nice things)
|
||||||
|
# rscdel (general deleting of nice things)
|
||||||
|
# imageadd
|
||||||
|
# imagedel
|
||||||
|
# maptweak
|
||||||
|
# spellcheck (typo fixes)
|
||||||
|
# experiment
|
||||||
|
# balance
|
||||||
|
# admin
|
||||||
|
# backend
|
||||||
|
# security
|
||||||
|
# refactor
|
||||||
|
#################################
|
||||||
|
|
||||||
|
# Your name.
|
||||||
|
author: Wowzewow (Wezzy)
|
||||||
|
|
||||||
|
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||||
|
delete-after: True
|
||||||
|
|
||||||
|
# Any changes you've made. See valid prefix list above.
|
||||||
|
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||||
|
# SCREW THIS UP AND IT WON'T WORK.
|
||||||
|
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||||
|
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||||
|
changes:
|
||||||
|
- bugfix: "Fixes some PDA grammar."
|
||||||
|
- rscadd: "You can now switch from writing in cursive to writing normally when using a fountain pen."
|
||||||
Reference in New Issue
Block a user