Merge pull request #735 from Citadel-Station-13/upstream-merge-26813

[MIRROR] Curator Update

_maps/map_files/CitadelStation/CitadelStation-1.2.1.dmm

@@ -1361,7 +1361,7 @@
 "aAi" = (/obj/structure/table/wood,/obj/item/weapon/folder,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid},/area/library)
 "aAj" = (/obj/machinery/power/apc{dir = 8;name = "Library APC";pixel_x = -25},/obj/structure/cable{icon_state = "0-4";d2 = 4},/turf/open/floor/wood,/area/library)
 "aAk" = (/obj/structure/cable{d1 = 2;d2 = 8;icon_state = "2-8"},/turf/open/floor/wood,/area/library)
-"aAl" = (/obj/effect/landmark/start{name = "Librarian"},/turf/open/floor/wood,/area/library)
+"aAl" = (/obj/effect/landmark/start{name = "Curator"},/turf/open/floor/wood,/area/library)
 "aAm" = (/obj/machinery/light/small{dir = 4},/turf/open/floor/wood,/area/library)
 "aAn" = (/obj/machinery/light/small/built{tag = "icon-bulb1 (WEST)";icon_state = "bulb1";dir = 8},/obj/machinery/airalarm{frequency = 1439;locked = 0;pixel_y = 23},/turf/open/floor/wood,/area/crew_quarters/cafeteria{name = "Cafe"})
 "aAo" = (/turf/open/floor/wood,/area/crew_quarters/cafeteria{name = "Cafe"})
@@ -1393,7 +1393,7 @@
 "aAO" = (/obj/machinery/light/small{dir = 8},/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid},/area/maintenance/fore)
 "aAP" = (/obj/structure/chair/stool,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid},/area/maintenance/fore)
 "aAQ" = (/obj/machinery/door/airlock/maintenance_hatch,/turf/open/floor/noslip,/area/construction/hallway{name = "Secure Workstations Hallway"})
