From 924bca64d1daca73a6877da179edc9744a4d87de Mon Sep 17 00:00:00 2001
From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Mon, 16 May 2022 16:38:50 +0100
Subject: [PATCH 1/6] Update preferences.dm

---
 code/modules/client/preferences.dm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index dcfb199837..8cf74d038b 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -153,6 +153,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	//Quirk list
 	var/list/all_quirks = list()
 
+	//Quirk category currently selected
+	var/quirk_category = "Positive" // defaults to Positive, the first tab!
+
 	//Job preferences 2.0 - indexed by job title , no key or value implies never
 	var/list/job_preferences = list()
 
@@ -1465,6 +1468,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		dat += "<center><b>Current quirks:</b> [all_quirks.len ? all_quirks.Join(", ") : "None"]</center>"
 		dat += "<center>[GetPositiveQuirkCount()] / [MAX_QUIRKS] max positive quirks<br>\
 		<b>Quirk balance remaining:</b> [GetQuirkBalance()]</center><br>"
+		dat += " <a href='?_src_=prefs;preference=OHGODTHISISAPLACEHOLDER'>Positive</a> "
+		dat += " <a href='?_src_=prefs;preference=OHGODTHISISAPLACEHOLDER'>Neutral</a> "
+		dat += " <a href='?_src_=prefs;preference=OHGODTHISISAPLACEHOLDER'>Negative</a> "
 		for(var/V in SSquirks.quirks)
 			var/datum/quirk/T = SSquirks.quirks[V]
 			var/quirk_name = initial(T.name)

From 1c9f6077daf96bce1854b96acd44e5d763b1ca2f Mon Sep 17 00:00:00 2001
From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Mon, 16 May 2022 21:22:22 +0100
Subject: [PATCH 2/6] loadout organisation

---
 code/__DEFINES/loadout.dm          |  5 +++++
 code/modules/client/preferences.dm | 23 +++++++++++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm
index f9b4c36c9c..792708b5bb 100644
--- a/code/__DEFINES/loadout.dm
+++ b/code/__DEFINES/loadout.dm
@@ -91,3 +91,8 @@
 #define LOADOUT_TAB				4
 #define CONTENT_PREFERENCES_TAB	5
 #define KEYBINDINGS_TAB			6
+
+//quirks
+#define QUIRK_POSITIVE	"Positive"
+#define QUIRK_NEGATIVE	"Negative"
+#define QUIRK_NEUTRAL	"Neutral"
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 8cf74d038b..c4733bcff9 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -154,7 +154,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/list/all_quirks = list()
 
 	//Quirk category currently selected
-	var/quirk_category = "Positive" // defaults to Positive, the first tab!
+	var/quirk_category = QUIRK_POSITIVE // defaults to positive, the first tab!
 
 	//Job preferences 2.0 - indexed by job title , no key or value implies never
 	var/list/job_preferences = list()
@@ -1467,12 +1467,17 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		dat += "<hr>"
 		dat += "<center><b>Current quirks:</b> [all_quirks.len ? all_quirks.Join(", ") : "None"]</center>"
 		dat += "<center>[GetPositiveQuirkCount()] / [MAX_QUIRKS] max positive quirks<br>\
-		<b>Quirk balance remaining:</b> [GetQuirkBalance()]</center><br>"
-		dat += " <a href='?_src_=prefs;preference=OHGODTHISISAPLACEHOLDER'>Positive</a> "
-		dat += " <a href='?_src_=prefs;preference=OHGODTHISISAPLACEHOLDER'>Neutral</a> "
-		dat += " <a href='?_src_=prefs;preference=OHGODTHISISAPLACEHOLDER'>Negative</a> "
+		<b>Quirk balance remaining:</b> [GetQuirkBalance()]<br>"
+		dat += " <a href='?_src_=prefs;quirk_category=[QUIRK_POSITIVE]' [quirk_category == QUIRK_POSITIVE ? "class='linkOn'" : ""]>[QUIRK_POSITIVE]</a> "
+		dat += " <a href='?_src_=prefs;quirk_category=[QUIRK_NEUTRAL]' [quirk_category == QUIRK_NEUTRAL ? "class='linkOn'" : ""]>[QUIRK_NEUTRAL]</a> "
+		dat += " <a href='?_src_=prefs;quirk_category=[QUIRK_NEGATIVE]' [quirk_category == QUIRK_NEGATIVE ? "class='linkOn'" : ""]>[QUIRK_NEGATIVE]</a> "
+		dat += "</center><br>"
 		for(var/V in SSquirks.quirks)
 			var/datum/quirk/T = SSquirks.quirks[V]
