Skip to content
This repository has been archived by the owner on Aug 16, 2023. It is now read-only.

[MIRROR] you can now open airlocks and firedoors and stuff with a crowbar on combat mode by right clicking #1045

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[MIRROR] you can now open airlocks and firedoors and stuff with a crowbar on combat mode by right clicking #1045

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6b3f22
you can now open airlocks and firedoors and stuff with a crowbar on c…
Fikou Feb 17, 2021
e684b1f
you can now open airlocks and firedoors and stuff with a crowbar on c…
Feb 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions code/game/machinery/doors/door.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,14 @@
/obj/machinery/door/proc/try_to_crowbar(obj/item/I, mob/user)
return

<<<<<<< HEAD
/obj/machinery/door/attackby(obj/item/I, mob/user, params)
if(user.a_intent != INTENT_HARM && (I.tool_behaviour == TOOL_CROWBAR || istype(I, /obj/item/fireaxe)))
=======
/obj/machinery/door/attackby(obj/item/I, mob/living/user, params)
var/list/modifiers = params2list(params)
if((!user.combat_mode || LAZYACCESS(modifiers, RIGHT_CLICK)) && (I.tool_behaviour == TOOL_CROWBAR || istype(I, /obj/item/fireaxe)))
>>>>>>> d40732f... you can now open airlocks and firedoors and stuff with a crowbar on combat mode by right clicking (#56960)
var/forced_open = FALSE
if(istype(I, /obj/item/crowbar))
var/obj/item/crowbar/C = I
Expand Down