bugfix: rcd kill beach defib recursion (ss220-space#4547)

WolfLox · Mar 5, 2024 · 4e9d3ec · 4e9d3ec
1 parent a3ce05c
commit 4e9d3ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
@@ -207,13 +207,14 @@
 		to_chat(user, span_warning("You can't use your hands to take out the paddles!"))
 		return
 
+	paddles_on_defib = FALSE
 	paddles.loc = get_turf(src)	// we need this to play animation properly
 	if(!user.put_in_hands(paddles, ignore_anim = FALSE))
 		paddles.loc = src
+		paddles_on_defib = TRUE
 		to_chat(user, span_warning("You need a free hand to hold the paddles!"))
 		return
 
-	paddles_on_defib = FALSE
 	paddles.update_icon(UPDATE_ICON_STATE)
 	update_icon(UPDATE_OVERLAYS)
 

diff --git a/code/game/turfs/simulated/floor/indestructible.dm b/code/game/turfs/simulated/floor/indestructible.dm
@@ -42,6 +42,9 @@
 /turf/simulated/floor/indestructible/welder_act(mob/living/user, obj/item/I)
 	return
 
+/turf/simulated/floor/indestructible/rcd_deconstruct_act(mob/user, obj/item/rcd/our_rcd)
+	return
+
 /turf/simulated/floor/indestructible/plating
 	name = "plating"
 	icon_state = "plating"