From 9b7138ba050a0ea9be5752b2b6d4d3341103a1b7 Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Fri, 13 Oct 2023 23:49:50 +0200 Subject: [PATCH] Medkits can now only hold small-sized items. (#17583) Co-authored-by: Matt Atlas --- .../objects/items/weapons/storage/firstaid.dm | 10 ++++- html/changelogs/mattatlas-nofun.yml | 41 +++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/mattatlas-nofun.yml diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index f9706513f15..73f1242db26 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -11,6 +11,7 @@ drop_sound = 'sound/items/drop/cardboardbox.ogg' pickup_sound = 'sound/items/pickup/cardboardbox.ogg' use_sound = 'sound/items/storage/briefcase.ogg' + max_w_class = ITEMSIZE_SMALL /obj/item/storage/firstaid/empty name = "empty first-aid kit" @@ -59,7 +60,7 @@ starts_with = list( /obj/item/stack/medical/advanced/ointment = 4, /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/dermaline = 4, - /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/mortaphenyl = 4, + /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/mortaphenyl = 4, /obj/item/device/healthanalyzer = 1 ) @@ -167,6 +168,13 @@ desc = "A sterile medical kit containing tools for surgery on-the-go. Even comes with a foam lining so your delicate instruments don't break in transit. How considerate." icon_state = "purplefirstaid" item_state = "purplefirstaid" + max_w_class = ITEMSIZE_NORMAL /// Saws are medium sized. + can_hold = list( + /obj/item/surgery, + /obj/item/stack/medical, + /obj/item/reagent_containers/inhaler, + /obj/item/reagent_containers/syringe + ) starts_with = list( /obj/item/surgery/bonesetter = 1, /obj/item/surgery/cautery = 1, diff --git a/html/changelogs/mattatlas-nofun.yml b/html/changelogs/mattatlas-nofun.yml new file mode 100644 index 00000000000..59d54cb3b7b --- /dev/null +++ b/html/changelogs/mattatlas-nofun.yml @@ -0,0 +1,41 @@ +################################ +# 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: MattAtlas + +# 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: "Medkits can now only hold small sized items."