diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 976b55f82e..44cde40ced 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -38,13 +38,13 @@ name = ("bookcase ([newname])") else if(istype(O,/obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) - user << (anchored ? "You unfasten the [src] from the floor." : "You secure the [src] to the floor.") + user << (anchored ? "You unfasten \the [src] from the floor." : "You secure \the [src] to the floor.") anchored = !anchored else if(istype(O,/obj/item/weapon/screwdriver)) playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1) - user << "You begin dismantling the [src]." + user << "You begin dismantling \the [src]." if(do_after(user,25)) - user << "You dismantle the [src]." + user << "You dismantle \the [src]." new /obj/item/stack/material/wood(get_turf(src), amount = 3) for(var/obj/item/weapon/book/b in contents) b.loc = (get_turf(src)) diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 1d82db431d..6f59a45f15 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -389,9 +389,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f if(isnum(orderid)) var/nhref = "src=\ref[src];targetid=[orderid]" spawn() src.Topic(nhref, params2list(nhref), src) - if(href_list["sort"]) - if(href_list["sort"] != "author" && href_list["sort"] != "title" && href_list["sort"] != "category") - return + if(href_list["sort"] in list("author", "title", "category")) sortby = href_list["sort"] src.add_fingerprint(usr) src.updateUsrDialog() diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index f72fa474fd..d7b41e80cb 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -107,6 +107,15 @@ return /obj/item/weapon/paper/attack_self(mob/living/user as mob) + if(user.a_intent == I_HURT) + if(icon_state == "scrap") + user.show_message("\The [src] is already crumpled.") + return + //crumple dat paper + info = stars(info,85) + user.visible_message("\The [user] crumples \the [src] into a ball!") + icon_state = "scrap" + return user.examinate(src) if(rigged && (Holiday == "April Fool's Day")) if(spam_flag == 0) @@ -442,6 +451,10 @@ B.update_icon() else if(istype(P, /obj/item/weapon/pen)) + if(icon_state == "scrap") + usr << "\The [src] is too crumpled to write on." + return + var/obj/item/weapon/pen/robopen/RP = P if ( istype(RP) && RP.mode == 2 ) RP.RenamePaper(user,src) diff --git a/html/changelogs/TheWelp-dev.yml b/html/changelogs/TheWelp-dev.yml new file mode 100644 index 0000000000..865e86ea0e --- /dev/null +++ b/html/changelogs/TheWelp-dev.yml @@ -0,0 +1,6 @@ +author: TheWelp +delete-after: True +changes: + - rscadd: "Bookcases are now movable/buildable/destroyable." + - rscadd: "Paper can now be crumpled by using in-hand while on hurt intent." + - rscadd: "Library Computer External Archive is now sortable."