From 0eae1cade963e0aaa9b6631c5b68094cab5d9e1a Mon Sep 17 00:00:00 2001 From: Alberyk Date: Mon, 30 Dec 2019 07:42:45 -0300 Subject: [PATCH] Fixes examining item not taking in consideration all possible examine information. (#7838) --- code/game/atoms.dm | 2 +- code/game/objects/structures/bedsheet_bin.dm | 3 +-- html/changelogs/alberyk-fixesexamine.yml | 6 ++++++ 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/alberyk-fixesexamine.yml diff --git a/code/game/atoms.dm b/code/game/atoms.dm index ef8602422cd..fbea5c03061 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -146,7 +146,7 @@ to_chat(user, "\icon[src] That's [f_name] [suffix]") to_chat(user, desc) - if(description_fluff) + if(description_info || description_fluff) to_chat(user, span("notice", "This item has additional examine info. \[View\]")) if(description_antag && player_is_antag(user.mind)) to_chat(user, span("notice", "This item has additional antag info. \[View\]")) diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index cc27e390b57..010b81d08c3 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -7,8 +7,7 @@ LINEN BINS /obj/item/bedsheet name = "bedsheet" desc = "A surprisingly soft linen bedsheet." - description_info = "Click to roll and unroll. Alt-click to fold and unfold. Drag and drop to pick up." - description_fluff = "It seems like you can equip it in your backpack slot..." + description_info = "Click to roll and unroll. Alt-click to fold and unfold. Drag and drop to pick up. You can equip it in your backpack slot." icon = 'icons/obj/bedsheets.dmi' icon_state = "sheetwhite" item_state = "sheetwhite" diff --git a/html/changelogs/alberyk-fixesexamine.yml b/html/changelogs/alberyk-fixesexamine.yml new file mode 100644 index 00000000000..510e58a6666 --- /dev/null +++ b/html/changelogs/alberyk-fixesexamine.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Fixes examining items not taking in consideration all possible extra examine information."