+			var/value = initial(T.value)
+			if((value > 0 && quirk_category != QUIRK_POSITIVE) || (value < 0 && quirk_category != QUIRK_NEGATIVE) || (value == 0 && quirk_category != QUIRK_NEUTRAL))
+				continue
+
 			var/quirk_name = initial(T.name)
 			var/has_quirk
 			var/quirk_cost = initial(T.value) * -1
@@ -1494,7 +1499,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				quirk_cost = "+[quirk_cost]"
 			var/font_color = "#AAAAFF"
 			if(initial(T.value) != 0)
-				font_color = initial(T.value) > 0 ? "#AAFFAA" : "#FFAAAA"
+				font_color = value > 0 ? "#AAFFAA" : "#FFAAAA"
 			if(quirk_conflict)
 				dat += "<font color='[font_color]'>[quirk_name]</font> - [initial(T.desc)] \
 				<font color='red'><b>LOCKED: [lock_reason]</b></font><br>"
@@ -1624,6 +1629,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				SetQuirks(user)
 		return TRUE
 
+	else if(href_list["quirk_category"])
+		var/temp_quirk_category = href_list["quirk_category"]
+		if(temp_quirk_category == QUIRK_POSITIVE || temp_quirk_category == QUIRK_NEUTRAL || temp_quirk_category == QUIRK_NEGATIVE)
+			quirk_category = temp_quirk_category
+			SetQuirks(user)
+
 	switch(href_list["task"])
 		if("random")
 			switch(href_list["preference"])

From 5dad84a4862447d0758b1792c8b419a4d39230b5 Mon Sep 17 00:00:00 2001
From: SandPoot <enric_gabirel@hotmail.com>
Date: Mon, 16 May 2022 21:44:25 -0300
Subject: [PATCH 3/6] Update files

---
 code/modules/mob/living/emote.dm              |  2 +
 .../modules/mob/living/silicon/robot/emote.dm |  2 +-
 .../mob/living/simple_animal/slime/emote.dm   |  2 +
 .../code/modules/mob/cit_emotes.dm            | 48 ++++++++++++-------
 4 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index 99396ca09e..d59978d993 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -518,6 +518,8 @@
 
 /datum/emote/living/circle/run_emote(mob/user, params)
 	. = ..()
+	if(!.)
+		return
 	var/obj/item/circlegame/N = new(user)
 	if(user.put_in_hands(N))
 		to_chat(user, "<span class='notice'>You make a circle with your hand.</span>")
diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
index d499c2abae..5563f47e61 100644
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -8,7 +8,7 @@
 	var/unrestricted = TRUE
 
 /datum/emote/sound/silicon/run_emote(mob/user, params)
-	if(!unrestricted && !(issilicon(user) || isipcperson(user)))
+	if(!unrestricted && !(issilicon(user) || isrobotic(user)))
 		return
 	return ..()
 
diff --git a/code/modules/mob/living/simple_animal/slime/emote.dm b/code/modules/mob/living/simple_animal/slime/emote.dm
index 94f054345d..ac0ce1c1e5 100644
--- a/code/modules/mob/living/simple_animal/slime/emote.dm
+++ b/code/modules/mob/living/simple_animal/slime/emote.dm
@@ -27,6 +27,8 @@
 
 /datum/emote/slime/mood/run_emote(mob/user, params)
 	. = ..()
+	if(!.)
+		return
 	var/mob/living/simple_animal/slime/S = user
 	S.mood = mood
 	S.regenerate_icons()
