shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
[MIRROR] Curator Update
This commit is contained in:
kevinz000
2017-05-07 22:53:24 -07:00
committed by GitHub
parent bd8bfe1327 ec752aabb4
commit a87424e105
28 changed files with 107 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/cargo/packs.dm
View File

@@ -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

2
code/modules/clothing/head/collectable.dm
View File

@@ -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

4
code/modules/clothing/under/jobs/civilian.dm
View File

@@ -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"

2
code/modules/jobs/access.dm
View File

@@ -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")

25
code/modules/jobs/job_types/civilian.dm
View File

@@ -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)

2
code/modules/jobs/jobs.dm
View File

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

2
code/modules/library/lib_codex_gigas.dm
View File

@@ -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

8
code/modules/library/lib_readme.dm
View File

@@ -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.

2
code/modules/library/soapstone.dm
View File

@@ -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

2
code/modules/surgery/organs/vocal_cords.dm
View File

@@ -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)

2
code/modules/uplink/uplink_item.dm
View File

@@ -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