From 01838b14a67afa1862efcc6f816ecd6f4425d2b1 Mon Sep 17 00:00:00 2001 From: Fikou <23585223+Fikou@users.noreply.github.com> Date: Sun, 24 Jul 2022 20:16:10 +0200 Subject: [PATCH] you no longer rename door assemblies with pens on combat mode (#68550) what the title says it makes you able to break door assembles with an energy dagger --- code/game/objects/structures/door_assembly.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 54c8ad2ab97..041b899636d 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -50,8 +50,8 @@ if(doorname) . += span_notice("There is a small paper placard on the assembly labelled \"[doorname]\".") -/obj/structure/door_assembly/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/pen)) +/obj/structure/door_assembly/attackby(obj/item/W, mob/living/user, params) + if(istype(W, /obj/item/pen) && !user.combat_mode) var/t = tgui_input_text(user, "Enter the name for the door", "Airlock Renaming", created_name, MAX_NAME_LEN) if(!t) return