From 3c38c19f2af05c84249ca5f23b51bde1ed09402b Mon Sep 17 00:00:00 2001 From: alsoandanswer <42310821+alsoandanswer@users.noreply.github.com> Date: Sun, 31 Mar 2019 03:53:03 +0800 Subject: [PATCH] bureaucracy and library update 2 : electric boogaloo (#6182) tweak: "Tweaks some bureaucracy sprites." tweak: "Reverts pen sprite with some improvements." soundadd: "boxes filing cabinets and paper make noises" also put all the bureaucracy in a nice file --- .../objects/items/weapons/storage/boxes.dm | 2 + code/modules/paperwork/filingcabinet.dm | 10 ++- code/modules/paperwork/paper.dm | 43 +++++----- code/modules/paperwork/papershredder.dm | 76 ++++++++++++------ code/modules/paperwork/pen.dm | 11 +-- code/modules/paperwork/photocopier.dm | 7 +- .../oversized_sweatshirt_wowzewow.yml | 45 +++++++++++ icons/obj/bureaucracy.dmi | Bin 15071 -> 16662 bytes icons/obj/library.dmi | Bin 27157 -> 27456 bytes icons/obj/paper.dmi | Bin 2037 -> 0 bytes sound/bureaucracy/filingcabinet.ogg | Bin 0 -> 30696 bytes sound/bureaucracy/paperburn.ogg | Bin 0 -> 86176 bytes sound/bureaucracy/papercrumple.ogg | Bin 0 -> 22209 bytes sound/bureaucracy/paperfold.ogg | Bin 0 -> 19477 bytes sound/bureaucracy/papershred.ogg | Bin 0 -> 139609 bytes sound/{items => bureaucracy}/pen1.ogg | Bin sound/{items => bureaucracy}/pen2.ogg | Bin sound/bureaucracy/print.ogg | Bin 0 -> 113310 bytes sound/{items => bureaucracy}/stamp.ogg | Bin sound/items/pshred.ogg | Bin 57059 -> 0 bytes sound/items/storage/boxfold.ogg | Bin 0 -> 15281 bytes 21 files changed, 138 insertions(+), 56 deletions(-) create mode 100644 html/changelogs/oversized_sweatshirt_wowzewow.yml delete mode 100644 icons/obj/paper.dmi create mode 100644 sound/bureaucracy/filingcabinet.ogg create mode 100644 sound/bureaucracy/paperburn.ogg create mode 100644 sound/bureaucracy/papercrumple.ogg create mode 100644 sound/bureaucracy/paperfold.ogg create mode 100644 sound/bureaucracy/papershred.ogg rename sound/{items => bureaucracy}/pen1.ogg (100%) rename sound/{items => bureaucracy}/pen2.ogg (100%) create mode 100644 sound/bureaucracy/print.ogg rename sound/{items => bureaucracy}/stamp.ogg (100%) delete mode 100644 sound/items/pshred.ogg create mode 100644 sound/items/storage/boxfold.ogg diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 9f414e71d33..34e9799438f 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -26,6 +26,7 @@ desc = "It's just an ordinary box." icon_state = "box" item_state = "syringe_kit" + use_sound = 'sound/items/storage/box.ogg' var/foldable = /obj/item/stack/material/cardboard // BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard var/maxHealth = 20 //health is already defined @@ -96,6 +97,7 @@ return // Now make the cardboard to_chat(user, "You fold [src] flat.") + playsound(src.loc, 'sound/items/storage/boxfold.ogg', 30, 1) new src.foldable(get_turf(src)) qdel(src) diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index a6e5e467bec..eb3b189b4a9 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -38,8 +38,9 @@ if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/folder) || istype(P, /obj/item/weapon/photo) || istype(P, /obj/item/weapon/paper_bundle)) to_chat(user, "You put [P] in [src].") user.drop_from_inventory(P,src) - icon_state = "[initial(icon_state)]-open" - sleep(5) + flick("[initial(icon_state)]-open",src) + playsound(loc, 'sound/bureaucracy/filingcabinet.ogg', 50, 1) + sleep(40) icon_state = initial(icon_state) updateUsrDialog() else if(P.iswrench()) @@ -90,9 +91,10 @@ if(istype(P) && (P.loc == src) && src.Adjacent(usr)) usr.put_in_hands(P) updateUsrDialog() - icon_state = "[initial(icon_state)]-open" + flick("[initial(icon_state)]-open",src) + playsound(loc, 'sound/bureaucracy/filingcabinet.ogg', 50, 1) spawn(0) - sleep(5) + sleep(20) icon_state = initial(icon_state) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 0a8bd0ad187..a6283f8c346 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -91,11 +91,11 @@ to_chat(user, span("notice", "You're going to have to unfold it before you can read it.")) return if(name != "sheet of paper") - to_chat(user, "It's titled '[name]'.") + to_chat(user,"It's titled '[name]'.") if(in_range(user, src) || isobserver(user)) show_content(usr) else - to_chat(user, "You have to go closer if you want to read it.") + to_chat(user, span("notice", "You have to go closer if you want to read it.")) /obj/item/weapon/paper/proc/show_content(mob/user, forceshow) @@ -112,7 +112,7 @@ set src in usr if((CLUMSY in usr.mutations) && prob(50)) - to_chat(usr, "You cut yourself on the paper.") + to_chat(usr, span("warning", "You cut yourself on the paper.")) return var/n_name = sanitizeSafe(input(usr, "What would you like to label the paper?", "Paper Labelling", null) as text, MAX_NAME_LEN) @@ -128,9 +128,10 @@ return //crumple dat paper info = stars(info,85) - user.visible_message("\The [user] crumples \the [src] into a ball!", "You crumple \the [src] into a ball.", "You hear crinkling.") + user.visible_message("\The [user] crumples \the [src] into a ball!", "You crumple \the [src] into a ball.") + playsound(src, 'sound/bureaucracy/papercrumple.ogg', 50, 1) icon_state = "scrap" - throw_range = 8 + throw_range = 4 //you can now make epic paper ball hoops into the disposals (kinda dumb that you could only throw crumpled paper 1 tile) -wezzy return if (user.a_intent == I_GRAB && icon_state != "scrap" && !istype(src, /obj/item/weapon/paper/carbon)) @@ -138,7 +139,8 @@ user.show_message(span("alert", "The paper is already folded into a plane.")) return user.visible_message(span("notice", "\The [user] carefully folds \the [src] into a plane."), - span("notice", "You carefully fold \the [src] into a plane."), "You hear paper rustling.") + span("notice", "You carefully fold \the [src] into a plane."), "\The [user] folds \the [src] into a plane.") + playsound(src, 'sound/bureaucracy/paperfold.ogg', 50, 1) icon_state = "paper_plane" throw_range = 8 old_name = name @@ -147,6 +149,7 @@ if (user.a_intent == I_HELP && old_name && icon_state == "paper_plane") user.visible_message(span("notice", "\The [user] unfolds \the [src]."), span("notice", "You unfold \the [src]."), "You hear paper rustling.") + playsound(src, 'sound/bureaucracy/paperfold.ogg', 50, 1) icon_state = initial(icon_state) throw_range = initial(throw_range) name = old_name @@ -175,7 +178,7 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(H == user) - to_chat(user, "You wipe off the lipstick with [src].") + to_chat(user, span("notice", "You wipe off the lipstick with [src].")) H.lip_style = null H.update_body() else @@ -317,6 +320,8 @@ user.visible_message("[user] holds \the [P] up to \the [src], it looks like \he's trying to burn it!", \ "You hold \the [P] up to \the [src], burning it slowly.") + playsound(src.loc, 'sound/bureaucracy/paperburn.ogg', 50, 1) + icon_state = "paper_onfire" //I was going to add do_after in here, but keeping the current method allows people to burn papers they're holding, while they move. That seems fine to keep -Nanako spawn(20) @@ -327,7 +332,7 @@ qdel(src) else - to_chat(user, "You must hold \the [P] steady to burn \the [src].") + to_chat(user, span("warning", "You must hold \the [P] steady to burn \the [src].")) /obj/item/weapon/paper/Topic(href, href_list) @@ -340,7 +345,7 @@ //var/t = strip_html_simple(input(usr, "What text do you wish to add to " + (id=="end" ? "the end of the paper" : "field "+id) + "?", "[name]", null),8192) as message if(free_space <= 0) - to_chat(usr, "There isn't enough space left on \the [src] to write anything.") + to_chat(usr, span("info", "There isn't enough space left on \the [src] to write anything.")) return var/t = sanitize(input("Enter what you want to write:", "Write", null, null) as message, free_space, extra = 0) @@ -375,7 +380,7 @@ if(fields > 50)//large amount of fields creates a heavy load on the server, see updateinfolinks() and addtofield() - to_chat(usr, "Too many fields. Sorry, you can't do this.") + to_chat(usr, span("warning", "Too many fields. Sorry, you can't do this.")) fields = last_fields_value return @@ -387,9 +392,9 @@ update_space(t) - usr << browse("
I$SM*;q?OE7=CMw#p!fl7jKYiMdyL+^&G~2I_O5lQBs=E0>|+
zp<5Oi^+6;JnlFdlLdbSnbXF?Pqau2CLjl6995%m@5aQQVedCfWZ5we}_*=eq)>ETl
zm^FRJ>a-c;@@i}A>f%KA=SpA)Qil??bLEYe=j*1yp0xh_ewv);9#|$K{1YoCk9B@T
z!yY00Y92(XvRa{CMD5|Tp|38$tX!G&!0n?M!$Dm610|(LS%W}RFXYx!dxTvVJFBZ8
zEzHU)cNPhrgtFx0BY|}=j
zV@ML2Ebqxl9;~4A|1z#;42A3%^~t&A|66tv9Ml&;c2A-av8Ol{?bfP%*vGi;)a=;Y
zk{K|&|4xluy~Sh6e(}gniiMvUx5v86ym}Sp(SgGdO{H=1o1K!p81G%BVgJwze*W;G
z16#gtRs93~EamPF>WL2=yg6xb!$lxNv$YzxYeIwQMV(?V7db+CDVh3}vBV3*9{2KQ
ztsdjriF^lx8}iGJJa!MR6_^*SNFUvg{jQ_9=x>Q2AD`U@)p}8ATQ0dM@K&Fq
z=Qq4qLg1Aq9z}(=4;#(lJtiP5byxM*bp0~z<(0=c8g(qMl@gZh$FbE`q@n|-U)F)Y
znxq7>Wknv(&2_eEC9u#hx;nQNUvhBd&Q(Td#gWoQ>8=k(a>iW-9&Z3l|2*E?+oKk;
z*Ol3~Uut@DDYLYA*Go0VG+)VZ1LSuC3ozrAm)zCiW+TbIF?T+WCMPj
sMq-^+plWloso