Merge pull request #219 from KnigTheThrasher/dnaquirk

Complex DNA quirk
IrisSS13 · Feb 3, 2025 · b6fceb8 · b6fceb8
2 parents b302702 + ec805dd
commit b6fceb8
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 5 deletions.
diff --git a/modular_iris/modules/quirks/complexdna.dm b/modular_iris/modules/quirks/complexdna.dm
@@ -0,0 +1,9 @@
+/datum/quirk/complexdna
+	name = "Complex DNA"
+	desc = "For some reason your DNA is too complex for DNA scanners. You can not gain mutations."
+	icon = FA_ICON_PERSON_DOTS_FROM_LINE
+	value = 0
+	mob_trait = TRAIT_GENELESS
+	gain_text = span_notice("You are Becoming.")
+	lose_text = span_notice("You no longer feel like an Aristocrat.")
+	medical_record_text = "Patient's DNA is unusually complex and seems to be impervious to any changes."
diff --git a/...lar_iris/modules/farsighted/farsighted.dm → modular_iris/modules/quirks/farsighted.dm b/...lar_iris/modules/farsighted/farsighted.dm → modular_iris/modules/quirks/farsighted.dm
diff --git a/...e/datums/client/preferences/handedness.dm → ...e/datums/client/preferences/handedness.dm b/...e/datums/client/preferences/handedness.dm → ...e/datums/client/preferences/handedness.dm
diff --git a/...dness/code/datums/mutations/handedness.dm → ...dness/code/datums/mutations/handedness.dm b/...dness/code/datums/mutations/handedness.dm → ...dness/code/datums/mutations/handedness.dm
diff --git a/...andedness/code/datums/quirk/handedness.dm → ...andedness/code/datums/quirk/handedness.dm b/...andedness/code/datums/quirk/handedness.dm → ...andedness/code/datums/quirk/handedness.dm
diff --git a/...edness/code/objects/items/dna_injector.dm → ...edness/code/objects/items/dna_injector.dm b/...edness/code/objects/items/dna_injector.dm → ...edness/code/objects/items/dna_injector.dm
diff --git a/tgstation.dme b/tgstation.dme
@@ -6665,12 +6665,7 @@
 #include "modular_iris\modules\customization\modules\clothing\under\costume.dm"
 #include "modular_iris\modules\customization\modules\mob\dead\new_player\body_markings\body_marking_sets.dm"
 #include "modular_iris\modules\emotes\code\iris_laugh_datums.dm"
-#include "modular_iris\modules\farsighted\farsighted.dm"
 #include "modular_iris\modules\GAGS\greyscale_configs.dm"
-#include "modular_iris\modules\handedness\code\datums\client\preferences\handedness.dm"
-#include "modular_iris\modules\handedness\code\datums\mutations\handedness.dm"
-#include "modular_iris\modules\handedness\code\datums\quirk\handedness.dm"
-#include "modular_iris\modules\handedness\code\objects\items\dna_injector.dm"
 #include "modular_iris\modules\ipc_construction\ipc_construction.dm"
 #include "modular_iris\modules\modular_vending\code\autodrobe.dm"
 #include "modular_iris\modules\modular_vending\code\vending.dm"
@@ -6704,6 +6699,12 @@
 #include "modular_iris\modules\NTSL\code\machinery\server.dm"
 #include "modular_iris\modules\NTSL\code\machinery\traffic_control.dm"
 #include "modular_iris\modules\organs\code\lungs.dm"
+#include "modular_iris\modules\quirks\complexdna.dm"
+#include "modular_iris\modules\quirks\farsighted.dm"
+#include "modular_iris\modules\quirks\handedness\code\datums\client\preferences\handedness.dm"
+#include "modular_iris\modules\quirks\handedness\code\datums\mutations\handedness.dm"
+#include "modular_iris\modules\quirks\handedness\code\datums\quirk\handedness.dm"
+#include "modular_iris\modules\quirks\handedness\code\objects\items\dna_injector.dm"
 #include "modular_iris\monke_ports\code\game\turfs\open\floor\misc_floor.dm"
 #include "modular_iris\monke_ports\code\modules\aesthetics\mapping\tilecoloring.dm"
 #include "modular_iris\monke_ports\code\modules\buckshotroulette\buckshotroulette.dm"