Merge branch 'master' into upstream-merge-28681

code/game/objects/items/devices/PDA/PDA_types.dm

@@ -111,11 +111,13 @@
 /obj/item/device/pda/heads/rd
 	name = "research director PDA"
 	default_cartridge = /obj/item/weapon/cartridge/rd
+	inserted_item = /obj/item/weapon/pen/fountain
 	icon_state = "pda-rd"
 
 /obj/item/device/pda/captain
 	name = "captain PDA"
 	default_cartridge = /obj/item/weapon/cartridge/captain
+	inserted_item = /obj/item/weapon/pen/fountain/captain
 	icon_state = "pda-captain"
 	detonate = 0
 
@@ -127,6 +129,7 @@
 /obj/item/device/pda/quartermaster
 	name = "quartermaster PDA"
 	default_cartridge = /obj/item/weapon/cartridge/quartermaster
+	inserted_item = /obj/item/weapon/pen/fountain
 	icon_state = "pda-qm"
 
 /obj/item/device/pda/shaftminer
@@ -148,6 +151,7 @@
 /obj/item/device/pda/lawyer
 	name = "lawyer PDA"
 	default_cartridge = /obj/item/weapon/cartridge/lawyer
+	inserted_item = /obj/item/weapon/pen/fountain
 	icon_state = "pda-lawyer"
 	ttone = "objection"
 
@@ -166,6 +170,7 @@
 	icon_state = "pda-library"
 	icon_alert = "pda-r-library"
 	default_cartridge = /obj/item/weapon/cartridge/curator
+	inserted_item = /obj/item/weapon/pen/fountain
 	desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a WGW-11 series e-reader."
 	note = "Congratulations, your station has chosen the Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant!"
 	silent = 1 //Quiet in the library!
@@ -184,6 +189,7 @@
 /obj/item/device/pda/bar
 	name = "bartender PDA"
 	icon_state = "pda-bartender"
+	inserted_item = /obj/item/weapon/pen/fountain
 
 /obj/item/device/pda/atmos
 	name = "atmospherics PDA"