diff --git a/code/game/objects/structures/beds_chairs/alien_nest.dm b/code/game/objects/structures/beds_chairs/alien_nest.dm index 2fab156e1b4..a7e5c68a2bc 100644 --- a/code/game/objects/structures/beds_chairs/alien_nest.dm +++ b/code/game/objects/structures/beds_chairs/alien_nest.dm @@ -13,6 +13,7 @@ canSmoothWith = SMOOTH_GROUP_ALIEN_NEST build_stack_type = null elevation = 0 + can_deconstruct = FALSE var/static/mutable_appearance/nest_overlay = mutable_appearance('icons/mob/nonhuman-player/alien.dmi', "nestoverlay", LYING_MOB_LAYER) /obj/structure/bed/nest/add_context(atom/source, list/context, obj/item/held_item, mob/living/user) @@ -21,10 +22,6 @@ return ..() -/obj/structure/bed/nest/wrench_act_secondary(mob/living/user, obj/item/weapon) - return ITEM_INTERACT_BLOCKING - - /obj/structure/bed/nest/user_unbuckle_mob(mob/living/captive, mob/living/hero) if(!length(buckled_mobs)) return diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm index e7cffb0184c..cb57446dc30 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -25,6 +25,8 @@ var/build_stack_amount = 2 /// Mobs standing on it are nudged up by this amount. Also used to align the person back when buckled to it after init. var/elevation = 8 + /// If this bed can be deconstructed using a wrench + var/can_deconstruct = TRUE /obj/structure/bed/Initialize(mapload) . = ..() @@ -35,7 +37,8 @@ /obj/structure/bed/examine(mob/user) . = ..() - . += span_notice("It's held together by a couple of bolts.") + if (can_deconstruct) + . += span_notice("It's held together by a couple of bolts.") /obj/structure/bed/add_context(atom/source, list/context, obj/item/held_item, mob/living/user) if(held_item) @@ -57,6 +60,8 @@ return attack_hand(user, modifiers) /obj/structure/bed/wrench_act_secondary(mob/living/user, obj/item/weapon) + if (!can_deconstruct) + return NONE ..() weapon.play_tool_sound(src) deconstruct(disassembled = TRUE)