diff --git a/code/modules/paperwork/papershredder.dm b/code/modules/paperwork/papershredder.dm index 109cf64e2f9..de26296a55d 100644 --- a/code/modules/paperwork/papershredder.dm +++ b/code/modules/paperwork/papershredder.dm @@ -47,6 +47,8 @@ paperamount += paper_result qdel(W) playsound(src.loc, 'sound/items/pshred.ogg', 75, 1) + to_chat(user, span("notice", "You shred the paper.")) + flick("papershredder_on", src) if(paperamount > max_paper) user <<"\The [src] was too full, and shredded paper goes everywhere!" for(var/i=(paperamount-max_paper);i>0;i--) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 5e8f336bfb7..534b2ada7b7 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -1,8 +1,8 @@ /obj/machinery/photocopier name = "photocopier" icon = 'icons/obj/library.dmi' - icon_state = "bigscanner" - var/insert_anim = "bigscanner1" + icon_state = "photocopier" + var/insert_anim = "photocopier1" anchored = 1 density = 1 use_power = 1 diff --git a/html/changelogs/wowzewow i_got_boxes_fulla_pepe.yml b/html/changelogs/wowzewow i_got_boxes_fulla_pepe.yml new file mode 100644 index 00000000000..0492cefe84e --- /dev/null +++ b/html/changelogs/wowzewow i_got_boxes_fulla_pepe.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: WowzewoW + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Added new bureaucracy and library sprites." diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index d61eabe8be9..793b0f2afe6 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index 346976b4e79..a4d64962b24 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