cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 20:43:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

bash that door (#7362)

Browse Source
This commit is contained in:
Geeves
2019-11-09 23:18:13 +01:00
committed by Werner
parent a8d9f22182
commit ebc3e94fd6
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/airlock.dm
+8 -7
View File
@@ -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, "<span class='notice'>The airlock's bolts prevent it from being forced.</span>")
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, "<span class='warning'>You need to be wielding \the [C] to do that.</span>")
else if(istype(C, /obj/item/weapon/melee/hammer) && !arePowerSystemsOn())
if(locked)
if(locked && user.a_intent != I_HURT)
to_chat(user, "<span class='notice'>The airlock's bolts prevent it from being forced.</span>")
else if( !welded && !operating )
else if(locked && user.a_intent == I_HURT)
..()
else if(!welded && !operating)
if(density)
open(1)
else
html/changelogs/geeves - doorTweaks.yml
+6
View File
@@ -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."