From ab61c5805d6253ac1d0dc8fe449db58de4282e10 Mon Sep 17 00:00:00 2001
From: NopeMcHaltman <36963049+NopeMcHaltman@users.noreply.github.com>
Date: Tue, 6 Mar 2018 23:41:08 +0300
Subject: [PATCH 1/2] Adds quite steamy trait

---
 code/datums/traits/neutral.dm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm
index 140b751fd8..8c6c1e3bfb 100644
--- a/code/datums/traits/neutral.dm
+++ b/code/datums/traits/neutral.dm
@@ -31,3 +31,30 @@
 	var/datum/species/species = H.dna.species
 	species.liked_food = initial(species.liked_food)
 	species.disliked_food = initial(species.disliked_food)
+
+//Citadel Additions starts there
+
+/datum/trait/libido
+	name = "Nymphomania"
+	desc = "You're always feeling a bit in heat. You're also get in steamy mood slightly faster than usual."
+	value = 0
+	gain_text = "<span class='notice'>You are feeling extra wild.</span>"
+	lose_text = "<span class='notice'>You don't feel that burning sensation anymore.</span>"
+
+/datum/trait/libido/add()
+	var/mob/living/M = trait_holder
+	M.min_arousal = 16
+	M.arousal_rate = 3
+
+/datum/trait/libido/remove()
+	var/mob/living/M = trait_holder
+	M.min_arousal = initial(M.min_arousal)
+	M.arousal_rate = initial(M.arousal_rate)
+
+/datum/trait/libido/on_process()
+	var/mob/living/M = trait_holder
+	if(M.canbearoused == FALSE)
+		to_chat(trait_holder, "<span class='notice'>Having high libido is useless when you can't feel arousal at all!</span>")
+		qdel(src)
+
+//Citadel Additions ends there

From b2a2165bfea42a751ad06ac7a119dd9206ddfde0 Mon Sep 17 00:00:00 2001
From: Anonymous <unceaseable@aaathats3as.com>
Date: Wed, 7 Mar 2018 16:11:48 +0300
Subject: [PATCH 2/2] Moves code into modular folder

Also fixes grammar. At least I hope.
---
 code/datums/traits/neutral.dm                 | 27 -------------------
 modular_citadel/code/datums/traits/neutral.dm | 24 +++++++++++++++++
 tgstation.dme                                 |  1 +
 3 files changed, 25 insertions(+), 27 deletions(-)
 create mode 100644 modular_citadel/code/datums/traits/neutral.dm

diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm
index 8c6c1e3bfb..140b751fd8 100644
--- a/code/datums/traits/neutral.dm
+++ b/code/datums/traits/neutral.dm
@@ -31,30 +31,3 @@
 	var/datum/species/species = H.dna.species
 	species.liked_food = initial(species.liked_food)
 	species.disliked_food = initial(species.disliked_food)
-
-//Citadel Additions starts there
-
-/datum/trait/libido
-	name = "Nymphomania"
-	desc = "You're always feeling a bit in heat. You're also get in steamy mood slightly faster than usual."
-	value = 0
-	gain_text = "<span class='notice'>You are feeling extra wild.</span>"
-	lose_text = "<span class='notice'>You don't feel that burning sensation anymore.</span>"
-
-/datum/trait/libido/add()
-	var/mob/living/M = trait_holder
-	M.min_arousal = 16
-	M.arousal_rate = 3
-
-/datum/trait/libido/remove()
-	var/mob/living/M = trait_holder
-	M.min_arousal = initial(M.min_arousal)
-	M.arousal_rate = initial(M.arousal_rate)
-
-/datum/trait/libido/on_process()
-	var/mob/living/M = trait_holder
-	if(M.canbearoused == FALSE)
-		to_chat(trait_holder, "<span class='notice'>Having high libido is useless when you can't feel arousal at all!</span>")
-		qdel(src)
-
-//Citadel Additions ends there
diff --git a/modular_citadel/code/datums/traits/neutral.dm b/modular_citadel/code/datums/traits/neutral.dm
new file mode 100644
index 0000000000..2bb9c3a356
--- /dev/null
+++ b/modular_citadel/code/datums/traits/neutral.dm
@@ -0,0 +1,24 @@
+// Citadel-specific Neutral Traits
+
+/datum/trait/libido
+	name = "Nymphomania"
+	desc = "You're always feeling a bit in heat. Also, you get aroused faster than usual."
+	value = 0
+	gain_text = "<span class='notice'>You are feeling extra wild.</span>"
+	lose_text = "<span class='notice'>You don't feel that burning sensation anymore.</span>"
+
+/datum/trait/libido/add()
+	var/mob/living/M = trait_holder
+	M.min_arousal = 16
+	M.arousal_rate = 3
+
+/datum/trait/libido/remove()
+	var/mob/living/M = trait_holder
+	M.min_arousal = initial(M.min_arousal)
+	M.arousal_rate = initial(M.arousal_rate)
+
+/datum/trait/libido/on_process()
+	var/mob/living/M = trait_holder
+	if(M.canbearoused == FALSE)
+		to_chat(trait_holder, "<span class='notice'>Having high libido is useless when you can't feel arousal at all!</span>")
+		qdel(src)
diff --git a/tgstation.dme b/tgstation.dme
index 0f159bed10..337bdb02db 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2625,6 +2625,7 @@
 #include "modular_citadel\code\controllers\subsystem\shuttle.dm"
 #include "modular_citadel\code\datums\uplink_items_cit.dm"
 #include "modular_citadel\code\datums\mutations\hulk.dm"
+#include "modular_citadel\code\datums\traits\neutral.dm"
 #include "modular_citadel\code\datums\wires\airlock.dm"
 #include "modular_citadel\code\datums\wires\autoylathe.dm"
 #include "modular_citadel\code\game\gamemodes\miniantags\bot_swarm\swarmer_event.dm"