diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index 0aca63a6f04..8f83c35c789 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -347,6 +347,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_SNOB				"snob"
 #define TRAIT_BALD				"bald"
 #define TRAIT_BADTOUCH			"bad_touch"
+#define TRAIT_EXTROVERT			"extrovert"
+#define TRAIT_INTROVERT			"introvert"
 ///Trait for dryable items
 #define TRAIT_DRYABLE "trait_dryable"
 ///Trait for dried items
diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm
index 6b7b3a99933..a6a5d219390 100644
--- a/code/controllers/subsystem/processing/quirks.dm
+++ b/code/controllers/subsystem/processing/quirks.dm
@@ -26,7 +26,8 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 							list("Ananas Affinity","Ananas Aversion"), \
 							list("Alcohol Tolerance","Light Drinker"), \
 							list("Clown Fan","Mime Fan"), \
-							list("Bad Touch", "Friendly"))
+							list("Bad Touch", "Friendly"), \
+							list("Extrovert", "Introvert"))
 	return ..()
 
 /datum/controller/subsystem/processing/quirks/proc/SetupQuirks()
diff --git a/code/datums/quirks/neutral.dm b/code/datums/quirks/neutral.dm
index c72996c0000..b871f998a35 100644
--- a/code/datums/quirks/neutral.dm
+++ b/code/datums/quirks/neutral.dm
@@ -1,6 +1,24 @@
 //traits with no real impact that can be taken freely
 //MAKE SURE THESE DO NOT MAJORLY IMPACT GAMEPLAY. those should be positive or negative traits.
 
+/datum/quirk/extrovert
+	name = "Extrovert"
+	desc = "You are energized by talking to others, and enjoy spending your free time in the bar."
+	value = 0
+	mob_trait = TRAIT_EXTROVERT
+	gain_text = "<span class='notice'>You feel like hanging out with other people.</span>"
+	lose_text = "<span class='danger'>You feel like you're over the bar scene.</span>"
+	medical_record_text = "Patient will not shut the hell up."
+
+/datum/quirk/introvert
+	name = "Introvert"
+	desc = "You are energized by having time to yourself, and enjoy spending your free time in the library."
+	value = 0
+	mob_trait = TRAIT_INTROVERT
+	gain_text = "<span class='notice'>You feel like reading a good book quietly.</span>"
+	lose_text = "<span class='danger'>You feel like libraries are boring.</span>"
+	medical_record_text = "Patient doesn't seem to say much."
+
 /datum/quirk/no_taste
 	name = "Ageusia"
 	desc = "You can't taste anything! Toxic food will still poison you."
diff --git a/code/game/area/space_station_13_areas.dm b/code/game/area/space_station_13_areas.dm
index 216c54506c7..4117504038f 100644
--- a/code/game/area/space_station_13_areas.dm
+++ b/code/game/area/space_station_13_areas.dm
@@ -472,6 +472,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	icon_state = "bar"
 	mood_bonus = 5
 	mood_message = "<span class='nicegreen'>I love being in the bar!\n</span>"
+	mood_trait = TRAIT_EXTROVERT
 	airlock_wires = /datum/wires/airlock/service
 	sound_environment = SOUND_AREA_WOODFLOOR
 
@@ -503,6 +504,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/library
 	name = "Library"
 	icon_state = "library"
+	mood_bonus = 5
+	mood_message = "<span class='nicegreen'>I love being in the library!</span>\n"
+	mood_trait = TRAIT_INTROVERT
 	flags_1 = CULT_PERMITTED_1
 	sound_environment = SOUND_AREA_LARGE_SOFTFLOOR