From b148894fc9ea5f141a065d90236a505f3c299bcd Mon Sep 17 00:00:00 2001 From: Casper Date: Thu, 11 Jul 2024 13:10:44 +0100 Subject: [PATCH] Oops --- .../atmospherics/machinery/portable/canister.dm | 11 ----------- .../atmospherics/machinery/portable/canister.dm | 10 ++++++++++ tgstation.dme | 1 + 3 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 modular_zzplurt/code/modules/atmospherics/machinery/portable/canister.dm diff --git a/modular_zubbers/code/modules/atmospherics/machinery/portable/canister.dm b/modular_zubbers/code/modules/atmospherics/machinery/portable/canister.dm index 686e6278e6f34..d4cf5dc08a1f6 100644 --- a/modular_zubbers/code/modules/atmospherics/machinery/portable/canister.dm +++ b/modular_zubbers/code/modules/atmospherics/machinery/portable/canister.dm @@ -1,14 +1,3 @@ -/obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, datum/tgui/ui) - . = ..() - - var/client/client = user.client - if (CONFIG_GET(flag/use_exp_tracking) && client && client.get_exp_living(TRUE) < 8 HOURS) // Player with less than 8 hours playtime is interacting with this canister. - if(client.next_canister_grief_warning < world.time) - var/turf/T = get_turf(src) - client.next_canister_grief_warning = world.time + 15 MINUTES // Wait 15 minutes before alerting admins again - message_admins("[span_adminhelp("ANTI-GRIEF:")] New player [ADMIN_LOOKUPFLW(user)] has touched \a [src] at [ADMIN_VERBOSEJMP(T)].") - client.touched_canister = TRUE - /obj/machinery/portable_atmospherics/canister/goblin name = "G-081-N canister" gas_type = /datum/gas/goblin diff --git a/modular_zzplurt/code/modules/atmospherics/machinery/portable/canister.dm b/modular_zzplurt/code/modules/atmospherics/machinery/portable/canister.dm new file mode 100644 index 0000000000000..569149cb2016a --- /dev/null +++ b/modular_zzplurt/code/modules/atmospherics/machinery/portable/canister.dm @@ -0,0 +1,10 @@ +/obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, datum/tgui/ui) + . = ..() + + var/client/client = user.client + if (CONFIG_GET(flag/use_exp_tracking) && client && client.get_exp_living(TRUE) < 8 HOURS) // Player with less than 8 hours playtime is interacting with this canister. + if(client.next_canister_grief_warning < world.time) + var/turf/T = get_turf(src) + client.next_canister_grief_warning = world.time + 15 MINUTES // Wait 15 minutes before alerting admins again + message_admins("[span_adminhelp("ANTI-GRIEF:")] New player [ADMIN_LOOKUPFLW(user)] has touched \a [src] at [ADMIN_VERBOSEJMP(T)].") + client.touched_canister = TRUE diff --git a/tgstation.dme b/tgstation.dme index 2ecf615b649c3..6b8d121e81f87 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9107,6 +9107,7 @@ #include "modular_zzplurt\code\datums\components\crafting\crafting.dm" #include "modular_zzplurt\code\game\objects\items\devices\transfer_valve.dm" #include "modular_zzplurt\code\modules\admin\playtimes.dm" +#include "modular_zzplurt\code\modules\atmospherics\machinery\portable\canister.dm" #include "modular_zzplurt\code\modules\client\verbs\looc.dm" #include "modular_zzplurt\code\modules\client\verbs\ooc.dm" #include "modular_zzplurt\code\modules\discord\tgs_commands.dm"