Deconstruct Act Respects Invulnerability (#4008)

https://github.com/user-attachments/assets/8457df17-6084-4cea-a59f-7490e7e7f769 🆑 fix: you can no longer grind down the outpost /🆑 --------- Signed-off-by: Erika Fox <[email protected]> Co-authored-by: FalloutFalcon <[email protected]>
shiptest-ss13 · Jan 20, 2025 · 18c6922 · 18c6922
1 parent a88e2f6
commit 18c6922
Show file tree

Hide file tree

Showing 17 changed files with 38 additions and 0 deletions.
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
@@ -1310,6 +1310,8 @@
 
 ///Deconstruct act
 /atom/proc/deconstruct_act(mob/living/user, obj/item/I)
+	if(flags_1 & NODECONSTRUCT_1)
+		return TRUE
 	return SEND_SIGNAL(src, COMSIG_ATOM_DECONSTRUCT_ACT, user, I)
 
 ///Generate a tag for this atom

diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
@@ -23,6 +23,8 @@
 
 /obj/structure/frame/deconstruct_act(mob/living/user, obj/item/I)
 	. = ..()
+	if(.)
+		return FALSE
 	if(!I.tool_start_check(user, amount=0))
 		return FALSE
 	if(I.use_tool(src, user, 3 SECONDS, volume=0))

diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
@@ -81,6 +81,8 @@
 
 /obj/structure/barricade/wooden/deconstruct_act(mob/living/user, obj/item/I)
 	. = ..()
+	if(.)
+		return FALSE
 	if(!I.tool_start_check(user, amount=0))
 		return FALSE
 	if (I.use_tool(src, user, 2 SECONDS, volume=0))

diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
@@ -1234,6 +1234,8 @@
 
 /obj/machinery/door/airlock/deconstruct_act(mob/living/user, obj/item/I)
 	. = ..()
+	if(.)
+		return FALSE
 	if(!I.tool_start_check(user, amount=0))
 		return FALSE
 	var/decon_time = 5 SECONDS

diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
@@ -387,6 +387,12 @@
 		return FALSE
 	return TRUE
 
+/obj/deconstruct_act(mob/living/user, obj/item/I)
+	if(resistance_flags & INDESTRUCTIBLE)
+		to_chat(user, span_warning("[src] cannot be deconstructed!"))
+		return FALSE
+	return ..()
+
 /obj/analyzer_act(mob/living/user, obj/item/I)
 	if(atmosanalyzer_scan(user, src))
 		return TRUE

diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
@@ -347,6 +347,8 @@
 
 /obj/structure/door_assembly/deconstruct_act(mob/living/user, obj/item/I)
 	. = ..()
+	if(.)
+		return FALSE
 	if(!I.tool_start_check(user, amount=0))
 		return FALSE
 	if (I.use_tool(src, user, 3 SECONDS, volume=100))

diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm
@@ -38,6 +38,8 @@
 
 /obj/structure/dresser/deconstruct_act(mob/living/user, obj/item/I)
 	. = ..()
+	if(.)
+		return FALSE
 	to_chat(user, span_notice("You begin to disassemble [src]."))
 	if(I.use_tool(src, user, 10, volume=50))
 		to_chat(user, span_notice("You successfully deconstruct [src]."))

diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
@@ -214,6 +214,8 @@
 
 /obj/structure/girder/deconstruct_act(mob/living/user, obj/item/I)
 	. = ..()
+	if(.)
+		return FALSE
 	if(!I.tool_start_check(user, amount=0))
 		return FALSE
 	if(I.use_tool(src, user, 3 SECONDS, volume=0))

diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
@@ -233,6 +233,8 @@
 
 /obj/structure/grille/deconstruct_act(mob/living/user, obj/item/I)
 	. = ..()
+	if(.)
+		return FALSE
 	if(!I.tool_start_check(user, amount=0))
 		return FALSE
 	if (I.use_tool(src, user, 1 SECONDS, volume=100))

diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
@@ -42,6 +42,8 @@
 
 /obj/structure/lattice/deconstruct_act(mob/living/user, obj/item/I)
 	. = ..()
+	if(.)
+		return FALSE
 	if(!I.tool_start_check(user, amount=0))
 		return FALSE
 	if(I.use_tool(src, user, 1 SECONDS, volume=0))

diff --git a/code/game/objects/structures/platforms.dm b/code/game/objects/structures/platforms.dm
@@ -127,6 +127,8 @@
 
 /obj/structure/platform/deconstruct_act(mob/living/user, obj/item/I)
 	. = ..()
+	if(.)
+		return FALSE
 	if(!I.tool_start_check(user, amount=0))
 		return FALSE
 	if(I.use_tool(src, user, 3 SECONDS, volume=0))

diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm
@@ -73,6 +73,8 @@
 
 /obj/structure/railing/deconstruct_act(mob/living/user, obj/item/I)
 	. = ..()
+	if(.)
+		return FALSE
 	if(!I.tool_start_check(user, amount=0))
 		return FALSE
 	if (I.use_tool(src, user, 3 SECONDS, volume=0))

diff --git a/code/game/objects/structures/salvaging.dm b/code/game/objects/structures/salvaging.dm
@@ -36,6 +36,8 @@
 
 /obj/structure/salvageable/deconstruct_act(mob/living/user, obj/item/tool)
 	. = ..()
+	if(.)
+		return FALSE
 	user.visible_message("<span class='notice'>[user] starts slicing [src].</span>", \
 					"<span class='notice'>You start salvaging anything useful from [src]...</span>")
 	if(tool.use_tool(src, user, 6 SECONDS))

diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
@@ -229,6 +229,8 @@
 
 /obj/structure/table/deconstruct_act(mob/living/user, obj/item/I)
 	. = ..()
+	if(.)
+		return FALSE
 	if(!I.tool_start_check(user, amount=0))
 		return FALSE
 	if (I.use_tool(src, user, 1 SECONDS, volume=0))

diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
@@ -296,6 +296,8 @@
 
 /obj/structure/window/deconstruct_act(mob/living/user, obj/item/I)
 	. = ..()
+	if(.)
+		return FALSE
 	if(!I.tool_start_check(user, amount=0))
 		return FALSE
 	if (I.use_tool(src, user, decon_time, volume=100))

diff --git a/code/game/turfs/closed/_closed.dm b/code/game/turfs/closed/_closed.dm
@@ -271,6 +271,9 @@
 
 /turf/closed/deconstruct_act(mob/living/user, obj/item/I)
 	var/act_duration = breakdown_duration
+	if(breakdown_duration == -1)
+		to_chat(user, span_warning("[src] cannot be deconstructed!"))
+		return FALSE
 	if(!I.tool_start_check(user, amount=0))
 		return FALSE
 	to_chat(user, "<span class='notice'>You begin slicing through the outer plating...</span>")

diff --git a/code/game/turfs/closed/indestructible.dm b/code/game/turfs/closed/indestructible.dm
@@ -4,6 +4,7 @@
 	icon = 'icons/turf/walls.dmi'
 	explosion_block = 50
 	max_integrity = 10000000
+	breakdown_duration = -1
 
 /turf/closed/indestructible/TerraformTurf(path, new_baseturf, flags, defer_change = FALSE, ignore_air = FALSE)
 	return