Removes old PDA cartridges from everywhere on station (except clerk's vendor) and tweaks their text (#21412)

* 1

* removes em from maps

yes centcom too, why would they have them if their stations don't?

* aight ballin

* grammar yes

* grammar, I believe this is right

* whoops I missed one

* fixes oversight

* okay last fixes

how am I this retarded

Author: AMyriad

_maps/map_files/AsteroidStation/AsteroidStation.dmm

@@ -74070,15 +74070,6 @@
 /area/hallway/primary/starboard)
 "wyV" = (
 /obj/structure/table,
-/obj/item/cartridge/quartermaster{
-	pixel_x = 6;
-	pixel_y = 5
-	},
-/obj/item/cartridge/quartermaster{
-	pixel_x = -4;
-	pixel_y = 7
-	},
-/obj/item/cartridge/quartermaster,
 /obj/item/coin/silver{
 	pixel_x = -3
 	},

_maps/map_files/DonutStation/DonutStation.dmm

@@ -8471,13 +8471,11 @@
 /turf/open/floor/plasteel/white,
 /area/medical/virology)
 "dxs" = (
-/obj/machinery/vending/wardrobe/jani_wardrobe{
-	products = list(/obj/item/clothing/under/rank/janitor = 2, /obj/item/clothing/under/yogs/casualjanitorsuit = 2, /obj/item/clothing/suit/yogs/janitorcoat = 2, /obj/item/cartridge/janitor = 2, /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/head/soft/purple = 2, /obj/item/paint/paint_remover = 2, /obj/item/melee/flyswatter = 2, /obj/item/flashlight = 2, /obj/item/caution = 6, /obj/item/holosign_creator/janibarrier = 2, /obj/item/lightreplacer = 2, /obj/item/soap/nanotrasen = 2, /obj/item/storage/bag/trash = 2, /obj/item/clothing/shoes/galoshes = 2, /obj/item/watertank/janitor = 2, /obj/item/storage/belt/janitor = 2)
-	},
 /obj/effect/turf_decal/trimline/green/filled/line/lower{
 	dir = 5
 	},
 /obj/effect/turf_decal/stripes/corner,
+/obj/machinery/vending/wardrobe/jani_wardrobe,
 /turf/open/floor/plasteel,
 /area/janitor)
 "dxy" = (
@@ -35360,7 +35358,6 @@
 "pom" = (
 /obj/structure/table/wood,
 /obj/item/taperecorder,
-/obj/item/cartridge/lawyer,
 /obj/machinery/requests_console{
 	department = "Law office";
 	pixel_x = -32
@@ -56171,10 +56168,6 @@
 /area/medical/genetics/cloning)
 "yda" = (
 /obj/structure/table/wood,
-/obj/item/storage/box/seccarts{
-	pixel_x = 3;
-	pixel_y = 2
-	},
 /obj/item/storage/secure/safe/HoS{
 	pixel_x = 35
 	},

_maps/map_files/IceMeta/IceMeta.dmm

@@ -14358,7 +14358,6 @@
 	pixel_x = -2
 	},
 /obj/item/book/manual/wiki/security_space_law,
-/obj/item/cartridge/detective,
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
@@ -27203,18 +27202,6 @@
 /area/engine/atmos/distro)
 "hZV" = (
 /obj/structure/closet/secure_closet/quartermaster,
-/obj/item/cartridge/quartermaster{
-	pixel_x = -4;
-	pixel_y = 7
-	},
-/obj/item/cartridge/quartermaster{
-	pixel_x = -4;
-	pixel_y = 7
-	},
-/obj/item/cartridge/quartermaster{
-	pixel_x = -4;
-	pixel_y = 7
-	},
 /obj/item/gps{
 	gpstag = "QM0"
 	},
@@ -47004,18 +46991,6 @@
 	pixel_x = -1;
 	pixel_y = 10
 	},
-/obj/item/cartridge/engineering{
-	pixel_x = 4;
-	pixel_y = 5
-	},
-/obj/item/cartridge/engineering{
-	pixel_x = -3;
-	pixel_y = 2
-	},
-/obj/item/cartridge/engineering{
-	pixel_x = 3
-	},
-/obj/item/cartridge/atmos,
 /turf/open/floor/plasteel,
 /area/crew_quarters/heads/chief)
 "nDh" = (
@@ -62596,15 +62571,6 @@
 	pixel_y = -30
 	},
 /obj/structure/table,
