From d02f8d6dbf3b0c5d1b64ef0b9c074c9798e6bc90 Mon Sep 17 00:00:00 2001
From: Gboster-0 <82319946+Gboster-0@users.noreply.github.com>
Date: Wed, 8 May 2024 08:50:43 +0200
Subject: [PATCH] Don't forget... the button incident (#2066)

* sumething

* gives button counters to all maps (Except delta)

* adds the display to delta
---
 .../Teguicons/button_counter.dmi              | Bin 0 -> 571 bytes
 ModularTegustation/lc13_structures.dm         |  58 ++++++++++++++++++
 _maps/map_files/Alpha/alphacorp.dmm           |   2 +
 _maps/map_files/Beta/betacorp.dmm             |   2 +
 _maps/map_files/Delta/deltacorp.dmm           |  11 +++-
 _maps/map_files/Epsilon/epsiloncorp.dmm       |  20 +++++-
 _maps/map_files/Eta/etacorp.dmm               |   2 +
 _maps/map_files/Event/skeld.dmm               |   2 +
 _maps/map_files/Gamma/gammacorp.dmm           |   2 +
 _maps/map_files/Iota/iotacorp.dmm             |  26 +++++++-
 _maps/map_files/Kappa/kappacorp.dmm           |  10 ++-
 _maps/map_files/Lambda/lambdacorp.dmm         |  10 ++-
 code/__DEFINES/directional.dm                 |  17 +++++
 code/controllers/subsystem/persistence.dm     |  21 +++++++
 .../abnormality/_tools/zayin/touch.dm         |   3 +
 lobotomy-corp13.dme                           |   1 +
 16 files changed, 179 insertions(+), 8 deletions(-)
 create mode 100644 ModularTegustation/Teguicons/button_counter.dmi
 create mode 100644 code/__DEFINES/directional.dm