-"aAR" = (/obj/structure/closet/cabinet,/obj/item/toy/figure/assistant,/obj/item/toy/figure/atmos,/obj/item/toy/figure/bartender,/obj/item/toy/figure/borg,/obj/item/toy/figure/botanist,/obj/item/toy/figure/captain,/obj/item/toy/figure/cargotech,/obj/item/toy/figure/ce,/obj/item/toy/figure/chaplain,/obj/item/toy/figure/chef,/obj/item/toy/figure/chemist,/obj/item/toy/figure/clown,/obj/item/toy/figure/cmo,/obj/item/toy/figure/detective,/obj/item/toy/figure/dsquad,/obj/item/toy/figure/engineer,/obj/item/toy/figure/geneticist,/obj/item/toy/figure/hop,/obj/item/toy/figure/hos,/obj/item/toy/figure/ian,/obj/item/toy/figure/janitor,/obj/item/toy/figure/lawyer,/obj/item/toy/figure/librarian,/obj/item/toy/figure/md,/obj/item/toy/figure/mime,/obj/item/toy/figure/miner,/obj/item/toy/figure/ninja,/obj/item/toy/figure/qm,/obj/item/toy/figure/rd,/obj/item/toy/figure/roboticist,/obj/item/toy/figure/scientist,/obj/item/toy/figure/secofficer,/obj/item/toy/figure/syndie,/obj/item/toy/figure/virologist,/obj/item/toy/figure/warden,/obj/item/toy/figure/wizard,/obj/item/toy/minimeteor,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid},/area/library)
+"aAR" = (/obj/structure/closet/cabinet,/obj/item/toy/figure/assistant,/obj/item/toy/figure/atmos,/obj/item/toy/figure/bartender,/obj/item/toy/figure/borg,/obj/item/toy/figure/botanist,/obj/item/toy/figure/captain,/obj/item/toy/figure/cargotech,/obj/item/toy/figure/ce,/obj/item/toy/figure/chaplain,/obj/item/toy/figure/chef,/obj/item/toy/figure/chemist,/obj/item/toy/figure/clown,/obj/item/toy/figure/cmo,/obj/item/toy/figure/detective,/obj/item/toy/figure/dsquad,/obj/item/toy/figure/engineer,/obj/item/toy/figure/geneticist,/obj/item/toy/figure/hop,/obj/item/toy/figure/hos,/obj/item/toy/figure/ian,/obj/item/toy/figure/janitor,/obj/item/toy/figure/lawyer,/obj/item/toy/figure/curator,/obj/item/toy/figure/md,/obj/item/toy/figure/mime,/obj/item/toy/figure/miner,/obj/item/toy/figure/ninja,/obj/item/toy/figure/qm,/obj/item/toy/figure/rd,/obj/item/toy/figure/roboticist,/obj/item/toy/figure/scientist,/obj/item/toy/figure/secofficer,/obj/item/toy/figure/syndie,/obj/item/toy/figure/virologist,/obj/item/toy/figure/warden,/obj/item/toy/figure/wizard,/obj/item/toy/minimeteor,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid},/area/library)
 "aAS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid},/area/library)
 "aAT" = (/obj/item/device/radio/intercom{dir = 4;name = "Station Intercom (General)";pixel_x = 0;pixel_y = -27},/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid},/area/library)
 "aAU" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8;initialize_directions = 11},/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid},/area/library)

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -62917,7 +62917,7 @@
 "cpl" = (
 /obj/structure/table/wood,
 /obj/item/weapon/clipboard,
-/obj/item/toy/figure/librarian,
+/obj/item/toy/figure/curator,
 /obj/machinery/airalarm{
 	dir = 8;
 	icon_state = "alarm0";
@@ -64355,10 +64355,12 @@
 /turf/open/floor/plasteel/black,
 /area/library)
 "crP" = (
-/obj/structure/dresser,
-/obj/machinery/computer/security/telescreen/entertainment{
-	pixel_x = -32
-	},
+/obj/structure/closet/crate,
+/obj/item/clothing/shoes/workboots/mining,
+/obj/item/clothing/under/rank/curator/treasure_hunter,
+/obj/item/clothing/suit/curator,
+/obj/item/clothing/head/curator,
+/obj/item/weapon/storage/backpack/satchel/explorer,
 /turf/open/floor/plasteel/black,
 /area/library)
 "crQ" = (
@@ -67497,7 +67499,7 @@
 	desc = "This looks awfully familiar...";
 	icon_state = "curator"
 	},
-/obj/item/clothing/under/rank/librarian/curator,
+/obj/item/clothing/under/rank/curator/treasure_hunter,
 /turf/open/floor/carpet,
 /area/crew_quarters/sleep)
 "cxC" = (
@@ -105514,7 +105516,7 @@
 /area/library/abandoned_library)
 "dSu" = (
 /obj/structure/table/wood,
-/obj/item/clothing/under/rank/librarian,
+/obj/item/clothing/under/rank/curator,
 /obj/effect/spawner/lootdrop/maintenance{
 	lootcount = 2;
 	name = "2maintenance loot spawner"
@@ -112309,6 +112311,22 @@
 	},
 /turf/open/floor/plasteel/neutral,
 /area/atmos)
+"ehO" = (
+/obj/structure/displaycase/trophy,
+/turf/open/floor/wood,
+/area/library)
+"ehP" = (
+/obj/structure/displaycase/trophy,
+/turf/open/floor/wood,
+/area/library)
+"ehQ" = (
+/obj/structure/displaycase/trophy,
+/turf/open/floor/wood,
+/area/library)
+"ehR" = (
+/obj/structure/displaycase/trophy,
+/turf/open/floor/wood,
+/area/library)
 
 (1,1,1) = {"
 aaa
@@ -143542,7 +143560,7 @@ cbA
 cdn
 ceS
 cgp
-chQ
+ehO
 cjl
 ckP
 cjl
@@ -143799,7 +143817,7 @@ cbB
 cdo
 ceS
 cgq
-chQ
+ehO
 cjl
 ckP
 cjl
@@ -144313,7 +144331,7 @@ bWi
 cdq
 ceS
 cgp
-chQ
+ehO
 cjm
 ckP
 cmk
@@ -144570,7 +144588,7 @@ cbC
 cdr
 ceT
 cgp
-chQ
+ehO
 cjn
 ckP
 cmk

_maps/map_files/MetaStation/MetaStation.dmm

@@ -45370,12 +45370,12 @@
 	name = "Port Maintenance"
 	})
 "bBr" = (
-/obj/structure/table/wood,
 /obj/machinery/airalarm{
 	dir = 4;
 	pixel_x = -23;
 	pixel_y = 0
 	},
+/obj/structure/displaycase/trophy,
 /turf/open/floor/wood,
 /area/library)
 "bBs" = (
@@ -47033,7 +47033,6 @@
 	name = "\improper Auxiliary Restrooms"
 	})
 "bEw" = (
-/obj/structure/table/wood,
 /obj/machinery/computer/security/telescreen/entertainment{
 	pixel_x = -32;
 	pixel_y = 0
@@ -47042,6 +47041,7 @@
 	dir = 4;
 	network = list("SS13")
 	},
+/obj/structure/displaycase/trophy,
 /turf/open/floor/wood,
 /area/library)
 "bEx" = (
@@ -53662,6 +53662,12 @@
 	pixel_x = 30;
 	pixel_y = 0
 	},
