Merge pull request #6478 from VOREStation/upstream-merge-6621

[MIRROR] Moar descriptions for things
This commit is contained in:
Novacat
2020-01-21 01:33:06 -05:00
committed by GitHub
63 changed files with 85 additions and 6 deletions
+1
View File
@@ -1,5 +1,6 @@
/obj/item/weapon/clipboard
name = "clipboard"
desc = "Used to clip paper to, for an on-the-go writing board."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "clipboard"
item_state = "clipboard"
+1
View File
@@ -6,6 +6,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
/obj/machinery/photocopier/faxmachine
name = "fax machine"
desc = "Sent papers and pictures far away! Or to your co-worker's office a few doors down."
icon = 'icons/obj/library.dmi'
icon_state = "fax"
insert_anim = "faxsend"
+1
View File
@@ -1,5 +1,6 @@
/obj/item/weapon/hand_labeler
name = "hand labeler"
desc = "Label everything like you've always wanted to! Stuck to the side is a label reading \'Labeler\'. Seems you're too late for that one."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "labeler0"
var/label = null
+1
View File
@@ -1,5 +1,6 @@
/obj/item/weapon/paper_bin
name = "paper bin"
desc = "A plastic bin full of paper. It seems to have both regular and carbon-copy paper to choose from."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "paper_bin1"
item_icons = list(
+5
View File
@@ -1,5 +1,6 @@
/obj/machinery/photocopier
name = "photocopier"
desc = "Copy all your important papers here!"
icon = 'icons/obj/library.dmi'
icon_state = "bigscanner"
var/insert_anim = "bigscanner1"
@@ -24,6 +25,10 @@
component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
RefreshParts()
/obj/machinery/photocopier/examine(mob/user as mob)
if(..(user, 1))
to_chat(user, "The screen shows there's [toner ? "[toner]" : "no"] toner left in the printer.")
/obj/machinery/photocopier/attack_ai(mob/user as mob)
return attack_hand(user)