Merge pull request #36 from coficoficofi/DONT-UNDO-MY-CHANGES-KITTEN

RE-re-adds Devout Follower and Colorblind
GeneralPantsuIsBadAtCoding · Aug 8, 2024 · a1a6aed · a1a6aed
2 parents 091a8db + 4e073d5
commit a1a6aed
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/code/datums/character_flaw/_character_flaw.dm b/code/datums/character_flaw/_character_flaw.dm
@@ -1,6 +1,8 @@
 
 GLOBAL_LIST_INIT(character_flaws, list(
 	"Alcoholic"=/datum/charflaw/addiction/alcoholic,
+	"Devout Follower"=/datum/charflaw/addiction/godfearing,
+	"Colorblind"=/datum/charflaw/colorblind,
 	"Smoker"=/datum/charflaw/addiction/smoker,
 	"Junkie"=/datum/charflaw/addiction/junkie,
 	"Greedy"=/datum/charflaw/greedy,
@@ -210,6 +212,14 @@ GLOBAL_LIST_INIT(character_flaws, list(
 	head?.add_wound(/datum/wound/facial/eyes/left/permanent)
 	H.update_fov_angles()
 
+/datum/charflaw/colorblind
+	name = "Colorblind"
+	desc = "I was cursed with flawed eyesight from birth, and can't discern things others can."
+
+/datum/charflaw/colorblind/on_mob_creation(mob/user)
+	..()
+	user.add_client_colour(/datum/client_colour/monochrome)
+
 /datum/charflaw/greedy
 	name = "Greedy"
 	desc = "I can't get enough of mammons, I need more and more! I've also become good at knowing how much things are worth"

diff --git a/code/datums/character_flaw/addiction.dm b/code/datums/character_flaw/addiction.dm
@@ -94,3 +94,11 @@
 	desc = "I need to smoke something to take the edge off."
 	time = 40 MINUTES
 	needsate_text = "Time for a flavorful smoke."
+
+/// GOD-FEARING
+
+/datum/charflaw/addiction/godfearing
+	name = "Devout Follower"
+	desc = "I need to pray to my Patron, their blessings are stronger."
+	time = 40 MINUTES
+	needsate_text = "Time to pray to my Patron."
diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm
@@ -1151,6 +1151,8 @@
 		L.IgniteMob()
 		return FALSE
 	if(length(message2recognize) > 15)
+		if(L.has_flaw(/datum/charflaw/addiction/godfearing))
+			L.sate_addiction()
 		if(L.mob_timers[MT_PSYPRAY])
 			if(world.time < L.mob_timers[MT_PSYPRAY] + 1 MINUTES)
 				L.mob_timers[MT_PSYPRAY] = world.time

diff --git a/code/modules/paperwork/rogue.dm b/code/modules/paperwork/rogue.dm
@@ -217,6 +217,10 @@
 			return
 		if(signed)
 			return
+		if(M.has_flaw(/datum/charflaw/addiction/godfearing))
+			M.add_stress(/datum/stressevent/confessedgood)
+		else
+			M.add_stress(/datum/stressevent/confessed)
 		M.add_stress(/datum/stressevent/confessed)
 		signed = M.real_name
 		info = "THE GUILTY PARTY ADMITS THEIR SIN AND THE WEAKENING OF PSYDON'S HOLY FLOCK. THEY WILL REPENT AND SUBMIT TO ANY PUNISHMENT THE CLERGY DEEMS APPROPRIATE, OR BE RELEASED IMMEDIATELY. LET THIS RECORD OF THEIR SIN WEIGH ON THE ANGEL GABRIEL'S JUDGEMENT AT THE MANY-SPIKED GATES OF HEAVEN.<br/><br/>SIGNED,<br/><font color='red'>[signed]</font>"