diff --git a/modular_citadel/code/modules/mob/cit_emotes.dm b/modular_citadel/code/modules/mob/cit_emotes.dm
index 0adb12e5a1..8a6643d239 100644
--- a/modular_citadel/code/modules/mob/cit_emotes.dm
+++ b/modular_citadel/code/modules/mob/cit_emotes.dm
@@ -77,7 +77,8 @@
 	restraint_check = TRUE
 
 /datum/emote/living/snap/run_emote(mob/living/user, params)
-	if(!(. = ..()))
+	. = ..()
+	if(!.)
 		return
 	if(user.nextsoundemote >= world.time)
 		return
@@ -93,7 +94,8 @@
 	restraint_check = TRUE
 
 /datum/emote/living/snap2/run_emote(mob/living/user, params)
-	if(!(. = ..()))
+	. = ..()
+	if(!.)
 		return
 	if(user.nextsoundemote >= world.time)
 		return
@@ -109,7 +111,8 @@
 	restraint_check = TRUE
 
 /datum/emote/living/snap3/run_emote(mob/living/user, params)
-	if(!(. = ..()))
+	. = ..()
+	if(!.)
 		return
 	if(user.nextsoundemote >= world.time)
 		return
@@ -125,7 +128,8 @@
 	restraint_check = FALSE
 
 /datum/emote/living/awoo/run_emote(mob/living/user, params)
-	if(!(. = ..()))
+	. = ..()
+	if(!.)
 		return
 	if(user.nextsoundemote >= world.time)
 		return
@@ -141,7 +145,8 @@
 	restraint_check = FALSE
 
 /datum/emote/living/hiss/run_emote(mob/living/user, params)
-	if(!(. = ..()))
+	. = ..()
+	if(!.)
 		return
 	if(user.nextsoundemote >= world.time)
 		return
@@ -157,7 +162,8 @@
 	restraint_check = FALSE
 
 /datum/emote/living/meow/run_emote(mob/living/user, params)
-	if(!(. = ..()))
+	. = ..()
+	if(!.)
 		return
 	if(user.nextsoundemote >= world.time)
 		return
@@ -173,7 +179,8 @@
 	restraint_check = FALSE
 
 /datum/emote/living/purr/run_emote(mob/living/user, params)
-	if(!(. = ..()))
+	. = ..()
+	if(!.)
 		return
 	if(user.nextsoundemote >= world.time)
 		return
@@ -189,7 +196,8 @@
 	restraint_check = FALSE
 
 /datum/emote/living/nya/run_emote(mob/living/user, params)
-	if(!(. = ..()))
+	. = ..()
+	if(!.)
 		return
 	if(user.nextsoundemote >= world.time)
 		return
@@ -205,7 +213,8 @@
 	restraint_check = FALSE
 
 /datum/emote/living/weh/run_emote(mob/living/user, params)
-	if(!(. = ..()))
+	. = ..()
+	if(!.)
 		return
 	if(user.nextsoundemote >= world.time)
 		return
@@ -221,7 +230,8 @@
 	restraint_check = FALSE
 
 /datum/emote/living/peep/run_emote(mob/living/user, params)
-	if(!(. = ..()))
+	. = ..()
+	if(!.)
 		return
 	if(user.nextsoundemote >= world.time)
 		return
@@ -244,7 +254,8 @@
 	restraint_check = FALSE
 
 /datum/emote/living/mothsqueak/run_emote(mob/living/user, params)
-	if(!(. = ..()))
+	. = ..()
+	if(!.)
 		return
 	if(user.nextsoundemote >= world.time)
 		return
@@ -260,7 +271,8 @@
 	restraint_check = FALSE
 
 /datum/emote/living/merp/run_emote(mob/living/user, params)
-	if(!(. = ..()))
+	. = ..()
+	if(!.)
 		return
 	if(user.nextsoundemote >= world.time)
 		return
@@ -276,7 +288,8 @@
 	restraint_check = FALSE
 
 /datum/emote/living/bark/run_emote(mob/living/user, params)
-	if(!(. = ..()))
+	. = ..()
+	if(!.)
 		return
 	if(user.nextsoundemote >= world.time)
 		return
