diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index af7131ed578..8e74d77832f 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1089,11 +1089,12 @@ About the new airlock wires panel:
else
close(1)
else if(istype(C, /obj/item/weapon/material/twohanded/fireaxe) && !arePowerSystemsOn())
- if(locked)
+ if(locked && user.a_intent != I_HURT)
to_chat(user, "The airlock's bolts prevent it from being forced.")
- else if( !welded && !operating )
+ else if(locked && user.a_intent == I_HURT)
+ ..()
+ else if(!welded && !operating)
if(density)
-
var/obj/item/weapon/material/twohanded/fireaxe/F = C
if(F.wielded)
open(1)
@@ -1105,12 +1106,12 @@ About the new airlock wires panel:
close(1)
else
to_chat(user, "You need to be wielding \the [C] to do that.")
-
else if(istype(C, /obj/item/weapon/melee/hammer) && !arePowerSystemsOn())
- if(locked)
+ if(locked && user.a_intent != I_HURT)
to_chat(user, "The airlock's bolts prevent it from being forced.")
- else if( !welded && !operating )
-
+ else if(locked && user.a_intent == I_HURT)
+ ..()
+ else if(!welded && !operating)
if(density)
open(1)
else
diff --git a/html/changelogs/geeves - doorTweaks.yml b/html/changelogs/geeves - doorTweaks.yml
new file mode 100644
index 00000000000..f5da1bb2c4b
--- /dev/null
+++ b/html/changelogs/geeves - doorTweaks.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+ - tweak: "Harm intent clicking on a powered down and bolted airlock with a hammer or fireaxe will now attack it instead of giving the bolt message."