+/obj/structure/closet/crate,
+/obj/item/clothing/shoes/workboots/mining,
+/obj/item/clothing/under/rank/curator/treasure_hunter,
+/obj/item/clothing/suit/curator,
+/obj/item/clothing/head/curator,
+/obj/item/weapon/storage/backpack/satchel/explorer,
 /turf/open/floor/engine/cult,
 /area/library)
 "bPY" = (
@@ -95331,6 +95337,14 @@
 	icon_state = "xenomaint";
 	name = "Xeno Maintenance"
 	})
+"dmD" = (
+/obj/structure/displaycase/trophy,
+/turf/open/floor/wood,
+/area/library)
+"dmE" = (
+/obj/structure/displaycase/trophy,
+/turf/open/floor/wood,
+/area/library)
 
 (1,1,1) = {"
 aaa
@@ -114479,7 +114493,7 @@ bwa
 bxU
 bzD
 bBr
-bCT
+bSx
 bEw
 bzE
 bHR
@@ -114735,9 +114749,9 @@ bue
 bwb
 bxV
 bzE
-bBs
-bCU
-bBs
+dmD
+bzE
+dmD
 bzE
 bHR
 bJz

_maps/map_files/PubbyStation/PubbyStation.dmm

@@ -15105,7 +15105,7 @@
 /area/maintenance/apmaint)
 "aEl" = (
 /obj/structure/closet/coffin,
-/obj/item/toy/figure/librarian,
+/obj/item/toy/figure/curator,
 /turf/open/floor/plating,
 /area/maintenance/apmaint)
 "aEm" = (

_maps/map_files/PubbyStation/job_changes.dm

@@ -18,5 +18,5 @@
 	access += GLOB.access_crematorium
 	minimal_access += GLOB.access_crematorium
 
-MAP_REMOVE_JOB(librarian)
+MAP_REMOVE_JOB(curator)
 MAP_REMOVE_JOB(lawyer)

_maps/map_files/TgStation/tgstation.2.1.3.dmm

@@ -19013,6 +19013,12 @@
 /turf/open/floor/wood,
 /area/library)
 "aQr" = (
+/obj/structure/closet/crate,
+/obj/item/clothing/shoes/workboots/mining,
+/obj/item/clothing/under/rank/curator/treasure_hunter,
+/obj/item/clothing/suit/curator,
+/obj/item/clothing/head/curator,
+/obj/item/weapon/storage/backpack/satchel/explorer,
 /obj/machinery/light/small,
 /turf/open/floor/engine/cult,
 /area/library)
