From be6c22690dc6c38f30ee3db1a34af52cd5d911d6 Mon Sep 17 00:00:00 2001
From: SlimeRetard <65968723+SlimeRetard@users.noreply.github.com>
Date: Tue, 26 May 2020 17:18:23 +0100
Subject: [PATCH 1/2] Fixed up the Readpad so it makes sense
Interaction text changed, changed "carving" tool to multitool that erases the data in the Readpad, made it non-flamable since its a small-computer device, added propper trademark signs
---
code/modules/library/lib_items.dm | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index 0781d240..3466a19c 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -182,12 +182,11 @@
name = "Datapad"
icon = 'icons/obj/library.dmi'
icon_state ="book"
- desc = "A fancy new state of the art Digital-Readpad(tm) provided by Nanotrasen, No more 20th century paper!"
+ desc = "A fancy new state of the art Digital-Readpad™ provided by Nanotrasen, No more 20th century paper!"
throw_speed = 1
throw_range = 5
w_class = WEIGHT_CLASS_NORMAL //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever)
attack_verb = list("bashed", "whacked", "educated")
- resistance_flags = FLAMMABLE
var/dat //Actual page content
var/due_date = 0 //Game time in 1/10th seconds
var/author //Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
@@ -200,28 +199,28 @@
to_chat(user, "As you are trying to read, you suddenly feel very stupid!")
return
if(ismonkey(user))
- to_chat(user, "You skim through the book but can't comprehend any of it.")
+ to_chat(user, "You skim through the datapad but can't comprehend any of it.")
return
if(dat)
- user << browse("Penned by [author].
" + "[dat]", "window=book[window_size != null ? ";size=[window_size]" : ""]")
- user.visible_message("[user] opens a book titled \"[title]\" and begins reading intently.")
+ user << browse("Created by [author].
" + "[dat]", "window=book[window_size != null ? ";size=[window_size]" : ""]")
+ user.visible_message("[user] begins reading a datapad titled \"[title]\" intently.")
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "book_nerd", /datum/mood_event/book_nerd)
onclose(user, "book")
else
- to_chat(user, "This book is completely blank!")
+ to_chat(user, "This datapad is completely blank!")
/obj/item/book/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/pen))
if(is_blind(user))
- to_chat(user, " As you are trying to write on the book, you suddenly feel very stupid!")
+ to_chat(user, " As you are trying to edit the datapad, you suddenly feel very stupid!")
return
if(unique)
- to_chat(user, "These pages don't seem to take the ink well! Looks like you can't modify it.")
+ to_chat(user, "These entries don't seem to be editable! Looks like you can't modify it.")
return
var/literate = user.is_literate()
if(!literate)
- to_chat(user, "You scribble illegibly on the cover of [src]!")
+ to_chat(user, "You enter illegible text on the cover page of [src]!")
return
var/choice = input("What would you like to change?") in list("Title", "Contents", "Author", "Cancel")
if(!user.canUseTopic(src, BE_CLOSE, literate))
@@ -232,7 +231,7 @@
if(!user.canUseTopic(src, BE_CLOSE, literate))
return
if (length(newtitle) > 20)
- to_chat(user, "That title won't fit on the cover!")
+ to_chat(user, "That title is too large for the datapad's memory!")
return
if(!newtitle)
to_chat(user, "That title is invalid.")
@@ -241,7 +240,7 @@
name = newtitle
title = newtitle
if("Contents")
- var/content = stripped_input(user, "Write your book's contents (HTML NOT allowed):","","",8192)
+ var/content = stripped_input(user, "Write your datapad's contents (HTML NOT allowed):","","",8192)
if(!user.canUseTopic(src, BE_CLOSE, literate))
return
if(!content)
@@ -250,7 +249,7 @@
else
dat += content
if("Author")
- var/newauthor = stripped_input(user, "Write the author's name:")
+ var/newauthor = stripped_input(user, "Enter the author's name:")
if(!user.canUseTopic(src, BE_CLOSE, literate))
return
if(!newauthor)
@@ -291,10 +290,10 @@
scanner.computer.inventory.Add(src)
to_chat(user, "[I]'s screen flashes: 'Book stored in buffer. Title added to general inventory.'")
- else if(istype(I, /obj/item/kitchen/knife) || istype(I, /obj/item/wirecutters))
- to_chat(user, "You begin to carve out [title]...")
+ else if(istype(I, /obj/item/multitool))
+ to_chat(user, "You begin to erase the data from [title] with your PDA!...")
if(do_after(user, 30, target = src))
- to_chat(user, "You carve out the pages from [title]! You didn't want to read it anyway.")
+ to_chat(user, "You erase all the page data from [title] with your PDA! You didn't want to read it anyway.")
var/obj/item/storage/book/B = new
B.name = src.name
B.title = src.title
From be6e30d135fc76096fb82f224be33080f20d3d99 Mon Sep 17 00:00:00 2001
From: SlimeRetard <65968723+SlimeRetard@users.noreply.github.com>
Date: Tue, 26 May 2020 17:20:27 +0100
Subject: [PATCH 2/2] Altered pen descriptions for Readpads
Modified text to all the regular pens that detail how they're compatible with digital devices and regular paper, so their interactions with the Readpad makes sense
---
code/modules/paperwork/pen.dm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 1b060583..6acc68cf 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -11,7 +11,7 @@
* Pens
*/
/obj/item/pen
- desc = "It's a normal black ink pen."
+ desc = "It's a black ink pen, modified for use with both paper and Nanotransen-brand Digital-Readpads™!"
name = "pen"
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "pen"
@@ -33,12 +33,12 @@
return(BRUTELOSS)
/obj/item/pen/blue
- desc = "It's a normal blue ink pen."
+ desc = "It's a blue ink pen, modified for use with both paper and Nanotransen-brand Digital-Readpads™!"
icon_state = "pen_blue"
colour = "blue"
/obj/item/pen/red
- desc = "It's a normal red ink pen."
+ desc = "It's a red ink pen, modified for use with both paper and Nanotransen-brand Digital-Readpads™!"
icon_state = "pen_red"
colour = "red"
@@ -48,7 +48,7 @@
colour = "white"
/obj/item/pen/fourcolor
- desc = "It's a fancy four-color ink pen, set to black."
+ desc = "It's a fancy four-color ink pen, set to black. Modified to be compatible with Nanotransen-brand Digital-Readpads™"
name = "four-color pen"
colour = "black"