diff --git a/code/modules/client/preference_setup/loadout/items/utility.dm b/code/modules/client/preference_setup/loadout/items/utility.dm index b24cc03e72d..359eee1beec 100644 --- a/code/modules/client/preference_setup/loadout/items/utility.dm +++ b/code/modules/client/preference_setup/loadout/items/utility.dm @@ -42,6 +42,12 @@ folders["yellow folder"] = /obj/item/folder/yellow gear_tweaks += new /datum/gear_tweak/path(folders) +/datum/gear/utility/journal + display_name = "journal" + description = "A journal, kind of like a folder, but bigger! And personal." + path = /obj/item/journal + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + /datum/gear/utility/fountainpen display_name = "fountain pen selection" description = "A selection of fountain pens." diff --git a/code/modules/paperwork/journal.dm b/code/modules/paperwork/journal.dm index 197444bb8bb..68742e59e7e 100644 --- a/code/modules/paperwork/journal.dm +++ b/code/modules/paperwork/journal.dm @@ -3,10 +3,10 @@ desc = "A journal, kind of like a folder, but bigger! And personal." var/closed_desc desc_info = "Alt-click this while it's on your person or next to you to open this journal.\nWhile the journal is open, use it in hand or use a pen on it to access the contents." - icon = 'icons/obj/item/journal.dmi' + icon = 'icons/obj/library.dmi' icon_state = "journal" item_state = "journal" - contained_sprite = TRUE + color = COLOR_DARK_BROWN update_icon_on_init = TRUE throw_speed = 1 throw_range = 5 @@ -26,12 +26,16 @@ return ..() /obj/item/journal/update_icon() + cut_overlays() if(!open) icon_state = "[initial(icon_state)]_closed" + add_overlay(overlay_image(icon, "closed", flags=RESET_COLOR)) else if(LAZYLEN(indices)) - icon_state = "[initial(icon_state)]_writing" + icon_state = initial(icon_state) + add_overlay(overlay_image(icon, "writing", flags=RESET_COLOR)) else icon_state = initial(icon_state) + add_overlay(overlay_image(icon, "blank", flags=RESET_COLOR)) if(closed_desc) desc = open ? initial(desc) + closed_desc : initial(desc) diff --git a/html/changelogs/llywelwyn-notebook.yml b/html/changelogs/llywelwyn-notebook.yml new file mode 100644 index 00000000000..0c384a56161 --- /dev/null +++ b/html/changelogs/llywelwyn-notebook.yml @@ -0,0 +1,42 @@ +################################ +# 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: Llywelwyn + +# 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: + - rscadd: "Adds journals to the loadout under 'utility'." + - tweak: "Tweaked the journal to allow proper recolouring." diff --git a/icons/obj/item/journal.dmi b/icons/obj/item/journal.dmi deleted file mode 100644 index d3d173a046d..00000000000 Binary files a/icons/obj/item/journal.dmi and /dev/null differ diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index 2a187c391bb..590fd57007d 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