diff --git a/code/modules/client/preference_setup/loadout/items/factions.dm b/code/modules/client/preference_setup/loadout/items/factions.dm index 4fbdab8b514..3115be40a8a 100644 --- a/code/modules/client/preference_setup/loadout/items/factions.dm +++ b/code/modules/client/preference_setup/loadout/items/factions.dm @@ -743,3 +743,12 @@ scc_headwear["SCC woolen hat"] = /obj/item/clothing/head/wool/scc scc_headwear["SCC woolen hat, alt"] = /obj/item/clothing/head/wool/scc/alt gear_tweaks += new /datum/gear_tweak/path(scc_headwear) + +/datum/gear/faction/scc_notepad + display_name = "SCC notepad" + description = "A notepad for jotting down notes in corporate meetings. This one is navy blue with a gold SCC logo on the front." + path = /obj/item/journal/notepad/scc + sort_category = "Factions" + cost = 1 + faction = null + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION diff --git a/code/modules/client/preference_setup/loadout/items/utility.dm b/code/modules/client/preference_setup/loadout/items/utility.dm index 359eee1beec..e4fbb6f2f24 100644 --- a/code/modules/client/preference_setup/loadout/items/utility.dm +++ b/code/modules/client/preference_setup/loadout/items/utility.dm @@ -48,6 +48,12 @@ path = /obj/item/journal flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION +/datum/gear/utility/notepad + display_name = "notepad" + description = "A notepad for jotting down notes in meetings or interrogations." + path = /obj/item/journal/notepad + 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 667b7a82f01..2cb1e6982a6 100644 --- a/code/modules/paperwork/journal.dm +++ b/code/modules/paperwork/journal.dm @@ -105,3 +105,42 @@ /obj/item/journal/proc/remove_index(var/obj/item/folder/embedded/E) LAZYREMOVE(indices, E.name) update_icon() + +/obj/item/journal/notepad + name = "notepad" + desc = "A notepad for jotting down notes in meetings or interrogations." + desc_info = "Alt-click this while it's on your person or next to you to open this notepad.\nWhile the notepad is open, use it in hand or use a pen on it to access the contents." + icon = 'icons/obj/library.dmi' + icon_state = "notepad" + item_state = "notepad" + color = COLOR_DARK_BROWN + update_icon_on_init = TRUE + throw_speed = 1 + throw_range = 5 + w_class = ITEMSIZE_SMALL + attack_verb = list("bashed", "whacked", "educated") + drop_sound = 'sound/items/drop/book.ogg' + pickup_sound = 'sound/items/pickup/book.ogg' + +/obj/item/journal/notepad/update_icon() + ClearOverlays() + if(!open) + icon_state = "[initial(icon_state)]_closed" + AddOverlays(overlay_image(icon, "notepad_paper_closed", flags=RESET_COLOR)) + else if(LAZYLEN(indices)) + icon_state = initial(icon_state) + AddOverlays(overlay_image(icon, "notepad_writing", flags=RESET_COLOR)) + else + icon_state = initial(icon_state) + AddOverlays(overlay_image(icon, "notepad_blank", flags=RESET_COLOR)) + + if(closed_desc) + desc = open ? initial(desc) + closed_desc : initial(desc) + +/obj/item/journal/notepad/scc + name = "scc notepad" + desc = "A notepad for jotting down notes in corporate meetings. This one is navy blue with a gold SCC logo on the front." + desc_info = "Alt-click this while it's on your person or next to you to open this notepad.\nWhile the notepad is open, use it in hand or use a pen on it to access the contents." + icon_state = "notepad_scc" + item_state = "notepad_scc" + color = COLOR_WHITE diff --git a/html/changelogs/CatsinHD - Notepads.yml b/html/changelogs/CatsinHD - Notepads.yml new file mode 100644 index 00000000000..8232c41000e --- /dev/null +++ b/html/changelogs/CatsinHD - Notepads.yml @@ -0,0 +1,58 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: CatsinHD + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a notepad with an SCC variant. Both are available in the loadout." diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index 111372bb78c..2759b170305 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