From cd3ec90034f4dbf32f7918931aadd02ef07bc9c9 Mon Sep 17 00:00:00 2001
From: Zenith <109559450+Zenith00000@users.noreply.github.com>
Date: Thu, 23 May 2024 02:57:29 +0100
Subject: [PATCH] more fixes

---
 code/game/objects/structures/hybrisa_props.dm | 28 +------------------
 .../structures/stool_bed_chair_nest/bed.dm    |  4 +++
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/code/game/objects/structures/hybrisa_props.dm b/code/game/objects/structures/hybrisa_props.dm
index e6ef6c5322b1..ae1fc265dc7d 100644
--- a/code/game/objects/structures/hybrisa_props.dm
+++ b/code/game/objects/structures/hybrisa_props.dm
@@ -917,24 +917,6 @@
 	desc = "A comfy looking bunk-bed."
 	icon_state = "zbunkbed4"
 
-/obj/structure/bed/hybrisa/hospitalbeds
-	icon_state = "hospital"
-
-/obj/structure/bed/hybrisa/hospitalbeds/hospitalbed1
-	name = "hospital bed"
-	desc = "A mattress seated on a rectangular metallic frame with wheels. This is used to support a lying person in a comfortable manner."
-	icon_state = "bigrollerempty2_up"
-
-/obj/structure/bed/hybrisa/hospitalbeds/hospitalbed2
-	name = "hospital bed"
-	desc = "A mattress seated on a rectangular metallic frame with wheels. This is used to support a lying person in a comfortable manner."
-	icon_state = "bigrollerempty_up"
-
-/obj/structure/bed/hybrisa/hospitalbeds/hospitalbed3
-	name = "hospital bed"
-	desc = "A mattress seated on a rectangular metallic frame with wheels. This is used to support a lying person in a comfortable manner."
-	icon_state = "bigrollerempty3_up"
-
 // Xenobiology
 
 /obj/structure/prop/hybrisa/xenobiology
@@ -1919,7 +1901,7 @@
 	icon_state = "seatedbench"
 	bound_width = 32
 	bound_height = 64
-	layer = 4
+	layer = BELOW_MOB_LAYER
 	density = FALSE
 	health = 200
 	anchored = TRUE
@@ -2037,7 +2019,6 @@
 	layer = 8
 /obj/structure/prop/hybrisa/billboardsandsigns/bigroadsigns/road_sign_1
 	icon_state = "roadsign_1"
-
 /obj/structure/prop/hybrisa/billboardsandsigns/bigroadsigns/road_sign_2
 	icon_state = "roadsign_2"
 
@@ -2065,7 +2046,6 @@
 	density = FALSE
 
 // Hybrisa Lattice
-
 /obj/structure/prop/hybrisa/lattice_prop
 	desc = "A support lattice."
 	name = "lattice"
@@ -2074,21 +2054,15 @@
 	density = FALSE
 	layer = RIPPLE_LAYER
 	health = 6000
-
 /obj/structure/prop/hybrisa/lattice_prop/lattice_1
 	icon_state = "lattice1"
-
 /obj/structure/prop/hybrisa/lattice_prop/lattice_2
 	icon_state = "lattice2"
-
 /obj/structure/prop/hybrisa/lattice_prop/lattice_3
 	icon_state = "lattice3"
-
 /obj/structure/prop/hybrisa/lattice_prop/lattice_4
 	icon_state = "lattice4"
-
 /obj/structure/prop/hybrisa/lattice_prop/lattice_5
 	icon_state = "lattice5"
-
 /obj/structure/prop/hybrisa/lattice_prop/lattice_6
 	icon_state = "lattice6"
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index d04723d9babf..eb50c0ed9dbf 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -507,6 +507,10 @@ GLOBAL_LIST_EMPTY(activated_medevac_stretchers)
 	contents -= body
 	body = null
 
+/obj/structure/bed/roller/hospital/attack_alien(mob/living/carbon/xenomorph/M)
+	if(M.a_intent == INTENT_HARM && body)
+		dump_body()
+	return ..()
 /obj/structure/bed/roller/hospital/bloody
 	base_bed_icon = "bigrollerbloodempty"
 	body_icon_state = "bigrollerblood"