Fix attack messages appearing when using tools on blast doors (#65761)

Fixes #65453

Attack messages no longer appear when using tools on blast doors. Credits to @lewcc for providing the code solution in the issue.
This commit is contained in:
Tim
2022-03-30 13:35:22 +01:00
committed by GitHub
parent 1aff5c5a73
commit 6b35b7aece
+11 -10
View File
@@ -21,15 +21,15 @@
. = ..()
if (density)
balloon_alert(user, "open the door first!")
return
return TOOL_ACT_TOOLTYPE_SUCCESS
else if (default_deconstruction_screwdriver(user, icon_state, icon_state, tool))
return TRUE
return TOOL_ACT_TOOLTYPE_SUCCESS
/obj/machinery/door/poddoor/multitool_act(mob/living/user, obj/item/tool)
. = ..()
if (density)
balloon_alert(user, "open the door first!")
return
return TOOL_ACT_TOOLTYPE_SUCCESS
if (!panel_open)
return
if (deconstruction != BLASTDOOR_FINISHED)
@@ -40,15 +40,16 @@
id = change_id
to_chat(user, span_notice("You change the ID to [id]."))
balloon_alert(user, "ID changed")
return TOOL_ACT_TOOLTYPE_SUCCESS
/obj/machinery/door/poddoor/crowbar_act(mob/living/user, obj/item/tool)
. = ..()
if(machine_stat & NOPOWER)
open(TRUE)
return
return TOOL_ACT_TOOLTYPE_SUCCESS
if (density)
balloon_alert(user, "open the door first!")
return
return TOOL_ACT_TOOLTYPE_SUCCESS
if (!panel_open)
return
if (deconstruction != BLASTDOOR_FINISHED)
@@ -59,13 +60,13 @@
id = null
deconstruction = BLASTDOOR_NEEDS_ELECTRONICS
balloon_alert(user, "removed airlock electronics")
return TRUE
return TOOL_ACT_TOOLTYPE_SUCCESS
/obj/machinery/door/poddoor/wirecutter_act(mob/living/user, obj/item/tool)
. = ..()
if (density)
balloon_alert(user, "open the door first!")
return
return TOOL_ACT_TOOLTYPE_SUCCESS
if (!panel_open)
return
if (deconstruction != BLASTDOOR_NEEDS_ELECTRONICS)
@@ -77,13 +78,13 @@
new /obj/item/stack/cable_coil(loc, amount)
deconstruction = BLASTDOOR_NEEDS_WIRES
balloon_alert(user, "removed internal cables")
return TRUE
return TOOL_ACT_TOOLTYPE_SUCCESS
/obj/machinery/door/poddoor/welder_act(mob/living/user, obj/item/tool)
. = ..()
if (density)
balloon_alert(user, "open the door first!")
return
return TOOL_ACT_TOOLTYPE_SUCCESS
if (!panel_open)
return
if (deconstruction != BLASTDOOR_NEEDS_WIRES)
@@ -95,7 +96,7 @@
new /obj/item/stack/sheet/plasteel(loc, amount)
user.balloon_alert(user, "torn apart")
qdel(src)
return TRUE
return TOOL_ACT_TOOLTYPE_SUCCESS
/obj/machinery/door/poddoor/examine(mob/user)
. = ..()