traits are exclusive again, and permanent

Monkestation · Sep 27, 2023 · 053599f · 053599f
1 parent c66603a
commit 053599f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm
@@ -28,7 +28,8 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 		list("Extrovert", "Introvert"),
 		list("Prosthetic Limb", "Quadruple Amputee", "Body Purist"),
 		list("Quadruple Amputee", "Paraplegic"),
-		list("Quadruple Amputee", "Frail")
+		list("Quadruple Amputee", "Frail"),
+		list("Gigantism", "Dwarfism")
 	)
 
 /datum/controller/subsystem/processing/quirks/Initialize()

diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm
@@ -113,6 +113,7 @@
 	quality = POSITIVE
 	difficulty = 16
 	instability = 5
+	conflicts = list(/datum/mutation/human/gigantism)
 	locked = TRUE // Default intert species for now, so locked from regular pool.
 
 /datum/mutation/human/dwarfism/on_acquiring(mob/living/carbon/human/owner)
@@ -124,8 +125,9 @@
 /datum/mutation/human/dwarfism/on_losing(mob/living/carbon/human/owner)
 	if(..())
 		return
-	REMOVE_TRAIT(owner, TRAIT_DWARF, GENETIC_MUTATION)
-	owner.visible_message(span_danger("[owner] suddenly grows!"), span_notice("Everything around you seems to shrink.."))
+	//We're leaving the size traits permanent until someone wants to separate the mutation from customization aspects
+	//REMOVE_TRAIT(owner, TRAIT_DWARF, GENETIC_MUTATION)
+	//owner.visible_message(span_danger("[owner] suddenly grows!"), span_notice("Everything around you seems to shrink.."))
 
 //Clumsiness has a very large amount of small drawbacks depending on item.
 /datum/mutation/human/clumsy
@@ -373,6 +375,8 @@
 	desc = "The cells within the subject spread out to cover more area, making the subject appear larger."
 	quality = MINOR_NEGATIVE
 	difficulty = 12
+	conflicts = list(/datum/mutation/human/dwarfism)
+	locked = TRUE
 
 /datum/mutation/human/gigantism/on_acquiring(mob/living/carbon/human/owner)
 	if(..())
@@ -383,7 +387,8 @@
 /datum/mutation/human/gigantism/on_losing(mob/living/carbon/human/owner)
 	if(..())
 		return
-	REMOVE_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION)
+	//We're leaving the size traits permanent until someone wants to separate the mutation from customization aspects
+	//REMOVE_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION)
 	//handled in init_signals.dm
 
 /datum/mutation/human/spastic

diff --git a/code/modules/mob/living/carbon/human/init_signals.dm b/code/modules/mob/living/carbon/human/init_signals.dm
@@ -30,7 +30,7 @@
 
 /mob/living/carbon/human/proc/on_lose_giant_trait(datum/source)
 	SIGNAL_HANDLER
-
-	src.resize = 0.8
-	src.update_transform()
-	src.visible_message(span_danger("[src] suddenly shrinks!"), span_notice("Everything around you seems to grow.."))
+	//We're leaving the size traits permanent until someone wants to separate the mutation from customization aspects
+	//src.resize = 0.8
+	//src.update_transform()
+	//src.visible_message(span_danger("[src] suddenly shrinks!"), span_notice("Everything around you seems to grow.."))