@@ -19508,7 +19514,7 @@
 /turf/open/floor/wood,
 /area/library)
 "aRO" = (
-/obj/structure/bookcase/random/nonfiction,
+/obj/structure/displaycase/trophy,
 /turf/open/floor/wood,
 /area/library)
 "aRP" = (
@@ -106505,7 +106511,7 @@ aIt
 aPd
 aIt
 aRO
-aIt
+aRO
 aUC
 aVP
 aXu
@@ -106762,7 +106768,7 @@ aNV
 aPd
 aIt
 aRO
-aIt
+aRO
 aIt
 aVQ
 aXu

_maps/map_files/generic/Centcomm.dmm

@@ -5586,7 +5586,7 @@
 /area/centcom/ferry)
 "ot" = (
 /obj/structure/closet/secure_closet/personal/cabinet,
-/obj/item/clothing/under/rank/librarian/curator,
+/obj/item/clothing/under/rank/curator/treasure_hunter,
 /obj/item/clothing/under/skirt/black,
 /obj/item/clothing/under/shorts/black,
 /obj/item/clothing/under/pants/track,

code/__DEFINES/jobs.dm

@@ -32,7 +32,7 @@
 #define BOTANIST			(1<<2)
 #define COOK				(1<<3)
 #define JANITOR			(1<<4)
-#define LIBRARIAN			(1<<5)
+#define CURATOR			(1<<5)
 #define QUARTERMASTER		(1<<6)
 #define CARGOTECH			(1<<7)
 #define MINER				(1<<8)

code/game/gamemodes/devil/devil_game_mode.dm

@@ -2,7 +2,7 @@
 	name = "devil"
 	config_tag = "devil"
 	antag_flag = ROLE_DEVIL
-	protected_jobs = list("Lawyer", "Librarian", "Chaplain", "Head of Security", "Captain", "AI")
+	protected_jobs = list("Lawyer", "Curator", "Chaplain", "Head of Security", "Captain", "AI")
 	required_players = 0
 	required_enemies = 1
 	recommended_enemies = 4

code/game/machinery/computer/crew.dm

@@ -56,7 +56,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 	jobs["Bartender"] = 61
 	jobs["Cook"] = 62
 	jobs["Botanist"] = 63
-	jobs["Librarian"] = 64
+	jobs["Curator"] = 64
 	jobs["Chaplain"] = 65
 	jobs["Clown"] = 66
 	jobs["Mime"] = 67

code/game/objects/effects/landmarks.dm

@@ -94,7 +94,7 @@
 	name = "Head of Personnel"
 
 /obj/effect/landmark/start/librarian
-	name = "Librarian"
+	name = "Curator"
 
 /obj/effect/landmark/start/lawyer
 	name = "Lawyer"

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

@@ -161,11 +161,11 @@
 	icon_state = "pda-roboticist"
 	default_cartridge = /obj/item/weapon/cartridge/roboticist
 
-/obj/item/device/pda/librarian
-	name = "librarian PDA"
+/obj/item/device/pda/curator
+	name = "curator PDA"
 	icon_state = "pda-library"
 	icon_alert = "pda-r-library"
-	default_cartridge = /obj/item/weapon/cartridge/librarian
+	default_cartridge = /obj/item/weapon/cartridge/curator
 	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!

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

@@ -108,7 +108,7 @@
 	access_mime = 1
 	var/mime_charges = 5
 
-/obj/item/weapon/cartridge/librarian
+/obj/item/weapon/cartridge/curator
 	name = "\improper Lib-Tweet cartridge"
 	icon_state = "cart-s"
 	access_newscaster = 1

code/game/objects/items/toys.dm

@@ -1218,9 +1218,9 @@
 	icon_state = "lawyer"
 	toysay = "My client is a dirty traitor!"
 
-/obj/item/toy/figure/librarian
-	name = "Librarian action figure"
-	icon_state = "librarian"
+/obj/item/toy/figure/curator
+	name = "Curator action figure"
+	icon_state = "curator"
 	toysay = "One day while..."
 
 /obj/item/toy/figure/md

code/game/objects/items/weapons/storage/internal.dm

@@ -53,7 +53,7 @@
 		/obj/item/weapon/implanter, /obj/item/weapon/screwdriver, /obj/item/weapon/weldingtool/mini,
 		/obj/item/device/firing_pin
 		)
-	//can hold both regular pens and energy daggers. made for your every-day tactical librarians/murderers.
+	//can hold both regular pens and energy daggers. made for your every-day tactical curators/murderers.
 	priority = FALSE
 	quickdraw = TRUE
 	silent = TRUE

code/game/objects/structures/displaycase.dm

@@ -278,6 +278,10 @@
 	if(!user.Adjacent(src)) //no TK museology
 		return
 
