diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 510e71533ad..3852781ab3e 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -326,6 +326,7 @@ /obj/structure/bed/stool/chair/unmovable can_dismantle = FALSE + held_item = null /obj/structure/bed/stool/chair/shuttle name = "shuttle chair" @@ -335,6 +336,7 @@ material_alteration = MATERIAL_ALTERATION_NAME || MATERIAL_ALTERATION_DESC can_dismantle = FALSE anchored = TRUE + held_item = null /obj/structure/bed/stool/chair/shuttle/post_buckle() if(buckled) 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 6c0f3e28727..b6590f0ad32 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -17,7 +17,7 @@ /obj/structure/bed/stool/MouseDrop(over_object, src_location, over_location) . = ..() if(over_object == usr && Adjacent(usr)) - if(!held_item || use_check_and_message(usr) || buckled || !can_dismantle || (anchored && padding_material)) + 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) // Handles all the material code so you don't have to. diff --git a/code/game/objects/structures/vr/_remote_chair.dm b/code/game/objects/structures/vr/_remote_chair.dm index 420d57d2e15..bbf6286d287 100644 --- a/code/game/objects/structures/vr/_remote_chair.dm +++ b/code/game/objects/structures/vr/_remote_chair.dm @@ -6,6 +6,7 @@ var/portable_type can_dismantle = FALSE var/remote_network // Which network does this remote control belong to? + held_item = null /obj/structure/bed/stool/chair/remote/Initialize() . = ..() diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index 05338e51a23..a0b7cdb514a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -101,10 +101,6 @@ path = /obj/item/material/stool/chair/wheelchair cost = 4 -/datum/gear/utility/wheelchair/color/New() - ..() - gear_tweaks += gear_tweak_free_color_choice - /datum/gear/utility/business_card_holder display_name = "business card holder" description = "Comes in different materials." diff --git a/html/changelogs/wezzy_wheelchair2.yml b/html/changelogs/wezzy_wheelchair2.yml new file mode 100644 index 00000000000..5d87ab7bebf --- /dev/null +++ b/html/changelogs/wezzy_wheelchair2.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: 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: "Wheelchairs can be picked up again. For real this time."