[MIRROR] Xenomorphs and door pryer basic mobs can now attack airlocks…

… in combat mode (#4702) * [MIRROR] Xenomorphs and door pryer basic mobs can now attack airlocks in combat mode [MDB IGNORE] (#3996) * Xenomorphs and door pryer basic mobs can now attack airlocks in combat mode (#85172) ## About The Pull Request Closes #84799 ## Changelog :cl: fix: Xenomorphs and door pryer basic mobs can now attack airlocks in combat mode /:cl: * Xenomorphs and door pryer basic mobs can now attack airlocks in combat mode --------- Co-authored-by: SmArtKar <[email protected]> Co-authored-by: NovaBot13 <[email protected]> * [MIRROR] Xenomorphs and door pryer basic mobs can now attack airlocks in combat mode --------- Co-authored-by: NovaBot <[email protected]> Co-authored-by: SmArtKar <[email protected]> Co-authored-by: NovaBot13 <[email protected]> Co-authored-by: StealsThePRs <[email protected]>
Fluffy-Frontier · Jul 25, 2024 · 7ad3509 · 7ad3509
1 parent 458784e
commit 7ad3509
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/code/datums/elements/door_pryer.dm b/code/datums/elements/door_pryer.dm
@@ -35,12 +35,13 @@
 		attacker.balloon_alert(attacker, "busy!")
 		return COMPONENT_CANCEL_ATTACK_CHAIN
 
-	if (airlock_target.locked || airlock_target.welded || airlock_target.seal)
-		if (!attacker.combat_mode)
-			airlock_target.balloon_alert(attacker, "it's sealed!")
-			return COMPONENT_CANCEL_ATTACK_CHAIN
+	if (attacker.combat_mode)
 		return // Attack the door
 
+	if (airlock_target.locked || airlock_target.welded || airlock_target.seal)
+		airlock_target.balloon_alert(attacker, "it's sealed!")
+		return COMPONENT_CANCEL_ATTACK_CHAIN
+
 	INVOKE_ASYNC(src, PROC_REF(open_door), attacker, airlock_target)
 	return COMPONENT_CANCEL_ATTACK_CHAIN
 

diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
@@ -1478,9 +1478,9 @@
 		return
 	if(!density) //Already open
 		return ..()
+	if(user.combat_mode)
+		return ..()
 	if(locked || welded || seal) //Extremely generic, as aliens only understand the basics of how airlocks work.
-		if(user.combat_mode)
-			return ..()
 		to_chat(user, span_warning("[src] refuses to budge!"))
 		return
 	add_fingerprint(user)