-/obj/item/cartridge/signal/toxins,
-/obj/item/cartridge/signal/toxins{
-	pixel_x = -4;
-	pixel_y = 2
-	},
-/obj/item/cartridge/signal/toxins{
-	pixel_x = 4;
-	pixel_y = 6
-	},
 /obj/item/storage/pencil_holder/crew/fancy{
 	pixel_x = -8;
 	pixel_y = 10

_maps/map_files/generic/CentCom.dmm

@@ -7038,15 +7038,6 @@
 /area/centcom/ferry)
 "apP" = (
 /obj/structure/table/reinforced,
-/obj/item/cartridge/quartermaster{
-	pixel_x = -6
-	},
-/obj/item/cartridge/quartermaster{
-	pixel_x = 6
-	},
-/obj/item/cartridge/quartermaster{
-	pixel_y = 6
-	},
 /obj/item/gps/mining,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6

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

@@ -28,8 +28,8 @@ GLOBAL_LIST_EMPTY(PDAs)
 
 
 /obj/item/pda
-	name = "\improper PDA"
-	desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge."
+	name = "\improper antique PDA"
+	desc = "An outdated, portable microcomputer developed by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge."
 	icon = 'icons/obj/pda.dmi'
 	icon_state = "pda"
 	item_state = "electronic"
@@ -174,7 +174,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 		inserted_item = null
 
 /obj/item/pda/proc/update_label()
-	name = "PDA-[owner] ([ownjob])" //Name generalisation
+	name = "\improper antique PDA-[owner] ([ownjob])" //Name generalisation
 
 /obj/item/pda/GetAccess()
 	if(id)

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

@@ -1,10 +1,10 @@
 //Clown PDA is slippery.
 /obj/item/pda/clown
-	name = "clown PDA"
+	name = "\improper antique clown PDA"
 	default_cartridge = /obj/item/cartridge/virus/clown
 	insert_type = /obj/item/toy/crayon/rainbow
 	icon_state = "pda-clown"
-	desc = "A portable microcomputer by Thinktronic Systems, LTD. The surface is coated with polytetrafluoroethylene and banana drippings."
+	desc = "An outdated, portable microcomputer developed by Thinktronic Systems, LTD. The surface is coated with polytetrafluoroethylene and banana drippings."
 	ttone = "honk"
 
 /obj/item/pda/clown/Initialize(mapload)
@@ -36,49 +36,49 @@
 	RegisterSignal(src, COMSIG_TABLET_CHECK_DETONATE, PROC_REF(pda_no_detonate))
 
 /obj/item/pda/medical
-	name = "medical PDA"
+	name = "\improper antique medical PDA"
 	default_cartridge = /obj/item/cartridge/medical
 	icon_state = "pda-medical"
 
 /obj/item/pda/viro
-	name = "virology PDA"
+	name = "\improper antique virology PDA"
 	default_cartridge = /obj/item/cartridge/medical
 	icon_state = "pda-virology"
 
 /obj/item/pda/engineering
-	name = "engineering PDA"
+	name = "\improper antique engineering PDA"
 	default_cartridge = /obj/item/cartridge/engineering
 	icon_state = "pda-engineer"
 
 /obj/item/pda/security
-	name = "security PDA"
+	name = "\improper antique security PDA"
 	default_cartridge = /obj/item/cartridge/security
 	icon_state = "pda-security"
 
 /obj/item/pda/detective
-	name = "detective PDA"
+	name = "\improper antique detective PDA"
 	default_cartridge = /obj/item/cartridge/detective
 	icon_state = "pda-detective"
 
 /obj/item/pda/warden
-	name = "warden PDA"
+	name = "\improper antique warden PDA"
 	default_cartridge = /obj/item/cartridge/security
 	icon_state = "pda-warden"
 
 /obj/item/pda/janitor
-	name = "janitor PDA"
+	name = "\improper antique janitor PDA"
 	default_cartridge = /obj/item/cartridge/janitor
 	icon_state = "pda-janitor"
 	ttone = "slip"
 
 /obj/item/pda/toxins
-	name = "scientist PDA"
+	name = "\improper antique scientist PDA"
 	default_cartridge = /obj/item/cartridge/signal/toxins
 	icon_state = "pda-science"
 	ttone = "boom"
 
 /obj/item/pda/mime
-	name = "mime PDA"
+	name = "\improper antique mime PDA"
 	default_cartridge = /obj/item/cartridge/virus/mime
 	insert_type = /obj/item/toy/crayon/mime
 	icon_state = "pda-mime"
@@ -90,33 +90,33 @@
 	icon_state = "pda-hop"
 
 /obj/item/pda/heads/hop
-	name = "head of personnel PDA"
+	name = "\improper antique head of personnel PDA"
 	default_cartridge = /obj/item/cartridge/hop
 	icon_state = "pda-hop"
 
 /obj/item/pda/heads/hos
-	name = "head of security PDA"
+	name = "\improper antique head of security PDA"
 	default_cartridge = /obj/item/cartridge/hos
 	icon_state = "pda-hos"
 
 /obj/item/pda/heads/ce
-	name = "chief engineer PDA"
+	name = "\improper antique chief engineer PDA"
 	default_cartridge = /obj/item/cartridge/ce
 	icon_state = "pda-ce"
 
 /obj/item/pda/heads/cmo
-	name = "chief medical officer PDA"
+	name = "\improper antique chief medical officer PDA"
 	default_cartridge = /obj/item/cartridge/cmo
 	icon_state = "pda-cmo"
 
 /obj/item/pda/heads/rd
-	name = "research director PDA"
+	name = "\improper antique research director PDA"
 	default_cartridge = /obj/item/cartridge/rd
 	insert_type = /obj/item/pen/fountain
 	icon_state = "pda-rd"
 
 /obj/item/pda/captain
-	name = "captain PDA"
+	name = "\improper antique captain PDA"
 	default_cartridge = /obj/item/cartridge/captain
 	insert_type = /obj/item/pen/fountain/captain
 	icon_state = "pda-captain"
@@ -126,90 +126,90 @@
 	RegisterSignal(src, COMSIG_TABLET_CHECK_DETONATE, PROC_REF(pda_no_detonate))
 
 /obj/item/pda/cargo
-	name = "cargo technician PDA"
+	name = "\improper antique cargo technician PDA"
 	default_cartridge = /obj/item/cartridge/quartermaster
 	icon_state = "pda-cargo"
 
 /obj/item/pda/quartermaster
-	name = "quartermaster PDA"
+	name = "\improper antique quartermaster PDA"
 	default_cartridge = /obj/item/cartridge/quartermaster
 	insert_type = /obj/item/pen/fountain
 	icon_state = "pda-qm"
 
 /obj/item/pda/shaftminer
-	name = "shaft miner PDA"
+	name = "\improper antique shaft miner PDA"
 	icon_state = "pda-miner"
 
 /obj/item/pda/syndicate
 	default_cartridge = /obj/item/cartridge/virus/syndicate
 	icon_state = "pda-syndi"
-	name = "military PDA"
+	name = "\improper antique military PDA"
 	owner = "John Doe"
 	hidden = 1
 
 /obj/item/pda/chaplain
-	name = "chaplain PDA"
+	name = "\improper antique chaplain PDA"
 	icon_state = "pda-chaplain"
 	ttone = "holy"
 
 /obj/item/pda/lawyer
-	name = "lawyer PDA"
+	name = "\improper antique lawyer PDA"
 	default_cartridge = /obj/item/cartridge/lawyer
 	insert_type = /obj/item/pen/fountain
 	icon_state = "pda-lawyer"
 	ttone = "objection"
 
 /obj/item/pda/botanist
-	name = "botanist PDA"
+	name = "\improper antique botanist PDA"
 	//default_cartridge = /obj/item/cartridge/botanist
 	icon_state = "pda-hydro"
 
 /obj/item/pda/roboticist
-	name = "roboticist PDA"
+	name = "\improper antique roboticist PDA"
 	icon_state = "pda-roboticist"
 	default_cartridge = /obj/item/cartridge/roboticist
 
 /obj/item/pda/curator
-	name = "curator PDA"
+	name = "\improper antique curator PDA"
 	icon_state = "pda-library"
 	icon_alert = "pda-r-library"
 	default_cartridge = /obj/item/cartridge/curator
 	insert_type = /obj/item/pen/fountain
-	desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a WGW-11 series e-reader."
+	desc = "An outdated, portable microcomputer developed 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 = TRUE //Quiet in the library!
 	overlays_x_offset = -3
 
 /obj/item/pda/clear
-	name = "clear PDA"
+	name = "\improper antique clear PDA"
 	icon_state = "pda-clear"
-	desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a special edition with a transparent case."
+	desc = "An outdated, portable microcomputer developed by Thinktronic Systems, LTD. This model is a special edition with a transparent case."
 	note = "Congratulations, you have chosen the Thinktronic 5230 Personal Data Assistant Deluxe Special Max Turbo Limited Edition!"
 
 /obj/item/pda/artist
-	name = "aesthetic PDA"
+	name = "\improper antique aesthetic PDA"
 	icon_state = "pda-artist"
 
 /obj/item/pda/cook
-	name = "cook PDA"
+	name = "\improper antique cook PDA"
 	icon_state = "pda-cook"
 
 /obj/item/pda/bar
-	name = "bartender PDA"
+	name = "\improper antique bartender PDA"
 	icon_state = "pda-bartender"
 	insert_type = /obj/item/pen/fountain
 
 /obj/item/pda/atmos
-	name = "atmospherics PDA"
+	name = "\improper antique atmospherics PDA"
 	default_cartridge = /obj/item/cartridge/atmos
 	icon_state = "pda-atmos"
 
 /obj/item/pda/chemist
-	name = "chemist PDA"
+	name = "\improper antique chemist PDA"
 	default_cartridge = /obj/item/cartridge/chemistry
 	icon_state = "pda-chemistry"
 
 /obj/item/pda/geneticist
-	name = "geneticist PDA"
+	name = "\improper antique geneticist PDA"
 	default_cartridge = /obj/item/cartridge/medical
 	icon_state = "pda-genetics"

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

@@ -17,7 +17,7 @@
 
 /obj/item/cartridge
 	name = "generic cartridge"
-	desc = "A data cartridge for portable microcomputers."
+	desc = "A data cartridge for those old portable microcomputers."
 	icon = 'icons/obj/pda.dmi'
 	icon_state = "cart"
 	item_state = "electronic"

code/game/objects/items/storage/boxes.dm

@@ -624,16 +624,6 @@
 	new /obj/item/card/id/prisoner/six(src)
 	new /obj/item/card/id/prisoner/seven(src)
 
-/obj/item/storage/box/seccarts
-	name = "box of PDA security cartridges"
-	desc = "A box full of PDA cartridges used by Security."
-	illustration = "pda"
-
-/obj/item/storage/box/seccarts/PopulateContents()
-	new /obj/item/cartridge/detective(src)
-	for(var/i in 1 to 6)
-		new /obj/item/cartridge/security(src)
-
 /obj/item/storage/box/firingpins
 	name = "box of standard firing pins"
 	desc = "A box full of standard firing pins, to allow newly-developed firearms to operate."