Window sill & grill (#4038)

* Update TGS DMAPI * Revert "Automatic TGS DMAPI Update" * fixed --------- Co-authored-by: tgstation-server <[email protected]>
Monkestation · Oct 31, 2024 · d229dc8 · d229dc8
1 parent b308937
commit d229dc8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/monkestation/code/modules/aesthetics/objects/window_sill.dm b/monkestation/code/modules/aesthetics/objects/window_sill.dm
@@ -53,8 +53,8 @@
 
 /obj/structure/window_sill/attackby(obj/item/attacking_item, mob/user, params)
 	. = ..()
-	if(!. || !isstack(attacking_item))
-		return
+	if(!isstack(attacking_item))
+		return FALSE
 	var/obj/item/stack/stack_item = attacking_item
 	if(istype(attacking_item, /obj/item/stack/sheet/glass))
 		if(stack_item.amount < 2)

diff --git a/monkestation/code/modules/aesthetics/objects/windows.dm b/monkestation/code/modules/aesthetics/objects/windows.dm
@@ -55,6 +55,10 @@
 	smoothing_flags = SMOOTH_BITMASK
 	smoothing_groups = SMOOTH_GROUP_GRILLE
 
+/obj/structure/grille/window_sill/atom_break()
+	. = ..()
+	Destroy()
+
 /obj/structure/grille/update_overlays(updates=ALL)
 	. = ..()
 	if((updates & UPDATE_SMOOTHING) && (smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)))