+	if(!(user.mind && user.mind.assigned_role == "Curator"))
+		to_chat(user, "<span class='danger'>You're not sure how to work this. Maybe you should ask the curator for help.</span>")
+		return
+
 	if(!added_roundstart)
 		to_chat(user, "You've already put something new in this case.")
 		return

code/modules/cargo/packs.dm

@@ -1689,8 +1689,8 @@
 	crate_name = "art supply crate"
 
 /datum/supply_pack/misc/soapstone
-	name = "Librarian Engraving/Scribbling Crate"
-	crate_name = "librarian engraving/scribbling crate"
+	name = "Curator Engraving/Scribbling Crate"
+	crate_name = "curator engraving/scribbling crate"
 	cost = 3000
 	contains = list(/obj/item/soapstone)
 	access = GLOB.access_library

code/modules/clothing/head/collectable.dm

@@ -30,7 +30,7 @@
 
 /obj/item/clothing/head/collectable/paper
 	name = "collectable paper hat"
-	desc = "What looks like an ordinary paper hat is actually a rare and valuable collector's edition paper hat. Keep away from water, fire, and Librarians."
+	desc = "What looks like an ordinary paper hat is actually a rare and valuable collector's edition paper hat. Keep away from water, fire, and Curators."
 	icon_state = "paper"
 
 	dog_fashion = /datum/dog_fashion/head

code/modules/clothing/under/jobs/civilian.dm

@@ -137,7 +137,7 @@
 	can_adjust = 1
 	alt_covers_chest = 1
 
-/obj/item/clothing/under/rank/librarian
+/obj/item/clothing/under/rank/curator
 	name = "sensible suit"
 	desc = "It's very... sensible."
 	icon_state = "red_suit"
@@ -145,7 +145,7 @@
 	item_color = "red_suit"
 	can_adjust = 0
 
-/obj/item/clothing/under/rank/librarian/curator
+/obj/item/clothing/under/rank/curator/treasure_hunter
 	name = "treasure hunter uniform"
 	desc = "A rugged uniform suitable for treasure hunting."
 	icon_state = "curator"

code/modules/jobs/access.dm

@@ -459,7 +459,7 @@ GLOBAL_VAR_CONST(access_away_generic4, 208)
 
 /proc/get_all_jobs()
 	return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician",
-				"Shaft Miner", "Clown", "Mime", "Janitor", "Librarian", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer",
+				"Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer",
 				"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist",
 				"Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer")
 

code/modules/jobs/job_types/civilian.dm

@@ -112,11 +112,11 @@ Mime
 		H.mind.miming = 1
 
 /*
-Librarian
+Curator
 */
-/datum/job/librarian
-	title = "Librarian"
-	flag = LIBRARIAN
+/datum/job/curator
+	title = "Curator"
+	flag = CURATOR
 	department_head = list("Head of Personnel")
 	department_flag = CIVILIAN
 	faction = "Station"
@@ -125,26 +125,27 @@ Librarian
 	supervisors = "the head of personnel"
 	selection_color = "#dddddd"
 
-	outfit = /datum/outfit/job/librarian
+	outfit = /datum/outfit/job/curator
 
 	access = list(GLOB.access_library)
 	minimal_access = list(GLOB.access_library)
 
-/datum/outfit/job/librarian
-	name = "Librarian"
-	jobtype = /datum/job/librarian
+/datum/outfit/job/curator
+	name = "Curator"
+	jobtype = /datum/job/curator
 
-	belt = /obj/item/device/pda/librarian
-	uniform = /obj/item/clothing/under/rank/librarian
-	l_hand = /obj/item/weapon/storage/bag/books
+	belt = /obj/item/device/pda/curator
+	uniform = /obj/item/clothing/under/rank/curator
+	l_hand = /obj/item/weapon/storage/bag/books
 	r_pocket = /obj/item/weapon/barcodescanner
 	l_pocket = /obj/item/device/laser_pointer
 	backpack_contents = list(
+		/obj/item/weapon/melee/curator_whip = 1,
 		/obj/item/soapstone = 1
 	)
 
 
-/datum/outfit/job/librarian/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/datum/outfit/job/curator/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	..()
 
 	if(visualsOnly)

