From cbd96ff441c161b8383c8e3f3fc732009a3bb668 Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Fri, 27 Sep 2024 01:22:41 +0000 Subject: [PATCH 1/3] Update TGS DMAPI --- code/modules/tgs/core/datum.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/tgs/core/datum.dm b/code/modules/tgs/core/datum.dm index e6c000ff8e2c..3ca53e9bf7c6 100644 --- a/code/modules/tgs/core/datum.dm +++ b/code/modules/tgs/core/datum.dm @@ -11,8 +11,6 @@ TGS_DEFINE_AND_SET_GLOBAL(tgs, null) src.event_handler = event_handler src.version = version -// chumbis - /datum/tgs_api/proc/TerminateWorld() while(TRUE) TGS_DEBUG_LOG("About to terminate world. Tick: [world.time], sleep_offline: [world.sleep_offline]") From 7c40a6e01c4e856f1d0dfa20ce18b09c8ec8dd1f Mon Sep 17 00:00:00 2001 From: ThePooba <81843097+ThePooba@users.noreply.github.com> Date: Sat, 5 Oct 2024 14:51:24 -0600 Subject: [PATCH 2/3] Revert "Automatic TGS DMAPI Update" From 91d4d41b9b3ba46c42912ca57ffc3daed0b69385 Mon Sep 17 00:00:00 2001 From: ThePooba <81843097+ThePooba@users.noreply.github.com> Date: Wed, 30 Oct 2024 16:27:05 -0600 Subject: [PATCH 3/3] fixed --- monkestation/code/modules/aesthetics/objects/window_sill.dm | 4 ++-- monkestation/code/modules/aesthetics/objects/windows.dm | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/monkestation/code/modules/aesthetics/objects/window_sill.dm b/monkestation/code/modules/aesthetics/objects/window_sill.dm index 657e83faa042..b65abfe192a6 100644 --- 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 index d5f0962a68c6..8f4a8148e424 100644 --- 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)))