Curator Update

This commit is contained in:
CitadelStationBot
2017-05-03 22:22:12 -05:00
parent be00d77431
commit 33a93a611b
27 changed files with 113 additions and 62 deletions
+1 -1
View File
@@ -94,7 +94,7 @@
name = "Head of Personnel"
/obj/effect/landmark/start/librarian
name = "Librarian"
name = "Curator"
/obj/effect/landmark/start/lawyer
name = "Lawyer"
@@ -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!
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
@@ -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
@@ -0,0 +1,12 @@
diff a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm (rejected hunks)
@@ -278,8 +278,8 @@
if(!user.Adjacent(src)) //no TK museology
return
- if(!(user.mind && user.mind.assigned_role == "Librarian"))
- to_chat(user, "<span class='danger'>You're not sure how to work this. Maybe you should ask the librarian for help.</span>")
+ 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)