From 9111fdf833c47f92684a3548ca2aac817ef60e2a Mon Sep 17 00:00:00 2001 From: gem <99297919+SleepyGemmy@users.noreply.github.com> Date: Sat, 12 Feb 2022 17:19:35 +0100 Subject: [PATCH] Re-Adds Lighters and Dice as Valid Wallet Items (#13133) * N/A * N/A * N/A --- .../objects/items/weapons/storage/wallets.dm | 5 ++- html/changelogs/wallet_changes.yml | 42 +++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/wallet_changes.yml diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index 8832c74d145..1c2aac1e68b 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -15,8 +15,10 @@ /obj/item/device/flashlight/pen, /obj/item/seeds, /obj/item/coin, + /obj/item/stack/dice, /obj/item/disk, /obj/item/implanter, + /obj/item/flame/lighter, /obj/item/flame/match, /obj/item/lipstick, /obj/item/haircomb, @@ -30,7 +32,8 @@ /obj/item/device/encryptionkey, /obj/item/fluff, /obj/item/storage/business_card_holder, - /obj/item/sample + /obj/item/sample, + /obj/item/key ) slot_flags = SLOT_ID diff --git a/html/changelogs/wallet_changes.yml b/html/changelogs/wallet_changes.yml new file mode 100644 index 00000000000..679f225c922 --- /dev/null +++ b/html/changelogs/wallet_changes.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: SleepyGem + +# 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: "Re-added lighters and dice as valid wallet items." + - rscadd: "Adds keys as valid wallet items." \ No newline at end of file