From 1a7aaab0ff5ffa6ea290067b8950798a950cc8f6 Mon Sep 17 00:00:00 2001 From: datlo Date: Fri, 14 Dec 2018 02:41:52 +0000 Subject: [PATCH 1/2] add global cap on printing papers --- code/_globalvars/misc.dm | 7 ++++++- code/modules/paperwork/photocopier.dm | 12 +++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm index b4f004c8e49..9510af0dc0f 100644 --- a/code/_globalvars/misc.dm +++ b/code/_globalvars/misc.dm @@ -78,4 +78,9 @@ GLOBAL_VAR_INIT(timezoneOffset, 0) // The difference betwen midnight (of the hos // However it'd be ok to use for accessing attack logs and such too, which are even laggier. var/fileaccess_timer = 0 -GLOBAL_VAR_INIT(gametime_offset, 432000) // 12:00 in seconds \ No newline at end of file +GLOBAL_VAR_INIT(gametime_offset, 432000) // 12:00 in seconds + +//printers shutdown if too much shit printed +var/items_printed = 0 +var/max_items_printed = 300 +var/items_printed_logged = FALSE \ No newline at end of file diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index a3a8dda68e1..1f2e62d636b 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -62,6 +62,16 @@ if(toner <= 0) break + if(items_printed >= max_items_printed) + if(prob(10)) + visible_message("The printer screen reads \"!Attención! La máquina se encontra parada! Retire pantalones de lo toner!\".") + else + visible_message("The printer screen reads \"PHOTOCOPIER NETWORK OFFLINE, PLEASE CONTACT SYSTEM ADMINISTRATOR\".") + if(!items_printed_logged) + log_admin("Photocopier cap of [max_items_printed] papers reached, all photocopiers are now disabled. This may be the cause of any lag.") + items_printed_logged = TRUE + break + if(emag_cooldown > world.time) return @@ -86,7 +96,7 @@ else to_chat(usr, "\The [copyitem] can't be copied by \the [src].") break - + items_printed++ use_power(active_power_usage) updateUsrDialog() else if(href_list["remove"]) From 78908646e05a2ddbfa2f632fbc4b0db8e726fe6a Mon Sep 17 00:00:00 2001 From: datlo Date: Fri, 14 Dec 2018 03:21:10 +0000 Subject: [PATCH 2/2] updated var names and joke message --- code/_globalvars/misc.dm | 6 +++--- code/modules/paperwork/photocopier.dm | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm index 9510af0dc0f..874c87c0758 100644 --- a/code/_globalvars/misc.dm +++ b/code/_globalvars/misc.dm @@ -81,6 +81,6 @@ var/fileaccess_timer = 0 GLOBAL_VAR_INIT(gametime_offset, 432000) // 12:00 in seconds //printers shutdown if too much shit printed -var/items_printed = 0 -var/max_items_printed = 300 -var/items_printed_logged = FALSE \ No newline at end of file +var/copier_items_printed = 0 +var/copier_max_items = 300 +var/copier_items_printed_logged = FALSE \ No newline at end of file diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 1f2e62d636b..98a5acadc9c 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -62,14 +62,14 @@ if(toner <= 0) break - if(items_printed >= max_items_printed) + if(copier_items_printed >= copier_max_items) //global vars defined in misc.dm if(prob(10)) - visible_message("The printer screen reads \"!Attención! La máquina se encontra parada! Retire pantalones de lo toner!\".") + visible_message("The printer screen reads \"PC LOAD LETTER\".") else visible_message("The printer screen reads \"PHOTOCOPIER NETWORK OFFLINE, PLEASE CONTACT SYSTEM ADMINISTRATOR\".") - if(!items_printed_logged) - log_admin("Photocopier cap of [max_items_printed] papers reached, all photocopiers are now disabled. This may be the cause of any lag.") - items_printed_logged = TRUE + if(!copier_items_printed_logged) + message_admins("Photocopier cap of [copier_max_items] papers reached, all photocopiers are now disabled. This may be the cause of any lag.") + copier_items_printed_logged = TRUE break if(emag_cooldown > world.time) @@ -96,7 +96,7 @@ else to_chat(usr, "\The [copyitem] can't be copied by \the [src].") break - items_printed++ + copier_items_printed++ use_power(active_power_usage) updateUsrDialog() else if(href_list["remove"])