diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index 80c4d3897fa..5a8ee4d651a 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -21,7 +21,7 @@ if(!held_item || use_check_and_message(usr) || buckled || (anchored && padding_material)) // Make sure held_item = null if you don't want it to get picked up. return usr.visible_message(SPAN_NOTICE("[usr] [withdraw_verb]s \the [src.name]."), SPAN_NOTICE("You [withdraw_verb] \the [src.name].")) - var/obj/item/material/stool/S = new held_item(src.loc, material.name, padding_material ? padding_material.name : null, painted_colour) // Handles all the material code so you don't have to. + var/obj/item/material/stool/S = new held_item(src.loc, material.name, padding_material?.name, painted_colour) // Handles all the material code so you don't have to. TransferComponents(S) if(material_alteration & MATERIAL_ALTERATION_COLOR) // For snowflakes like wood chairs. S.color = material.icon_colour @@ -254,7 +254,7 @@ user.visible_message(SPAN_NOTICE("[user] [deploy_verb]s \the [src.name]."), SPAN_NOTICE("You [deploy_verb] \the [name].")) // playsound(src, deploy_sound ? deploy_sound : drop_sound, DROP_SOUND_VOLUME) user.drop_from_inventory(src) - var/obj/structure/bed/stool/S = new origin_type(get_turf(loc), material.name, padding_material ? padding_material.name : null, painted_colour) // Fuck me. + var/obj/structure/bed/stool/S = new origin_type(get_turf(loc), material?.name, padding_material?.name, painted_colour) // Fuck me. TransferComponents(S) S.dir = user.dir // Plant it where the user's facing if(blood_DNA) @@ -308,10 +308,10 @@ base_icon = "bar_stool" origin_type = /obj/structure/bed/stool/bar -/obj/item/material/stool/bar/New(var/newloc, new_material) +/obj/item/material/stool/bar/New(var/newloc, new_material, new_padding_material, new_painted_colour) if(!new_material) new_material = MATERIAL_STEEL - ..(newloc, new_material) + ..(newloc, new_material, new_padding_material, new_painted_colour) /obj/item/material/stool/hover icon_state = "hover_stool_item" @@ -319,10 +319,10 @@ base_icon = "hover_stool" origin_type = /obj/structure/bed/stool/hover -/obj/item/material/stool/hover/New(var/newloc, new_material) +/obj/item/material/stool/hover/New(var/newloc, new_material, new_padding_material, new_painted_colour) if(!new_material) new_material = MATERIAL_SHUTTLE_SKRELL - ..(newloc, new_material) + ..(newloc, new_material, new_padding_material, new_painted_colour) /obj/item/material/stool/bamboo icon_state = "bamboo_stool_item" @@ -330,10 +330,10 @@ base_icon = "bamboo_stool" origin_type = /obj/structure/bed/stool/bamboo -/obj/item/material/stool/bamboo/New(var/newloc, new_material) +/obj/item/material/stool/bamboo/New(var/newloc, new_material, new_padding_material, new_painted_colour) if(!new_material) new_material = MATERIAL_BAMBOO - ..(newloc, new_material) + ..(newloc, new_material, new_padding_material, new_painted_colour) /obj/structure/flora/log_bench name = "log bench" diff --git a/html/changelogs/wezzy_211023fixes.yml b/html/changelogs/wezzy_211023fixes.yml new file mode 100644 index 00000000000..35d1318dcbc --- /dev/null +++ b/html/changelogs/wezzy_211023fixes.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: Wowzewow (Wezzy) + +# 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: + - bugfix: "Fixes padding issue with bar stools." + - bugfix: "Fixes invisible NKA pin and Grilled Carp Slice sprites." diff --git a/icons/obj/item/reagent_containers/food/cultural/unathi.dmi b/icons/obj/item/reagent_containers/food/cultural/unathi.dmi index 3e3270d545d..c836dbbbda1 100644 Binary files a/icons/obj/item/reagent_containers/food/cultural/unathi.dmi and b/icons/obj/item/reagent_containers/food/cultural/unathi.dmi differ diff --git a/icons/obj/item/reagent_containers/food/meat.dmi b/icons/obj/item/reagent_containers/food/meat.dmi index 49975fddfb3..e2b9810860c 100644 Binary files a/icons/obj/item/reagent_containers/food/meat.dmi and b/icons/obj/item/reagent_containers/food/meat.dmi differ diff --git a/icons/obj/structure/chairs.dmi b/icons/obj/structure/chairs.dmi index 7a88c3b243e..cb38b0ebdd5 100644 Binary files a/icons/obj/structure/chairs.dmi and b/icons/obj/structure/chairs.dmi differ diff --git a/icons/obj/tajara_items.dmi b/icons/obj/tajara_items.dmi index cd004d360d4..2431de4375d 100644 Binary files a/icons/obj/tajara_items.dmi and b/icons/obj/tajara_items.dmi differ