From 302b557cc2f73cdecc309bf3ed10dab5f3a38c39 Mon Sep 17 00:00:00 2001 From: Llywelwyn <82828093+Llywelwyn@users.noreply.github.com> Date: Sat, 10 Feb 2024 11:41:13 +0000 Subject: [PATCH] Fixes wallets being unable to hold boxes of cigarette components (#18383) * allows wallets to hold normal-sized containers * actually, this is better * adjusts cl --- .../objects/items/weapons/storage/misc.dm | 5 ++- html/changelogs/llywelwyn-walletfix.yml | 42 +++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/llywelwyn-walletfix.yml diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm index 56f75a48feb..6edf476fdac 100644 --- a/code/game/objects/items/weapons/storage/misc.dm +++ b/code/game/objects/items/weapons/storage/misc.dm @@ -66,7 +66,7 @@ slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi', slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi', ) - w_class = ITEMSIZE_SMALL + w_class = ITEMSIZE_TINY max_storage_space = 10 throwforce = 2 slot_flags = SLOT_BELT @@ -94,7 +94,7 @@ slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi', slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi', ) - w_class = ITEMSIZE_SMALL + w_class = ITEMSIZE_TINY starts_with = list(/obj/item/cigarette_filter = 10) drop_sound = 'sound/items/drop/gloves.ogg' pickup_sound = 'sound/items/pickup/gloves.ogg' @@ -205,6 +205,7 @@ slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi', slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi', ) + w_class = ITEMSIZE_TINY max_storage_space = 8 drop_sound = 'sound/items/drop/cardboardbox.ogg' pickup_sound = 'sound/items/pickup/cardboardbox.ogg' diff --git a/html/changelogs/llywelwyn-walletfix.yml b/html/changelogs/llywelwyn-walletfix.yml new file mode 100644 index 00000000000..ada23088ce0 --- /dev/null +++ b/html/changelogs/llywelwyn-walletfix.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: + - tweak: "Boxes of cigarette components are now tiny items, the same as boxes of cigarettes, rather than small items." + - bugfix: "Wallets can now hold the boxes for cigarette components as intended."