diff --git a/ModularTegustation/Teguicons/button_counter.dmi b/ModularTegustation/Teguicons/button_counter.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..e488affcc603b7a7cf76681d6650eead402a1a32
GIT binary patch
literal 571
zcmV-B0>u4^P)<h;3K|Lk000e1NJLTq004jh003YF0{{R3Csb#80000jP)t-s|Ns90
z005VE2GZ3%wYe)MCMFvj8#*@*NjNO#=H~4jBw`N_|NsAge}Dh~|Bm>?AOHXW0d!JM
zQvg8b*k%9#0GWDJSad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1<SI)oD$dN$Q?OMq
z(KF!UEYD0S$pCVUjkq{7QZv&tN+6u#lEji!AX6zNv9dV6I5RIfH9o1dq$EF2iHkEO
zv#1y-XUN5wR+N~V3Spz_Fd$BuA#uu#h*M@voH7&Ql$jEz%#1i?=ENzpAWoSjE@jFJ
zu6{1yhz0;3f{Xz#OGR}6009?CL_t(oh3%HX4T3NfhQT8zaROuoOk@EQ7r=P;-~h%6
zl*AP<n)F;JaECeo2X+xPwB<cQ@x_yQUs95n!q-1g^6GgE^TMCR)36z1iXfR~t7b$L
z!ThAzQ3Rv3&>TpDWg(@!pQXGJ1?xg7RbG^O6i3oav;?^p1OnU!YH8|jfe6|UAfcHb
zCV&Ynp`TiUXsEy{N0z{R1sFMy?OK|;Tkr+-KB%gyyw(@;KG0D2fhH#jw&rKrlLVV&
zku`%Ph~qG921URy48uUIe*Z?mdC(hSueAI9N8k{`8g*kRfC*uZ62QnPAv`}Iqhm#M
z<Y5?wVVFMy^?%V{V;tQVbz_8MMSLRZ4}e#6B|!H(5-|+(Yo5Qxn4IA-h<gA4002ov
JPDHLkV1im2?27;Z

literal 0
HcmV?d00001

diff --git a/ModularTegustation/lc13_structures.dm b/ModularTegustation/lc13_structures.dm
index 280b3480853c..01607b906a0f 100644
--- a/ModularTegustation/lc13_structures.dm
+++ b/ModularTegustation/lc13_structures.dm
@@ -71,3 +71,61 @@
 	pixel_y = -8
 	base_pixel_y = -8
 	anchored = TRUE
+
+/**
+ * List of button counters
+ * Required as persistence subsystem loads after the ones present at mapload, and to reset to 0 upon explosion.
+ */
+GLOBAL_LIST_EMPTY(map_button_counters)
+/obj/structure/sign/button_counter
+	name = "button counter"
+	sign_change_name = "Flip Sign- Days since buttoned"
+	desc = "A pair of flip signs describe how long it's been since the last button incident."
+	icon_state = "days_since_button"
+	icon = 'ModularTegustation/Teguicons/button_counter.dmi'
+	is_editable = TRUE
+	var/since_last = 0
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/button_counter, 32)
+
+/obj/structure/sign/button_counter/Initialize(mapload)
+	. = ..()
+	GLOB.map_button_counters += src
+	if(!mapload)
+		update_count(SSpersistence.rounds_since_button_pressed)
+
+/obj/structure/sign/button_counter/Destroy()
+	GLOB.map_button_counters -= src
+	return ..()
+
+/obj/structure/sign/button_counter/proc/update_count(new_count)
+	since_last = min(new_count, 99)
+	update_overlays()
+
+/obj/structure/sign/button_counter/update_overlays()
+	. = ..()
+
+	var/ones = since_last % 10
+	var/mutable_appearance/ones_overlay = mutable_appearance('ModularTegustation/Teguicons/button_counter.dmi', "days_[ones]")
+	ones_overlay.pixel_x = 4
+	. += ones_overlay
+
+	var/tens = (since_last / 10) % 10
+	var/mutable_appearance/tens_overlay = mutable_appearance('ModularTegustation/Teguicons/button_counter.dmi', "days_[tens]")
+	tens_overlay.pixel_x = -5
+	. += tens_overlay
+
+/obj/structure/sign/button_counter/examine(mob/user)
+	. = ..()
+	. += span_info("It has been [since_last] day\s since the last button event at a Lobotomy facility.")
+	switch(since_last)
+		if(0)
+			. += span_info("In case you didn't notice.")
+		if(1)
+			. += span_info("Let's do better today.")
+		if(2 to 5)
+			. += span_info("There's room for improvement.")
+		if(6 to 10)
+			. += span_info("Good work!")
+		if(11 to INFINITY)
+			. += span_info("Incredible!")
diff --git a/_maps/map_files/Alpha/alphacorp.dmm b/_maps/map_files/Alpha/alphacorp.dmm
index 5094dd9f7c4f..ef24a2c7dce3 100644
--- a/_maps/map_files/Alpha/alphacorp.dmm
+++ b/_maps/map_files/Alpha/alphacorp.dmm
@@ -2876,6 +2876,7 @@
 /obj/effect/turf_decal/box/white,
 /obj/machinery/vending/lobotomyuniform,
 /obj/machinery/camera/autoname,
+/obj/structure/sign/button_counter/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/department_main/records)
 "vr" = (
@@ -3119,6 +3120,7 @@
 "wZ" = (
 /obj/effect/turf_decal/box/white,
 /obj/machinery/vending/lobotomyarmband,
+/obj/structure/sign/button_counter/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/department_main/records)
 "xa" = (
diff --git a/_maps/map_files/Beta/betacorp.dmm b/_maps/map_files/Beta/betacorp.dmm
index 783c1889e02f..be1ed59a02f0 100644
--- a/_maps/map_files/Beta/betacorp.dmm
+++ b/_maps/map_files/Beta/betacorp.dmm
@@ -1073,6 +1073,7 @@
 "fi" = (
 /obj/machinery/vending/lobotomyuniform,
 /obj/effect/turf_decal/bot_white,
+/obj/structure/sign/button_counter/directional/east,
 /turf/open/floor/facility/dark,
 /area/department_main/records)
 "fn" = (
@@ -5468,6 +5469,7 @@
 	dir = 9
 	},
 /obj/effect/turf_decal/bot_white,
+/obj/structure/sign/button_counter/directional/east,
 /turf/open/floor/facility/dark,
 /area/department_main/records)
 "AC" = (
diff --git a/_maps/map_files/Delta/deltacorp.dmm b/_maps/map_files/Delta/deltacorp.dmm
index 998d5b7ea7c7..59319e26e95c 100644
--- a/_maps/map_files/Delta/deltacorp.dmm
+++ b/_maps/map_files/Delta/deltacorp.dmm
@@ -922,6 +922,14 @@
 	color = "#ccc8c0"
 	},
 /area/facility_hallway/training)
+"cn" = (
+/obj/effect/turf_decal/tile/neutral{
+	color = "#000000";
+	dir = 8
+	},
+/obj/structure/sign/button_counter/directional/south,
+/turf/open/floor/plasteel/sepia,
+/area/facility_hallway/information)
 "co" = (
 /obj/effect/landmark/latejoin,
 /obj/effect/turf_decal/tile/yellow{
@@ -11708,6 +11716,7 @@
 	color = "#090807";
 	dir = 1
 	},
+/obj/structure/sign/button_counter/directional/south,
 /turf/open/floor/plasteel/sepia,
 /area/facility_hallway/information)
 "Bo" = (
@@ -53727,7 +53736,7 @@ TY
 mj
 Jg
 JE
-Td
+cn
 eF
 Nh
 lp
diff --git a/_maps/map_files/Epsilon/epsiloncorp.dmm b/_maps/map_files/Epsilon/epsiloncorp.dmm
index 216386456fd6..ced2ed734d00 100644
--- a/_maps/map_files/Epsilon/epsiloncorp.dmm
+++ b/_maps/map_files/Epsilon/epsiloncorp.dmm
@@ -1294,6 +1294,15 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/sepia,
 /area/facility_hallway/east)
+"dz" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/structure/sign/button_counter/directional/east,
+/turf/open/floor/plasteel/sepia{
+	color = "#ccc8c0"
+	},
+/area/facility_hallway/information)
 "dA" = (
 /obj/effect/turf_decal/tile/brown,
 /obj/effect/turf_decal/tile/brown{
@@ -7609,6 +7618,13 @@
 	},
 /turf/open/floor/plasteel/sepia,
 /area/facility_hallway/training)
+"wA" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/sign/button_counter/directional/east,
+/turf/open/floor/plasteel/sepia{
+	color = "#ccc8c0"
+	},
+/area/facility_hallway/information)
 "wC" = (
 /obj/structure/chair/office{
 	anchored = 1;
@@ -51623,9 +51639,9 @@ kp
 mt
 yl
 pH
-Zt
+dz
 SL
-Fd
+wA
 eb
 kD
 pI
diff --git a/_maps/map_files/Eta/etacorp.dmm b/_maps/map_files/Eta/etacorp.dmm
index abff0588e746..4edac3d896b3 100644
--- a/_maps/map_files/Eta/etacorp.dmm
+++ b/_maps/map_files/Eta/etacorp.dmm
@@ -202,6 +202,7 @@
 /obj/effect/turf_decal/stripes/white/corner{
 	dir = 1
 	},
+/obj/structure/sign/button_counter/directional/east,
 /turf/open/floor/plasteel/dark{
 	color = "#ccc8c0"
 	},
@@ -1045,6 +1046,7 @@
 /area/department_main/training)
 "eN" = (
 /obj/effect/turf_decal/stripes/white/corner,
+/obj/structure/sign/button_counter/directional/north,
 /turf/open/floor/plasteel/dark{
 	color = "#ccc8c0"
 	},
diff --git a/_maps/map_files/Event/skeld.dmm b/_maps/map_files/Event/skeld.dmm
index 70f500b2c821..45ec5413704f 100644
--- a/_maps/map_files/Event/skeld.dmm
+++ b/_maps/map_files/Event/skeld.dmm
@@ -5276,6 +5276,7 @@
 /obj/machinery/computer/abnormality_logs{
 	dir = 8
 	},
+/obj/structure/sign/button_counter/directional/east,
 /turf/open/floor/carpet/black,
 /area/department_main/records)
 "Ab" = (
@@ -5472,6 +5473,7 @@
 /obj/machinery/computer/message_monitor{
 	dir = 8
 	},
+/obj/structure/sign/button_counter/directional/east,
 /turf/open/floor/carpet/black,
 /area/department_main/records)
 "AQ" = (
diff --git a/_maps/map_files/Gamma/gammacorp.dmm b/_maps/map_files/Gamma/gammacorp.dmm
index 21c0c18eb379..455d956475bd 100644
--- a/_maps/map_files/Gamma/gammacorp.dmm
+++ b/_maps/map_files/Gamma/gammacorp.dmm
@@ -1321,6 +1321,7 @@
 "jI" = (
 /obj/machinery/vending/lobotomyuniform,
 /obj/effect/turf_decal/box/white,
+/obj/structure/sign/button_counter/directional/west,
 /turf/open/floor/facility/dark,
 /area/department_main/records)
 "jL" = (
@@ -2474,6 +2475,7 @@
 "qT" = (
 /obj/machinery/vending/lobotomyarmband,
 /obj/effect/turf_decal/box/white,
+/obj/structure/sign/button_counter/directional/west,
 /turf/open/floor/facility/dark,
 /area/department_main/records)
 "qU" = (
diff --git a/_maps/map_files/Iota/iotacorp.dmm b/_maps/map_files/Iota/iotacorp.dmm
index a7e09c7688f1..b61bbac5106e 100644
--- a/_maps/map_files/Iota/iotacorp.dmm
+++ b/_maps/map_files/Iota/iotacorp.dmm
@@ -7151,6 +7151,16 @@
 	},
 /turf/open/floor/wood,
 /area/facility_hallway/welfare)
+"vK" = (
+/obj/effect/turf_decal/box/white/corners,
+/obj/effect/turf_decal/stripes/white/corner{
+	dir = 1
+	},
+/obj/structure/sign/button_counter/directional/south,
+/turf/open/floor/facility/dark{
+	color = "#ccc8c0"
+	},
+/area/space)
 "vM" = (
 /obj/effect/turf_decal/stripes/white/line{
 	dir = 4
@@ -11707,6 +11717,18 @@
 	},
 /turf/open/floor/facility/dark,
 /area/department_main/records)
+"Lu" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/white/corner{
+	dir = 4
+	},
+/obj/structure/sign/button_counter/directional/south,
+/turf/open/floor/facility/dark{
+	color = "#ccc8c0"
+	},
+/area/space)
 "Lw" = (
 /obj/effect/turf_decal/siding/thinplating{
 	dir = 1
@@ -55747,7 +55769,7 @@ rK
 SV
 JT
 ON
-dx
+Lu
 mu
 uf
 Bn
@@ -56261,7 +56283,7 @@ rK
 SV
 mD
 sq
-BN
+vK
 mu
 uf
 Bn
diff --git a/_maps/map_files/Kappa/kappacorp.dmm b/_maps/map_files/Kappa/kappacorp.dmm
index 9eff9e37da3b..37e1a6d1af95 100644
--- a/_maps/map_files/Kappa/kappacorp.dmm
+++ b/_maps/map_files/Kappa/kappacorp.dmm
@@ -7514,6 +7514,13 @@
 	},
 /turf/open/floor/pod/dark,
 /area/department_main/information)
+"JO" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/structure/sign/button_counter/directional/east,
+/turf/open/floor/pod/light,
+/area/facility_hallway/information)
 "JP" = (
 /turf/closed/indestructible/reinforced{
 	desc = "A huge chunk of wing-grade metal used in various L corporation facilities. Effectively impervious to conventional methods of destruction.";
@@ -7978,6 +7985,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
+/obj/structure/sign/button_counter/directional/east,
 /turf/open/floor/pod/light,
 /area/facility_hallway/information)
 "Ml" = (
@@ -51100,7 +51108,7 @@ em
 gQ
 Mj
 Tr
-RU
+JO
 nO
 SK
 SK
diff --git a/_maps/map_files/Lambda/lambdacorp.dmm b/_maps/map_files/Lambda/lambdacorp.dmm
index b8c347267010..d598a9a35d2d 100644
--- a/_maps/map_files/Lambda/lambdacorp.dmm
+++ b/_maps/map_files/Lambda/lambdacorp.dmm
@@ -8791,6 +8791,12 @@
 	},
 /turf/open/floor/pod,
 /area/department_main/training)
+"QH" = (
+/obj/effect/landmark/toolspawn,
+/obj/effect/turf_decal/box/white,
+/obj/structure/sign/button_counter/directional/north,
+/turf/open/floor/pod/dark,
+/area/department_main/records)
 "QJ" = (
 /turf/open/floor/plating,
 /area/facility_hallway/information)
@@ -47965,7 +47971,7 @@ sR
 sR
 sR
 QV
-NH
+QH
 VH
 fz
 QV
@@ -48479,7 +48485,7 @@ sR
 sR
 sR
 QV
-NH
+QH
 Dr
 Db
 QV
diff --git a/code/__DEFINES/directional.dm b/code/__DEFINES/directional.dm
new file mode 100644
index 000000000000..953228ed422f
--- /dev/null
+++ b/code/__DEFINES/directional.dm
@@ -0,0 +1,17 @@
+/// Create directional subtypes for a path to simplify mapping.
+#define MAPPING_DIRECTIONAL_HELPERS(path, offset) ##path/directional/north {\
+	dir = NORTH; \
+	pixel_y = offset; \
+} \
+##path/directional/south {\
+	dir = SOUTH; \
+	pixel_y = -offset; \
+} \
+##path/directional/east {\
+	dir = EAST; \
+	pixel_x = offset; \
+} \
+##path/directional/west {\
+	dir = WEST; \
+	pixel_x = -offset; \
+}
diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm
index 65491a643652..002a50ab3595 100644
--- a/code/controllers/subsystem/persistence.dm
+++ b/code/controllers/subsystem/persistence.dm
@@ -4,6 +4,7 @@
 #define FILE_PE_QUOTA "data/PEQuota.json"
 #define FILE_ABNO_PICKS "data/abno_rates/[mode].json"
 #define FILE_CORE_SUPPRESSIONS "data/ClearedCores.json"