@@ -293,7 +306,8 @@
 	restraint_check = FALSE
 
 /datum/emote/living/squish/run_emote(mob/living/user, params)
-	if(!(. = ..()))
+	. = ..()
+	if(!.)
 		return
 	if(user.nextsoundemote >= world.time)
 		return
@@ -310,7 +324,8 @@
 	restraint_check = FALSE
 
 /datum/emote/living/pain/run_emote(mob/living/user, params)
-	if(!(. = ..()))
+	. = ..()
+	if(!.)
 		return
 	if(user.nextsoundemote >= world.time)
 		return
@@ -331,6 +346,7 @@
 	restraint_check = TRUE
 
 /datum/emote/living/clap1/run_emote(mob/living/user, params)
-	if(!(. = ..()))
+	. = ..()
+	if(!.)
 		return
 	playsound(user, 'modular_citadel/sound/voice/clap.ogg', 50, 1, -1)

From 35f86287e2a2bd9fdfd3e0b80679243fc267a7f3 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Tue, 17 May 2022 00:46:59 +0000
Subject: [PATCH 4/6] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-15617.yml | 4 ----
 html/changelogs/archive/2022-05.yml        | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-15617.yml

diff --git a/html/changelogs/AutoChangeLog-pr-15617.yml b/html/changelogs/AutoChangeLog-pr-15617.yml
deleted file mode 100644
index 49dcd1426c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15617.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes: 
-  - rscadd: "poly alt cloak can now be renamed/dedescriptioned in loadout"
diff --git a/html/changelogs/archive/2022-05.yml b/html/changelogs/archive/2022-05.yml
index 7a22b3a6ae..92a19f4e1c 100644
--- a/html/changelogs/archive/2022-05.yml
+++ b/html/changelogs/archive/2022-05.yml
@@ -35,3 +35,6 @@
       "dangerous" gases (this is actually a consequence of the hardcode reduction)
       tweak: Water vapor is now counted as DANGEROUS (this makes it included in "contaminated"
       and adds admin logging when people open water vapor cans)'
+2022-05-17:
+  timothyteakettle:
+  - rscadd: poly alt cloak can now be renamed/dedescriptioned in loadout

From 8f479aa2138b041c1630069e185804d0e3844dc2 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Tue, 17 May 2022 22:29:10 -0500
Subject: [PATCH 5/6] Automatic changelog generation for PR #15624 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-15624.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-15624.yml

diff --git a/html/changelogs/AutoChangeLog-pr-15624.yml b/html/changelogs/AutoChangeLog-pr-15624.yml
new file mode 100644
index 0000000000..a9e579bfa2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15624.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes: 
+  - rscadd: "quirks are now organised into three tabs for positive, neutral and negative"

From e49311082d41e66f7b2aa47f2e5dbf1e3c2a181b Mon Sep 17 00:00:00 2001
From: Sandstorm Bot <85452301+Sandstorm-Bot@users.noreply.github.com>
Date: Wed, 18 May 2022 05:52:09 +0000
Subject: [PATCH 6/6] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-15624.yml | 4 ----
 html/changelogs/archive/2022-05.yml        | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-15624.yml

diff --git a/html/changelogs/AutoChangeLog-pr-15624.yml b/html/changelogs/AutoChangeLog-pr-15624.yml
deleted file mode 100644
index a9e579bfa2..0000000000
--- a/html/changelogs/AutoChangeLog-pr-15624.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes: 
-  - rscadd: "quirks are now organised into three tabs for positive, neutral and negative"
diff --git a/html/changelogs/archive/2022-05.yml b/html/changelogs/archive/2022-05.yml
index a656d9b04a..e0956f24b8 100644
--- a/html/changelogs/archive/2022-05.yml
+++ b/html/changelogs/archive/2022-05.yml
@@ -54,3 +54,6 @@
 2022-05-17:
   timothyteakettle:
   - rscadd: poly alt cloak can now be renamed/dedescriptioned in loadout
+2022-05-18:
+  timothyteakettle:
+  - rscadd: quirks are now organised into three tabs for positive, neutral and negative