code/modules/jobs/jobs.dm

@@ -39,7 +39,7 @@ GLOBAL_LIST_INIT(civilian_positions, list(
 	"Botanist",
 	"Cook",
 	"Janitor",
-	"Librarian",
+	"Curator",
 	"Lawyer",
 	"Chaplain",
 	"Clown",

code/modules/library/lib_codex_gigas.dm

@@ -32,7 +32,7 @@
 		var/speed = 300
 		var/correctness = 85
 		var/willpower = 98
-		if(U.job in list("Librarian")) // the librarian is both faster, and more accurate than normal crew members at research
+		if(U.job in list("Curator")) // the curator is both faster, and more accurate than normal crew members at research
 			speed = 45
 			correctness = 100
 			willpower = 100

code/modules/library/lib_readme.dm

@@ -22,7 +22,7 @@
    ------------
    A place for the crew to go, relax, and enjoy a good book.
    Aspiring authors can even self publish and, if they're lucky
-   convince the on-staff Librarian to submit it to the Archives
+   convince the on-staff Curator to submit it to the Archives
    to be chronicled in history forever - some say even persisting
    through alternate dimensions.
 
@@ -49,12 +49,12 @@
 
 // Ideas for the future
 // ---------------------
-// 	- Visitor's computer should be able to search the current in-round library inventory (that the Librarian has stocked and checked in)
+// 	- Visitor's computer should be able to search the current in-round library inventory (that the Curator has stocked and checked in)
 //  -- Give computer other features like an Instant Messenger application, or the ability to edit, save, and print documents.
 //	- Admin interface directly tied to the Archive DB. Right now there's no way to delete uploaded books in-game.
-//  -- If this gets implemented, allow Librarians to "tag" or "suggest" books to be deleted. The DB ID of the tagged books gets saved to a text file (or another table in the DB maybe?).
+//  -- If this gets implemented, allow Curators to "tag" or "suggest" books to be deleted. The DB ID of the tagged books gets saved to a text file (or another table in the DB maybe?).
 //	   The admin interface would automatically take these IDs and SELECT them all from the DB to be displayed along with a Delete link to drop the row from the table.
-//	- When the game sets up and the round begins, have it automatically pick random books from the DB to populate the library with. Even if the Librarian is a useless fuck there are at least a few books around.
+//	- When the game sets up and the round begins, have it automatically pick random books from the DB to populate the library with. Even if the Curator is a useless fuck there are at least a few books around.
 //  - Allow books to be "hollowed out" like the Chaplain's Bible, allowing you to store one pocket-sized item inside.
 //  - Make books/book cases burn when exposed to flame.
 //  - Make book binder hackable.

code/modules/library/soapstone.dm

@@ -115,7 +115,7 @@
    as instructions and/or memes for the next generation of spessmen.
 
    Limited in location to station_z only. Can be smashed out or exploded,
-   but only permamently removed with the librarian's soapstone.
+   but only permamently removed with the curator's soapstone.
 */
 
 /obj/item/soapstone/infinite

code/modules/surgery/organs/vocal_cords.dm

@@ -248,7 +248,7 @@
 	else if((findtext(message, silence_words)))
 		cooldown = COOLDOWN_STUN
 		for(var/mob/living/carbon/C in listeners)
-			if(user.mind && (user.mind.assigned_role == "Librarian" || user.mind.assigned_role == "Mime"))
+			if(user.mind && (user.mind.assigned_role == "Curator" || user.mind.assigned_role == "Mime"))
 				power_multiplier *= 3
 			C.silent += (10 * power_multiplier)
 

code/modules/uplink/uplink_item.dm

@@ -1250,7 +1250,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
 	desc = "Most magic eightballs are toys with dice inside. Although identical in appearance to the harmless toys, this occult device reaches into the spirit world to find its answers. Be warned, that spirits are often capricious or just little assholes. To use, simply speak your question aloud, then begin shaking."
 	item = /obj/item/toy/eightball/haunted
 	cost = 2
-	restricted_roles = list("Librarian")
+	restricted_roles = list("Curator")
 	limited_stock = 1 // please don't spam deadchat
 
 // Pointless