+#define ROUNDCOUNT_BUTTON_PRESSED 0
 
 #define KEEP_ROUNDS_MAP 3
 
@@ -31,6 +32,8 @@ SUBSYSTEM_DEF(persistence)
 	var/list/abno_rates = list()
 	/// List of ckeys with list of core suppression names that they have cleared before
 	var/list/cleared_core_suppressions = list()
+	/// LOBOTOMYCORPORATION ADDITION: Button counter
+	var/rounds_since_button_pressed = 0
 
 /datum/controller/subsystem/persistence/Initialize()
 	LoadPoly()
@@ -45,6 +48,7 @@ SUBSYSTEM_DEF(persistence)
 	if(SSmaptype.maptype in list("standard", "skeld", "fishing", "wonderlabs"))
 		LoadPEStatus()
 	LoadClearedCores()
+	Load_button_counter() // LOBOTOMYCORPORATION ADDITION: Button counter
 	LoadRandomizedRecipes()
 	LoadPaintings()
 	load_custom_outfits()
@@ -238,6 +242,7 @@ SUBSYSTEM_DEF(persistence)
 		SavePEStatus()
 		SaveAbnoPicks()
 	CollectAgentReputation()
+	Save_button_counter() // LOBOTOMYCORPORATION ADDITION: Button counter
 	SaveRandomizedRecipes()
 	SavePaintings()
 	SaveScars()
