back to old gigantism. No longer exclusive

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

Hide file tree

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

diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm
@@ -113,7 +113,6 @@
 	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)
@@ -125,8 +124,8 @@
 /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.."))
+	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
@@ -370,27 +369,22 @@
 			playsound(owner,'sound/weapons/sear.ogg', 50, TRUE)
 
 /datum/mutation/human/gigantism
-	name = "Gigantism"//negative version of dwarfism
+	name = "Gigantism"
 	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)
 
 /datum/mutation/human/gigantism/on_acquiring(mob/living/carbon/human/owner)
 	if(..())
 		return
 	ADD_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION)
-	//owner.resize = 1.25
-	//owner.update_transform()
-	owner.visible_message(span_danger("[owner] suddenly grows!"), span_notice("Everything around you seems to shrink.."))
+	//handled in init_signals.dm
 
 /datum/mutation/human/gigantism/on_losing(mob/living/carbon/human/owner)
 	if(..())
 		return
-	// REMOVE_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION)
-	// owner.resize = 0.8
-	// owner.update_transform()
-	owner.visible_message(span_danger("[owner] suddenly shrinks!"), span_notice("Everything around you seems to grow.."))
+	REMOVE_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION)
+	//handled in init_signals.dm
 
 /datum/mutation/human/spastic
 	name = "Spastic"

diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm
@@ -286,7 +286,5 @@
 /mob/living/carbon/human/proc/get_mob_height()
 	if(HAS_TRAIT(src, TRAIT_DWARF))
 		return HUMAN_HEIGHT_DWARF
-	if(HAS_TRAIT(src, TRAIT_GIANT))
-		return HUMAN_HEIGHT_TALLEST
 
 	return mob_height
diff --git a/code/modules/mob/living/carbon/human/init_signals.dm b/code/modules/mob/living/carbon/human/init_signals.dm
@@ -3,7 +3,8 @@
 
 	RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_UNKNOWN), SIGNAL_REMOVETRAIT(TRAIT_UNKNOWN)), PROC_REF(on_unknown_trait))
 	RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_DWARF), SIGNAL_REMOVETRAIT(TRAIT_DWARF)), PROC_REF(on_dwarf_trait))
-	RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_GIANT), SIGNAL_REMOVETRAIT(TRAIT_GIANT)), PROC_REF(on_giant_trait))
+	RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_GIANT)), PROC_REF(on_gain_giant_trait))
+	RegisterSignals(src, list(SIGNAL_REMOVETRAIT(TRAIT_GIANT)), PROC_REF(on_lose_giant_trait))
 
 /// Gaining or losing [TRAIT_UNKNOWN] updates our name and our sechud
 /mob/living/carbon/human/proc/on_unknown_trait(datum/source)
@@ -20,10 +21,16 @@
 	regenerate_icons()
 	// No more passtable for you, bub
 
-/// Gaining or losing [TRAIT_GIANT] updates our height
-/mob/living/carbon/human/proc/on_giant_trait(datum/source)
+/mob/living/carbon/human/proc/on_gain_giant_trait(datum/source)
 	SIGNAL_HANDLER
 
-	// We need to regenerate everything for height
-	regenerate_icons()
+	src.resize = 1.25
+	src.update_transform()
+	src.visible_message(span_danger("[src] suddenly grows!"), span_notice("Everything around you seems to shrink.."))
+
+/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.."))