diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index cd6324bca17..63f4370c029 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -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, "[src] does not have pen in it.")
+ to_chat(user, "[src] does not have a pen in it.")
return
if (loc == user && !user.get_active_hand())
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index cfd594752b1..499d2e48082 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -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)) ) )
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 0b73339c76e..59b2e6c6236 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -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
*/
diff --git a/html/changelogs/wezzy_ppap_fix.yml b/html/changelogs/wezzy_ppap_fix.yml
new file mode 100644
index 00000000000..9b9e38176c5
--- /dev/null
+++ b/html/changelogs/wezzy_ppap_fix.yml
@@ -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."