@@ -561,3 +566,19 @@ SUBSYSTEM_DEF(persistence)
 	WRITE_FILE(file, json_encode(data))
 
 #undef FILE_ABNO_PICKS
+
+// LOBOTOMYCORPORATION ADDITION: Button procs
+/// Location where we save the information about how many rounds it has been since the engine blew up
+#define BUTTON_COUNT_FILEPATH "data/rounds_since_button.txt"
+
+/datum/controller/subsystem/persistence/proc/Load_button_counter()
+	if(!fexists(BUTTON_COUNT_FILEPATH))
+		return
+	rounds_since_button_pressed = text2num(file2text(BUTTON_COUNT_FILEPATH))
+	for(var/obj/structure/sign/button_counter/sign as anything in GLOB.map_button_counters)
+		sign.update_count(rounds_since_button_pressed)
+
+/datum/controller/subsystem/persistence/proc/Save_button_counter()
+	rustg_file_write("[rounds_since_button_pressed + 1]", BUTTON_COUNT_FILEPATH)
+
+#undef BUTTON_COUNT_FILEPATH
diff --git a/code/modules/mob/living/simple_animal/abnormality/_tools/zayin/touch.dm b/code/modules/mob/living/simple_animal/abnormality/_tools/zayin/touch.dm
index aa7f82f7095d..4082b02a685e 100644
--- a/code/modules/mob/living/simple_animal/abnormality/_tools/zayin/touch.dm
+++ b/code/modules/mob/living/simple_animal/abnormality/_tools/zayin/touch.dm
@@ -26,6 +26,9 @@
 		to_chat(M, span_userdanger("[uppertext(user.real_name)] WILL PUSH DON'T TOUCH ME[round_end ? "" : " TO BREACH ABNORMALITIES"]."))
 
 	if(round_end)
+		SSpersistence.rounds_since_button_pressed = ROUNDCOUNT_BUTTON_PRESSED
+		for(var/obj/structure/sign/button_counter/sign as anything in GLOB.map_button_counters)
+			sign.update_count(ROUNDCOUNT_BUTTON_PRESSED)
 		RoundEndEffect(user)
 	else
 		BreachEffect(user)
diff --git a/lobotomy-corp13.dme b/lobotomy-corp13.dme
index 8bff7373dcd1..7693b999a2ce 100644
--- a/lobotomy-corp13.dme
+++ b/lobotomy-corp13.dme
@@ -51,6 +51,7 @@
 #include "code\__DEFINES\construction.dm"
 #include "code\__DEFINES\cooldowns.dm"
 #include "code\__DEFINES\cult.dm"
+#include "code\__DEFINES\directional.dm"
 #include "code\__DEFINES\diseases.dm"
 #include "code\__DEFINES\DNA.dm"
 #include "code\__DEFINES\do_afters.dm"