From f903330b0e8354320bd5826d2e2e9fd49d4296cb Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 23 Jan 2018 21:56:53 -0800
Subject: [PATCH] Xeno nests are no longer held together by bolts. (#34766)
* Update bed.dm
* Update alien_nest.dm
---
code/game/objects/structures/beds_chairs/alien_nest.dm | 3 ++-
code/game/objects/structures/beds_chairs/bed.dm | 8 +++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/code/game/objects/structures/beds_chairs/alien_nest.dm b/code/game/objects/structures/beds_chairs/alien_nest.dm
index d3b62f35f4..77b3279517 100644
--- a/code/game/objects/structures/beds_chairs/alien_nest.dm
+++ b/code/game/objects/structures/beds_chairs/alien_nest.dm
@@ -11,6 +11,7 @@
canSmoothWith = null
buildstacktype = null
flags_1 = NODECONSTRUCT_1
+ bolts = FALSE
var/static/mutable_appearance/nest_overlay = mutable_appearance('icons/mob/alien.dmi', "nestoverlay", LYING_MOB_LAYER)
/obj/structure/bed/nest/user_unbuckle_mob(mob/living/buckled_mob, mob/living/user)
@@ -88,4 +89,4 @@
if(user.a_intent != INTENT_HARM)
return attack_hand(user)
else
- return ..()
\ No newline at end of file
+ return ..()
diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm
index 56a38cb688..72764f436d 100644
--- a/code/game/objects/structures/beds_chairs/bed.dm
+++ b/code/game/objects/structures/beds_chairs/bed.dm
@@ -13,17 +13,19 @@
icon_state = "bed"
icon = 'icons/obj/objects.dmi'
anchored = TRUE
- can_buckle = 1
- buckle_lying = 1
+ can_buckle = TRUE
+ buckle_lying = TRUE
resistance_flags = FLAMMABLE
max_integrity = 100
integrity_failure = 30
var/buildstacktype = /obj/item/stack/sheet/metal
var/buildstackamount = 2
+ var/bolts = TRUE
/obj/structure/bed/examine(mob/user)
..()
- to_chat(user, "It's held together by a couple of bolts.")
+ if(bolts)
+ to_chat(user, "It's held together by a couple of bolts.")
/obj/structure/bed/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))