Chair fixes again (#12866)

* Chair fixes 3

fixes wheelchairs not being able to be picked up...again

* japed
This commit is contained in:
Wowzewow (Wezzy)
2021-12-23 00:03:16 +08:00
committed by GitHub
parent c700d6b140
commit 25f4df810f
5 changed files with 45 additions and 5 deletions
@@ -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)
@@ -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.
@@ -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()
. = ..()