Xenomorph Structure Icon Update + Misc Fixes/Improvements (#7336)

code/game/objects/structures/alien/alien.dm

@@ -66,7 +66,7 @@
 	..()
 	return
 
-/obj/structure/alien/attack_hand()
+/obj/structure/alien/attack_hand(mob/user as mob)
 	usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 	if (HULK in usr.mutations)
 		visible_message("<span class='warning'>[usr] destroys the [name]!</span>")
@@ -75,14 +75,13 @@
 
 		// Aliens can get straight through these.
 		if(istype(usr,/mob/living/carbon))
-			var/mob/living/carbon/M = usr
-			if(locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs)
-				visible_message ("<span class='warning'>[usr] strokes the [name] and it melts away!</span>", 1)
-				health = 0
-				healthcheck()
-				return
-		visible_message("<span class='warning'>[usr] claws at the [name]!</span>")
-		health -= rand(5,10)
+			if(user.a_intent == I_HURT)
+				var/mob/living/carbon/M = usr
+				if(locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs)
+					visible_message ("<span class='warning'>[usr] strokes the [name] and it melts away!</span>", 1)
+					health = 0
+					healthcheck()
+					return
 	healthcheck()
 	return
 

code/game/objects/structures/simple_doors.dm

@@ -283,3 +283,30 @@
 		if(!iscultist(L) && !istype(L, /mob/living/simple_mob/construct))
 			return
 	..()
+
+// CHOMPedit start: Allows removing resin doors.
+/obj/structure/simple_door/resin/attack_hand(mob/user as mob)
+	usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+	if (HULK in usr.mutations)
+		visible_message("<span class='warning'>[usr] destroys the [name]!</span>")
+		hardness = 0
+	else
+
+		// Carbons can get straight through these.
+		if(istype(usr,/mob/living/carbon))
+			if(user.a_intent == I_HURT)
+				var/mob/living/carbon/M = usr
+				if(locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs)
+					visible_message ("<span class='warning'>[usr] strokes the [name] and it melts away!</span>", 1)
+					hardness = 0
+					CheckHardness()
+					return
+				else
+					visible_message("<span class='warning'>[usr] tears at the [name]!</span>")
+					hardness -= 2
+					CheckHardness()
+					return
+	CheckHardness()
+	TryToSwitchState(user)
+	return
+// CHOMPedit end.

code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm

@@ -84,3 +84,24 @@
 		density = FALSE
 		qdel(src)
 	return
+
+// CHOMPedit start - Allows xenos to clean nests.
+/obj/structure/bed/nest/attack_hand(mob/user as mob)
+	usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+	if (HULK in usr.mutations)
+		visible_message("<span class='warning'>[usr] destroys the [name]!</span>")
+		health = 0
+	else
+
+		// Aliens can get straight through these.
+		if(istype(usr,/mob/living/carbon))
+			if(user.a_intent == I_HURT)
+				var/mob/living/carbon/M = usr
+				if(locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs)
+					visible_message ("<span class='warning'>[usr] strokes the [name] and it melts away!</span>", 1)
+					health = 0
+					healthcheck()
+					return
+	healthcheck()
+	return
+// CHOMPedit end.